bugfix: vendor latest libnetwork for connect panic #1556
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
pouchrobot
added
kind/bug
Codecov Report
@@ Coverage Diff @@
## master #1556 +/- ##
==========================================
- Coverage 41.58% 41.57% -0.02%
==========================================
Files 267 267
Lines 17339 17339
==========================================
- Hits 7211 7209 -2
- Misses 9241 9243 +2
Partials 887 887
|
|
Do we need to add integration test to cover issue #1550 ? @shaloulcy |
shaloulcy
force-pushed
the
connect_panic
branch
2 times, most recently
from
b0347d8 to
ca4f8c8
Compare
|
@allencloud I have added integration test. PTAL |
rudyfly
reviewed
Jun 20, 2018
daemon/mgr/network.go
Outdated
| @@ -727,7 +727,5 @@ func joinOptions(endpoint *types.Endpoint) ([]libnetwork.EndpointOption, error) | |||
| var joinOptions []libnetwork.EndpointOption | |||
| // TODO: parse endpoint's links | |||
|
|
|||
| // set priority option | |||
| joinOptions = append(joinOptions, libnetwork.JoinOptionPriority(nil, endpoint.Priority)) | |||
There was a problem hiding this comment.
I'm afraid I will refuse about this, we have used this feature, can you fix this bug in our libnetwork(https://github.com/alibaba/libnetwork) ?
There was a problem hiding this comment.
@rudyfly I have update the codes, PTAL
It seems a bug of libnetwork. When libnetwork restores the sandbox, it forgets to initialize the epPriority map. So the Join panic. The latest alibaba/libnetwork has fixed the bug. We will vendor the latest libnetwork and add some test cases alibaba/libnetwork@655f08f Signed-off-by: Eric Li <lcy041536@gmail.com>
shaloulcy
changed the title
shaloulcy
changed the title
|
LGTM |
pouchrobot
added
the
LGTM
This was referenced Jun 21, 2018
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.
It seems a bug of libnetwork. When libnetwork restores the sandbox, it forgets to initialize the epPriority map. So the Join panic. The latest alibaba/libnetwork has fixed the bug. We will vendor the latest libnetwork and add some test cases
Signed-off-by: Eric Li lcy041536@gmail.com
Ⅰ. Describe what this PR did
It seems a bug of libnetwork. When libnetwork restores the sandbox, it forgets to initialize the epPriority map. So the Join panic. The latest alibaba/libnetwork has fixed the bug. We will vendor the latest libnetwork and add some test cases
Ⅱ. Does this pull request fix one issue?
fixes #1550
Ⅲ. Describe how you did it
Ⅳ. Describe how to verify it
Ⅴ. Special notes for reviews