Avoid predefined error log#2561
Conversation
- fix the logic that was checking for predefined networks. Before the GetNetwork was passing the network name, while instead the network ID is the key that is supposed to be used. The CreateNetwork anyway is doing the very same check and create the network if not existing. Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
|
cc @abhi @aluzzardi |
Codecov Report
@@ Coverage Diff @@
## master #2561 +/- ##
==========================================
+ Coverage 61.35% 61.42% +0.06%
==========================================
Files 133 133
Lines 21765 21764 -1
==========================================
+ Hits 13354 13368 +14
+ Misses 6974 6972 -2
+ Partials 1437 1424 -13 |
anshulpundir
left a comment
anshulpundir
left a comment
There was a problem hiding this comment.
Can you please add a unit-test ? @fcrisciani
|
@anshulpundir which unit test do you want to put? there is no behavior change the previous call was passing the wrong parameter |
|
@fcrisciani I don't think there was previously a test for this behavior. Perhaps a test in |
|
@cyli the network were already created correctly because the get was returning nil. The problem here was that after the second election the get will return nil but the create will fail because the predefined network is already there. As I was saying there is not change in behavior, just removing a warning happening on any subsequent leader election |
|
@fcrisciani I agree. I think @anshulpundir was just suggesting, and I was agreeing, that it'd be nice to have a unit test for the network create at all (there is not currently any test for the networks being created), not that we think your change caused any change in behavior. It'd be nice to have a test to verify that the behavior was the same before and after this change is all. :) |
|
@anshulpundir @cyli this PR #2571 added the network restore tests |
|
Thanks @fcrisciani! |
Relevant changes: - moby/swarmkit#2551 RoleManager will remove deleted nodes from the cluster membership - moby/swarmkit#2574 Scheduler/TaskReaper: handle unassigned tasks marked for shutdown - moby/swarmkit#2561 Avoid predefined error log - moby/swarmkit#2557 Task reaper should delete tasks with removed slots that were not yet assigned - moby/swarmkit#2587 [fips] Agent reports FIPS status - moby/swarmkit#2603 Fix manager/state/store.timedMutex Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Relevant changes: - moby/swarmkit#2551 RoleManager will remove deleted nodes from the cluster membership - moby/swarmkit#2574 Scheduler/TaskReaper: handle unassigned tasks marked for shutdown - moby/swarmkit#2561 Avoid predefined error log - moby/swarmkit#2557 Task reaper should delete tasks with removed slots that were not yet assigned - moby/swarmkit#2587 [fips] Agent reports FIPS status - moby/swarmkit#2603 Fix manager/state/store.timedMutex Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 333b2f28fef4ba857905e7263e7b9bbbf7c522fc Component: engine
Relevant changes: - moby/swarmkit#2551 RoleManager will remove deleted nodes from the cluster membership - moby/swarmkit#2574 Scheduler/TaskReaper: handle unassigned tasks marked for shutdown - moby/swarmkit#2561 Avoid predefined error log - moby/swarmkit#2557 Task reaper should delete tasks with removed slots that were not yet assigned - moby/swarmkit#2587 [fips] Agent reports FIPS status - moby/swarmkit#2603 Fix manager/state/store.timedMutex Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 333b2f28fef4ba857905e7263e7b9bbbf7c522fc) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
4 participants
GetNetwork was passing the network name, while instead the network ID is
the key that is supposed to be used. The CreateNetwork anyway is doing
the very same check and create the network if not existing.
Signed-off-by: Flavio Crisciani flavio.crisciani@docker.com