manually revert changes from PR #3902#4075
Merged
jamieklassen merged 2 commits intomasterfrom Jun 27, 2019
Merged
Conversation
Signed-off-by: Divya Dadlani <[email protected]>
Signed-off-by: Divya Dadlani <[email protected]>
vito
approved these changes
Jun 27, 2019
Contributor
Contributor
Author
|
@aledeganopix4d yes we are going to find another solution for the locking mechanism that does not affect other things. We might even go ahead with the scheduling queue described in #3695 since that would guarantee one container placed at a time. |
Contributor
Contributor
Author
|
@marco-m we are discussing it, we'll be sure to let you know what we decide. I'll also be sure to look at the PR before EOD today |
Contributor
|
Thanks Divya! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The changes made in PR #3902 (fixing #3301) were not fully correct. The changes caused unused db.CreatingContainers to be created in the case where two identical get steps were run in quick succession. This broke the topgun build (issue #4070).
Since a manual merge was done after #3902 was merged in to master, we decided to manually revert the changes. This PR removes the container creation and locking logic from
pool.FindOrChooseWorkerForContainerand puts the db.CreatingContainer creation back intoworker.FindOrCreateContainer.Fixes #4070
Signed-off-by: Divya Dadlani [email protected]