Use assignments instead of tasks #1508
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>
cyli
force-pushed
the
tasks-to-assignments
branch
from
e92692a
to
c2d82f6
Compare
| } | ||
| tasksFallback = true | ||
| assignmentWatch = nil | ||
| log.WithError(err).Errorf("falling back to Tasks") |
There was a problem hiding this comment.
maybe Warning or Info?
| @@ -221,4 +221,4 @@ message Cluster { | |||
| // and agents to unambiguously identify the older key to be deleted when | |||
| // a new key is allocated on key rotation. | |||
| uint64 encryption_key_lamport_clock = 6; | |||
| } | |||
| } | |||
There was a problem hiding this comment.
Looks like the line ending on the last line got removed from this file somehow.
|
@cyli @diogomonica Just realized what you did here! Thanks! It is much easier to review. |
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("") |
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.
|
Passed Docker integration tests except a known flaky test LGTM |
|
LGTM |
|
Also tested the fallback when running with an older manager. Seems to work correctly. |
Cherry-picked the assignments-only related code from #1377, as per suggestion from @stevvooe.