bugfix: fix endpoints disappear when pouchd restart #1312
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
rudyfly
force-pushed
the
network-bugfix
branch
2 times, most recently
from
c83b458
to
d1ae621
Compare
Fix endpoints disappear when pouchd restart, restore network controller need keep endpoints that is using by the running containers, add the active sandboxes option to initialize network controller. Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #1312 +/- ##
==========================================
- Coverage 17.38% 17.37% -0.01%
==========================================
Files 189 189
Lines 11772 11789 +17
==========================================
+ Hits 2046 2048 +2
- Misses 9578 9594 +16
+ Partials 148 147 -1
|
HusterWan
reviewed
May 15, 2018
| @@ -65,13 +65,32 @@ type NetworkManager struct { | |||
| } | |||
|
|
|||
| // NewNetworkManager creates a brand new network manager. | |||
| func NewNetworkManager(cfg *config.Config, store *meta.Store) (*NetworkManager, error) { | |||
| func NewNetworkManager(cfg *config.Config, store *meta.Store, ctrMgr ContainerMgr) (*NetworkManager, error) { | |||
There was a problem hiding this comment.
can we replace ctrMgr to containerMgr, because ctrMgr may be a little confused.
There was a problem hiding this comment.
I think both is ok, short name in function paramters
HusterWan
reviewed
May 15, 2018
| // Create a new controller instance | ||
| cfg.NetworkConfg.MetaPath = path.Dir(store.BaseDir) | ||
| cfg.NetworkConfg.ExecRoot = network.DefaultExecRoot | ||
|
|
||
| initNetworkLog(cfg) | ||
|
|
||
| // get active sandboxes | ||
| ctrs, err := ctrMgr.List(context.Background(), |
There was a problem hiding this comment.
replace ctrs to containers ?
HusterWan
reviewed
May 15, 2018
| logrus.Errorf("failed to new network manager, can not get container list") | ||
| return nil, errors.Wrap(err, "failed to get container list") | ||
| } | ||
| cfg.NetworkConfg.ActiveSandboxes = make(map[string]interface{}) |
There was a problem hiding this comment.
do we need to store ActiveSandboxes to disk ?
There was a problem hiding this comment.
don't need to store to disk
shaloulcy
reviewed
May 15, 2018
| @@ -562,7 +585,7 @@ func endpointOptions(n libnetwork.Network, endpoint *types.Endpoint) ([]libnetwo | |||
| return createOptions, nil | |||
| } | |||
|
|
|||
| func (nm *NetworkManager) sandboxOptions(endpoint *types.Endpoint) ([]libnetwork.SandboxOption, error) { | |||
| func buildSandboxOptions(config network.Config, endpoint *types.Endpoint) ([]libnetwork.SandboxOption, error) { | |||
There was a problem hiding this comment.
I think sandbox options should not depend on endpoint config. If we have many endpoints, it means we will lose some information?
There was a problem hiding this comment.
endpoint in pouchd is different from endpoint in libnetwork, next version I will change it to 'NetDevice'
|
LGTM |
pouchrobot
added
the
LGTM
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.
Ⅰ. Describe what this PR did
Fix endpoints disappear when pouchd restart, restore network controller
need keep endpoints that is using by the running containers, add the
active sandboxes option to initialize network controller.
Ⅱ. Does this pull request fix one issue?
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
The container's endpoint is exist when pouchd has restarted.
Ⅴ. Special notes for reviews
Signed-off-by: Rudy Zhang rudyflyzhang@gmail.com