Skip to content

Revert docker/swarmkit#2804#39281

Merged
tiborvass merged 1 commit intomoby:masterfrom
dperny:vendor-swarmkit
Jun 4, 2019
Merged

Revert docker/swarmkit#2804#39281
tiborvass merged 1 commit intomoby:masterfrom
dperny:vendor-swarmkit

Conversation

@dperny
Copy link
Contributor

@dperny dperny commented May 29, 2019

- What I did

Reverts the change to swarmkit that made all updates set UpdateStatus to Completed.

See moby/swarmkit#2861

related: moby/swarmkit#2804, #38520

fixes moby/swarmkit#2861
fixes #39023

- How I did it

Returned the integration test to the way it was before

Reverts the change to swarmkit that made all updates set UpdateStatus to
Completed

Signed-off-by: Drew Erny <[email protected]>
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 (if green)

@olljanat
Copy link
Contributor

Yea we need to do this for get 19.03 working correctly but this will add some flakiness back to moby integration tests which need to be fixed on some other way.

@dperny I also think that we probably should add some integration test case to swarmkit side which prevents same issue coming back on future?

Janky have now failed to #32673 and #38885
Let see what happens on next run...

@olljanat
Copy link
Contributor

olljanat commented May 30, 2019

(reserved for my derek commands)

@dperny
Copy link
Contributor Author

dperny commented May 30, 2019

we can try again later, but we have to be careful. in my opinion, what the CLI is doing that's causing this to be a problem is Wrong, but it's far too late to change it.

@olljanat
Copy link
Contributor

Yea. Btw. On RS1 build servers looks to have some generic issue so it can be ignored here.

@thaJeztah
Copy link
Member

@dperny and I were discussing this revert, and (temporarily) reverting this change seemed the best / safest option for now; we can redo the change if we find an approach tp make the cli work with it (in a backward compatible way)

@dperny
Copy link
Contributor Author

dperny commented Jun 4, 2019

everything but the known bad windows test is passing.

@tiborvass tiborvass merged commit 54043d2 into moby:master Jun 4, 2019
@thaJeztah thaJeztah added this to the 20.03.0 milestone Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[19.03.0-beta1] Overall progress does not work when service is scaled up 19.03.0-beta1: docker service scale does not always wait to converge

6 participants