[Jobs] Merge Jobs Support into Master #2925
Merged
Conversation
This file contains 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
Adds protocol buffers for implementing Jobs in swarmkit. Signed-off-by: Drew Erny <drew.erny@docker.com>
Adds orchestrators for replicated and global jobs, and the basic tests. This commit exists mostly to keep the Ginkgo in mostly its own commit. Signed-off-by: Drew Erny <drew.erny@docker.com>
Adds service reconciliation logic for the replicated jobs orchestrator. This code does not function in production, and is not actually called except from the tests. Signed-off-by: Drew Erny <drew.erny@docker.com>
Expands the skeleton structure of the global jobs orchestrator. Signed-off-by: Drew Erny <drew.erny@docker.com>
Refactors the replicated job orchestrator to make testing simpler, and then adds initialization logic to it. Signed-off-by: Drew Erny <drew.erny@docker.com>
Signed-off-by: Drew Erny <drew.erny@docker.com>
Refactors the global job orchestrator along the same lines as the replicated job orchestrator, in order to better decouple the event-driven orchestrator logic from the reconciliation logic. Signed-off-by: Drew Erny <drew.erny@docker.com>
It became evident in the process of writing the Global Jobs orchestrator that the Orchestrators required by both Replicated and Global jobs are essentially identical. This commit merges them into one combined orchestrator, which dispatches to the appropriate Reconcilers to do the actual work. Unlike existing services, these orchestrators can be combined because the requirements of jobs are much simpler than that of services. Signed-off-by: Drew Erny <drew.erny@docker.com>
Adds support to the controlapi for creating and updating job-mode services. This still does not include correct plumbing to execute job-type services. Signed-off-by: Drew Erny <drew.erny@docker.com>
Adds the jobs orchestrator to the swarmkit manager. Jobs orchestrator will now start and run with the manager. Signed-off-by: Drew Erny <drew.erny@docker.com>
Adds the beginnings of the integration tests between the controlapi and the jobs orchestrator. These tests don't actually check much more than creation right now, as update handling for the jobs orchestrator is pending, but further tests will be able to leverage the groundwork here to a high degree. Signed-off-by: Drew Erny <drew.erny@docker.com>
In order to make the jobs reconcilers work correctly with the restart supervisor, they have been altered to never replace failed tasks directly Replacing failed tasks is the purview of the restart supervisor. The jobs reconcilers will only create new tasks when needed. Additionally, this alters the behavior of the replicated job reconciler with regards to slots -- each new task will get a new slot, and when the job is completed, there will be a Completed task in each slot from 0 to TotalCompletions-1. Then, makes the tweaks necessary for the Restart Supervisor to support Jobs, which are different from other services in that they deliberately have a desired state of Completed. Finally, wires up the replicated and global orchestrators to call the restart supervisor to restart tasks that have failed. Signed-off-by: Drew Erny <drew.erny@docker.com>
Updates manager components to support jobs, which have a desired state of Completed. Signed-off-by: Drew Erny <drew.erny@docker.com>
Updates the ListServiceStatuses RPC to work with jobs. Includes adding a new field to the responses showing the number of completed Tasks in a job. Signed-off-by: Drew Erny <drew.erny@docker.com>
Adds support for updating global jobs by adding code to shut down tasks belonging to previous job iterations. Signed-off-by: Drew Erny <drew.erny@docker.com>
Adds support for updating replicated jobs by adding code to shut down tasks belonging to previous job iterations. Signed-off-by: Drew Erny <drew.erny@docker.com>
Signed-off-by: Drew Erny <drew.erny@docker.com>
Addresses a couple of TODOs in the jobs orchestrator. Most notably, updates the reconcilers to set the DesiredState of Tasks belonging to older job iterations to Remove, which will cause them to be cleaned up and deleted. Signed-off-by: Drew Erny <drew.erny@docker.com>
Signed-off-by: Drew Erny <drew.erny@docker.com>
|
Please sign your commits following these rules: $ git clone -b "feature-jobs" git@github.com:docker/swarmkit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354456720
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -fAmending updates the existing PR. You DO NOT need to open a new one. |
Codecov Report
@@ Coverage Diff @@
## master #2925 +/- ##
==========================================
+ Coverage 61.58% 61.82% +0.23%
==========================================
Files 139 142 +3
Lines 22616 22986 +370
==========================================
+ Hits 13928 14210 +282
- Misses 7207 7275 +68
- Partials 1481 1501 +20 |
Removes code from the global job reconciler that prevented global jobs from executing on newly created nodes. This behavior probably would not have worked well in real-world use, and closes off a few use cases (like using a global job to perform some initialization on newly-created nodes). Signed-off-by: Drew Erny <derny@mirantis.com>
|
Alright, I'm merging it. Here we go. |
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.
Over time, development of the Swarm Jobs feature has taken place on a separate
feature-jobsbranch, to avoid disrupting the downstream engine until the feature was complete. I'm comfortable, now, saying that Jobs is complete enough to merge into the swarmkit master branch.Jobs integration with the engine is tracked in moby/moby#40307.