-
Notifications
You must be signed in to change notification settings - Fork 18.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
2089 fix restart runtime error #2409
2089 fix restart runtime error #2409
Conversation
Issue #2089 |
Oops, I forgot that invoke-rc.d only works for init scripts (not upstart). If you replace that with |
I actually just copied and pasted the wrong block (I reran with |
|
Cool! Major +1 from me for taking care of this! (although, IANTM) |
@@ -932,7 +932,7 @@ func (container *Container) allocateNetwork() error { | |||
|
|||
var iface *NetworkInterface | |||
var err error | |||
if !container.State.Ghost { | |||
if !container.State.Ghost || !container.State.Running { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you sure about the ||
? the if is now always returning true.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Meh I could have messed this up. I won't have time to look at until this evening.
I believe that if we have a non-running ghost we should create the network, let me add a test for the happy path and figure it out.
@vieux please take another look - I've made an explicit nil network ip check and both unit and manual test still passes. |
LGTM, ping @crosbymichael |
Need to rebase having some test failure issues. Will ping PR when fixed. |
Have fixed up and my test passes with the signature change but getting failures https://gist.github.com/pnasrat/d1fcd6bab3d2028c6c82 @ecnahc515 is also seeing the lxc-kill failures |
Actually I misread the output and it passes after I updated the host docker to be the same version https://gist.github.com/pnasrat/d1fcd6bab3d2028c6c82 @crosbymichael should be ready for review. |
LGTM |
Fix restart runtime error with ghost container networking
Tested with unittest and latest reproducer in bug.