Skip to content

[18.09 backport] use a custom grpc dialer when managers are joining#2826

Merged
dperny merged 1 commit intomoby:bump_v18.09from
thaJeztah:18.09_backport_esc_1003
Mar 6, 2019
Merged

[18.09 backport] use a custom grpc dialer when managers are joining#2826
dperny merged 1 commit intomoby:bump_v18.09from
thaJeztah:18.09_backport_esc_1003

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Feb 11, 2019

backport of #2802 for 18.09. cherry-pick was clean; no conflicts

@thaJeztah thaJeztah force-pushed the 18.09_backport_esc_1003 branch from 80b4dc3 to c3f8f1b Compare February 11, 2019 10:59
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Feb 11, 2019

rebased on top of #2829 to fix CI

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Feb 11, 2019

ping @dperny @anshulpundir PTAL

@thaJeztah thaJeztah changed the title [18.09 backport] use a custom grpc dialer when managers are joining [WIP][18.09 backport] use a custom grpc dialer when managers are joining Feb 11, 2019
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Feb 11, 2019

marking this "WIP" because there's some comments on the original PR, and we should have it merged in master first

@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 11, 2019 •
edited
Loading

Codecov Report

Merging #2826 into bump_v18.09 will increase coverage by 0.01%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##           bump_v18.09    #2826      +/-   ##
===============================================
+ Coverage        61.71%   61.73%   +0.01%     
===============================================
  Files              134      134              
  Lines            21868    21871       +3     
===============================================
+ Hits             13495    13501       +6     
+ Misses            6919     6917       -2     
+ Partials          1454     1453       -1

@thaJeztah
Use custom gRPC dialer to override default proxy dialer
b475b06 
Signed-off-by: Dani Louca <dani.louca@docker.com>
(cherry picked from commit 85aeb0b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.09_backport_esc_1003 branch from c3f8f1b to b475b06 Compare March 5, 2019 21:50
@thaJeztah thaJeztah changed the title [WIP][18.09 backport] use a custom grpc dialer when managers are joining [18.09 backport] use a custom grpc dialer when managers are joining Mar 5, 2019
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 5, 2019

Looks like this test is flaky;

time="2019-03-05T21:57:37Z" level=error msg="update failed" error="task ejv1l2jn5wt81d57qx85lmu89 was already shut down when reached by updater" task.id=vntuyz2k8fe10hhal4s1ygurz
--- FAIL: TestUpdaterRollback (3.50s)
    --- FAIL: TestUpdaterRollback/continue/spec_version_set (1.16s)
	Error Trace:	update_test.go:279
			update_test.go:25
	Error:		Not equal: "image2" (expected)
    			        != "image1" (actual)

@dperny dperny merged commit c66ed60 into moby:bump_v18.09 Mar 6, 2019
@thaJeztah thaJeztah deleted the 18.09_backport_esc_1003 branch March 6, 2019 15:45
@thaJeztah thaJeztah mentioned this pull request Mar 6, 2019
Merged
@thaJeztah thaJeztah mentioned this pull request Mar 28, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah @dperny