Skip to content

[PATCH v2] Fix race condition between task creation and removal #1154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jinuxstyle wants to merge 1 commit into from
Closed

[PATCH v2] Fix race condition between task creation and removal #1154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions agent/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,17 @@ func (tm *taskManager) run(ctx context.Context) {
}
case <-shutdown:
if cancel != nil {
// Wait for operation to finish if the task
// is in preparing state. This avoid the race
// between Prepare and Remove operations,
// which could cause orphan containers.
if tm.task.Status.State == api.TaskStatePreparing {
Copy link
Copy Markdown
Contributor

@stevvooe stevvooe Jul 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This method should never be looking at task state to make decisions about what to do. State is only inspected or mutated in exec.Do.

Copy link
Copy Markdown
Contributor Author

@jinuxstyle jinuxstyle Jul 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree it's better doing it in exec.Do so that it can go through the state machine. I thought about it but I didn't figure out how. It looks the shutdown is handled as an special event which can abort other ongoing activities for the same task.

select {
case <-errs:
case <-statusq:
}
}

// cancel outstanding operation.
cancel()
}
Expand Down