Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add REMOVE and ORPHANED to TaskState#36146

Merged
merged 1 commit into from
Feb 2, 2018
Merged

Add REMOVE and ORPHANED to TaskState #36146

merged 1 commit into from
Feb 2, 2018

Conversation

yongtang
Copy link
Member

This fix tries to address the issue raised in #36142 where
there are discrepancies between Swarm API and swagger.yaml.

This fix adds two recently added state REMOVE and ORPHANED to TaskState.

This fix fixes #36142.

Signed-off-by: Yong Tang yong.tang.github@outlook.com

@yongtang
Add REMOVE and ORPHANED to TaskState
a40687f 
This fix tries to address the issue raised in 36142 where
there are discrepancies between Swarm API and swagger.yaml.

This fix adds two recently added state `REMOVE` and `ORPHANED` to TaskState.

This fix fixes 36142.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
@EugeneScully EugeneScully mentioned this pull request Jan 31, 2018
Closed
@yongtang
Copy link
Member Author

yongtang commented Feb 2, 2018

/cc @thaJeztah Please take a look.

@thaJeztah
Copy link
Member

relates to moby/swarmkit#2461, moby/swarmkit#2485 (vendored through #35698)

thaJeztah
thaJeztah approved these changes Feb 2, 2018
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tiborvass
Copy link
Contributor

LGTM

@yongtang yongtang merged commit 3a6f8cf into moby:master Feb 2, 2018
@yongtang yongtang deleted the 36142-TaskState branch February 2, 2018 19:33
@thaJeztah thaJeztah mentioned this pull request Feb 13, 2018
Merged
@thaJeztah thaJeztah mentioned this pull request Feb 20, 2018
Merged
@gbarr01 gbarr01 mentioned this pull request Mar 12, 2018
Closed
@gbarr01
Copy link

gbarr01 commented Mar 12, 2018

@thaJeztah ... shouldn't the state be "REMOVED" and not "REMOVE"? Compare the others:

https://docs.docker.com/engine/swarm/how-swarm-mode-works/swarm-task-states/

Task state | Description
-- | --
NEW | The task was initialized.
PENDING | Resources for the task were allocated.
ASSIGNED | Docker assigned the task to nodes.
ACCEPTED | The task was accepted by a worker node. If a worker node rejects the task, the state changes to REJECTED.
PREPARING | Docker is preparing the task.
STARTING | Docker is starting the task.
RUNNING | The task is executing.
COMPLETE | The task exited without an error code.
FAILED | The task exited with an error code.
SHUTDOWN | Docker requested the task to shut down.
REJECTED | The worker node rejected the task.
ORPHANED | The node was down for too long.

@gbarr01 gbarr01 mentioned this pull request Mar 12, 2018
Merged
@thaJeztah
Copy link
Member

@gbarr01 this is documenting what was implemented in SwarmKit. I think the state REMOVE is to indicate that the task is ready for removal (not removed yet), so I assume that's why it was named remove instead of removed, but @anshulpundir or @nishanttotla should be able to give you the full story :D

@nishanttotla
Copy link
Contributor

@gbarr01 what @thaJeztah said is pretty much accurate.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes
Assignees
No one assigned
Labels
status/3-docs-review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

api/swagger.yaml does not contain "orphaned" as a TaskState
6 participants
@yongtang @thaJeztah @tiborvass @gbarr01 @nishanttotla @GordonTheTurtle