Use assignments instead of tasks#1508
Merged
stevvooe merged 11 commits intomoby:masterfrom Sep 9, 2016
Merged
Conversation
Add a Secret top-level object type. Add a SecretReference that allows a service to reference the secrets it needs. Add dispatcher Assignments method which will replace Tasks going forward. This provides a stream with incremental task and secret updates. Additional object types can be supported in the assignment set in the future. The first message returned from the Assignments stream is the complete set of tasks and secrets for the node, and this is used to synchronize the node's view with the manager's. Additional messages returned by the stream are incremental updates that add, update, or remove one or more tasks or secrets. If the agent gets out of sync with the manager, it can reinitiate the Assignments stream to sync up. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Signed-off-by: cyli <cyli@twistedmatrix.com>
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
Signed-off-by: cyli <cyli@twistedmatrix.com>
(removed the proto parts - cyli) Signed-off-by: Diogo Monica <diogo.monica@gmail.com> Signed-off-by: cyli <cyli@twistedmatrix.com>
…ments Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
Signed-off-by: cyli <cyli@twistedmatrix.com>
Current coverage is 54.80% (diff: 47.34%)@@ master #1508 diff @@
==========================================
Files 82 82
Lines 12917 13073 +156
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
+ Hits 7140 7165 +25
- Misses 4782 4908 +126
- Partials 995 1000 +5
|
Signed-off-by: cyli <cyli@twistedmatrix.com>
e92692a to
c2d82f6
Compare
agent/session.go
Outdated
| } | ||
| tasksFallback = true | ||
| assignmentWatch = nil | ||
| log.WithError(err).Errorf("falling back to Tasks") |
Collaborator
There was a problem hiding this comment.
maybe Warning or Info?
api/objects.proto
Outdated
| // a new key is allocated on key rotation. | ||
| uint64 encryption_key_lamport_clock = 6; | ||
| } | ||
| } No newline at end of file |
Collaborator
There was a problem hiding this comment.
Looks like the line ending on the last line got removed from this file somehow.
Contributor
|
@cyli @diogomonica Just realized what you did here! Thanks! It is much easier to review. |
Merged
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
| return err | ||
| } | ||
| log := log.G(ctx).WithFields(logrus.Fields{"method": "(*session).watch"}) | ||
| log.Debugf("") |
Contributor
Author
There was a problem hiding this comment.
We wanted to log the call to (*session).watch (see https://github.com/docker/swarmkit/pull/1508/files#diff-15ffe95a2da45f70696ffa3c01949601L208), just to indicate that it was starting, but we also wanted those fields to be attached to the logger so it can be used to log errors later. This call to Debugf just logs the fields of the logger without any additional info.
Collaborator
|
Passed Docker integration tests except a known flaky test LGTM |
Contributor
|
LGTM |
Collaborator
|
Also tested the fallback when running with an older manager. Seems to work correctly. |
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
7 participants
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-picked the assignments-only related code from #1377, as per suggestion from @stevvooe.