8000 remove the retries for service update by AntaresS · Pull Request #36827 · moby/moby · GitHub
[go: up one dir, main page]
Skip to content

remove the retries for service update #36827

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
Merged
yongtang merged 1 commit into from
Apr 11, 2018
Merged

remove the retries for service update #36827

yongtang merged 1 commit into from
Apr 11, 2018

Conversation

@AntaresS
Copy link
Contributor
@AntaresS AntaresS commented Apr 11, 2018 •
edited
Loading

- What I did

  • remove retries of service update as the issue should have been already addressed in Version service specs swarmkit#2033
  • the purpose of this change is also to verify the issue has been truly fixed because we started to see update out of sequence error again in e2e test on rhel 7.4. Here is a snippet of the observed failure
--- FAIL: TestServiceUpdate (61.15s)
	assertions.go:226: 

	Error Trace:	services_test.go:217
		
	Error:      	Received unexpected error:
		
	            	Error response from daemon: rpc error: code = 2 desc = update out of sequence
		
	Messages:   	Service 018vmrb79j8ep8p4gt9limwrz failed to update

cc @tonistiigi @andrewhsu @vieux @tiborvass

- How I did it

- How to verify it

- Description for the changelog

  • s/CmdRetryOutOfSequence/Cmd in docker_cli_service_update_test.go and docker_cli_swarm_test.go files
  • removed CmdRetryOutOfSequence function from daemon_swarm.go

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Anda Xu anda.xu@docker.com

@AntaresS AntaresS requested a review from vdemeester as a code owner April 11, 2018 00:01
tonistiigi
tonistiigi reviewed Apr 11, 2018
View reviewed changes
Copy link
Member
@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

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

You can remove CmdRetryOutOfSequence now.

@AntaresS
remove the retries for service update
7380935 
Signed-off-by: Anda Xu <anda.xu@docker.com>
@codecov
Copy link
codecov bot commented Apr 11, 2018 •
edited
Loading

Codecov Report

Merging #36827 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #36827      +/-   ##
==========================================
- Coverage    35.2%   35.18%   -0.03%     
==========================================
  Files         614      614              
  Lines       45648    45648              
==========================================
- Hits        16069    16059      -10     
- Misses      27446    27455       +9     
- Partials     2133     2134       +1

@AntaresS
Copy link
Contributor Author
AntaresS commented Apr 11, 2018

You can remove CmdRetryOutOfSequence now.

@tonistiigi 👍

thaJeztah
thaJeztah approved these changes Apr 11, 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

vdemeester
vdemeester approved these changes Apr 11, 2018
View reviewed changes
Copy link
Member
@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

@yongtang yongtang merged commit 5680ccd into moby:master Apr 11, 2018
This was referenced Apr 11, 2018
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonistiigi tonistiigi tonistiigi left review comments

@thaJeztah thaJeztah thaJeztah approved these changes

+1 more reviewer

@vdemeester vdemeester vdemeester approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area/swarm area/testing status/2-code-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@AntaresS @vdemeester @tonistiigi @thaJeztah @yongtang @GordonTheTurtle
0