Skip to content

scheduler: Clean up addOrUpdateNode#2268

Merged
aaronlehmann merged 2 commits intomoby:masterfrom
aaronlehmann:scheduler-addorupdatenode
Jun 19, 2017
Merged

scheduler: Clean up addOrUpdateNode#2268
aaronlehmann merged 2 commits intomoby:masterfrom
aaronlehmann:scheduler-addorupdatenode

Conversation

@aaronlehmann
Copy link
Copy Markdown
Collaborator

This function previously could take an uninitialized NodeInfo structure and fill in whatever was missing. This is very error-prone, so remove this logic and change the only caller that relies on it to always pass in a properly initialized NodeInfo.

This was originally a cleanup that was part of #2253, but it turns out to fix a bad panic. Opening as a separate PR for backport.

cc @andrewhsu

Aaron Lehmann added 2 commits June 19, 2017 15:35
…later

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This function previously could take an uninitialized NodeInfo structure
and fill in whatever was missing. This is very error-prone, so remove
this logic and change the only caller that relies on it to always pass
in a properly initialized NodeInfo.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
@codecov
Copy link
Copy Markdown

codecov bot commented Jun 19, 2017

Codecov Report

Merging #2268 into master will increase coverage by 0.02%.
The diff coverage is 46.15%.

@@            Coverage Diff             @@
##           master    #2268      +/-   ##
==========================================
+ Coverage   60.42%   60.45%   +0.02%     
==========================================
  Files         125      125              
  Lines       20396    20394       -2     
==========================================
+ Hits        12325    12329       +4     
+ Misses       6679     6672       -7     
- Partials     1392     1393       +1

@cyli
Copy link
Copy Markdown
Contributor

cyli commented Jun 19, 2017

LGTM

@aaronlehmann aaronlehmann merged commit 7d6bb1b into moby:master Jun 19, 2017
@aaronlehmann aaronlehmann deleted the scheduler-addorupdatenode branch June 19, 2017 22:57
@aaronlehmann aaronlehmann added this to the 17.06 milestone Jun 19, 2017
@andrewhsu andrewhsu mentioned this pull request Jun 20, 2017
6 tasks
tiborvass pushed a commit to tiborvass/docker-ce that referenced this pull request Jun 20, 2017
Brings in these pull requests:
- moby/swarmkit#2224
- moby/swarmkit#2268
- moby/swarmkit#2263

Signed-off-by: Tibor Vass <tibor@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
Brings in these pull requests:
- moby/swarmkit#2224
- moby/swarmkit#2268
- moby/swarmkit#2263

Signed-off-by: Tibor Vass <tibor@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Feb 3, 2020
Brings in these pull requests:
- moby/swarmkit#2224
- moby/swarmkit#2268
- moby/swarmkit#2263

Signed-off-by: Tibor Vass <tibor@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 10, 2020
Brings in these pull requests:
- moby/swarmkit#2224
- moby/swarmkit#2268
- moby/swarmkit#2263

Signed-off-by: Tibor Vass <tibor@docker.com>
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 23, 2020
Brings in these pull requests:
- moby/swarmkit#2224
- moby/swarmkit#2268
- moby/swarmkit#2263

Signed-off-by: Tibor Vass <tibor@docker.com>
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.

2 participants