Skip to content

[ca] In the CA server, ensure we always have a cluster ID#2340

Merged
cyli merged 1 commit into
moby:masterfrom
cyli:simplify-cluster-watch-code
Aug 3, 2017
Merged

[ca] In the CA server, ensure we always have a cluster ID#2340
cyli merged 1 commit into
moby:masterfrom
cyli:simplify-cluster-watch-code

Conversation

@cyli
Copy link
Copy Markdown
Contributor

@cyli cyli commented Aug 2, 2017

Also, and just watch for changes of the only cluster we care about. This fixes an occasional data race caused by #2336 where the cluster is accessed outside of a lock. Alternative is to lock before accessing the cluster ID, but this seems simpler.

Signed-off-by: Ying Li ying.li@docker.com

changes of the only cluster we care about.

Signed-off-by: Ying Li <ying.li@docker.com>
@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 2, 2017

Codecov Report

Merging #2340 into master will decrease coverage by 0.03%.
The diff coverage is 75%.

@@            Coverage Diff             @@
##           master    #2340      +/-   ##
==========================================
- Coverage   60.38%   60.35%   -0.04%     
==========================================
  Files         128      128              
  Lines       26056    26052       -4     
==========================================
- Hits        15735    15724      -11     
- Misses       8934     8940       +6     
- Partials     1387     1388       +1

@aaronlehmann
Copy link
Copy Markdown
Collaborator

LGTM

@cyli
Copy link
Copy Markdown
Contributor Author

cyli commented Aug 3, 2017

Thanks @aaronlehmann!

@cyli cyli merged commit e8c06d0 into moby:master Aug 3, 2017
@cyli cyli deleted the simplify-cluster-watch-code branch August 3, 2017 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants