[19.03 backport] Use Service Placement Constraints in Enforcer#2858
Merged
dperny merged 1 commit intoMay 20, 2019
Merged
Conversation
jlhawn
approved these changes
May 20, 2019
Member
|
Looks like we need a backport of #2853 as well before this will pass in CI |
Collaborator
Author
|
|
This patch updates the ConstraintEnforcer to use the placement constraints from the current service spec rather than the placement constraints from the current task spec because they may be outdated in some cases (e.g., when the service was previously updated to modify placement constrainst but the node to which the task was scheduled still satisfies the constraints. If the node is updated in a way which causes it to no longer satisfy the new constraints then the task should be removed even if it still would satisfy the original task constraints). Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn) (cherry picked from commit b39ccd7) Signed-off-by: Drew Erny <drew.erny@docker.com>
33bdcba to
4390f67
Compare
Codecov Report
@@ Coverage Diff @@
## bump_v19.03 #2858 +/- ##
===============================================
+ Coverage 62.15% 62.16% +<.01%
===============================================
Files 139 139
Lines 22315 22326 +11
===============================================
+ Hits 13871 13878 +7
- Misses 6963 6971 +8
+ Partials 1481 1477 -4 |
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.
Cherry-pick of #2857 to the 19.03 branch. Applies cleanly.