[17.03] Fix GetRemoteSignedCertificate retry #2069
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
Codecov Report
@@ Coverage Diff @@
## bump_v17.03.2 #2069 +/- ##
=================================================
- Coverage 55.29% 55.26% -0.03%
=================================================
Files 102 102
Lines 17142 17154 +12
=================================================
+ Hits 9479 9481 +2
- Misses 6498 6518 +20
+ Partials 1165 1155 -10Continue to review full report at Codecov.
|
|
LGTM - thanks for backporting this. I didn't realize the connection broker change and the certificate request config change didn't make it into 17.03. |
diogomonica
reviewed
Mar 30, 2017
ca/certificates.go
Outdated
| } | ||
| caClient = api.NewNodeCAClient(conn) | ||
|
|
||
| case err != nil: // this was a deadline exceeded error - we need to figure out which context |
There was a problem hiding this comment.
this code no longer exists.
…in 5 seconds it errors with a context deadline exceeded and does not retry. Update it so that if the node has not been updated within 5 seconds, attempt to get the node status again after an exponential backoff. If NodeCertificateStatus errors with some other error (not context deadline exceeded), GetRemoteSignedCertificate will try again with a different connection. Signed-off-by: cyli <ying.li@docker.com> Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> (cherry picked from commit 3ac8569)
aaronlehmann
force-pushed
the
fix-node-certificate-reiussue-retry-17.03
branch
from
8a533e4 to
258f3b5
Compare
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.
Cherry-pick of #2063 to 17.03
cc @cyli @diogomonica @mavenugo