search

projectatomic / docker

Docker - the open-source application container engine
http://www.docker.com
Apache License 2.0
81 stars 58 forks source link

Fix for docker ps hang after docker restart with liverestore #310

Closed TomSweeneyRedHat closed 6 years ago

TomSweeneyRedHat commented 6 years ago

Signed-off-by: TomSweeneyRedHat tsweeney@redhat.com

- What I did Changed the handling of FIFO's when --live-restore is in play. Without this change the FIFO's were not cleared on restart and the docker operation hung waiting for them to reopen and they never would.

- How I did it vi is my friend

- How to verify it See bugzilla for test description. To duplicate test one must 'setenforce 0' before running the script, that is not noted in the BZ. (https://bugzilla.redhat.com/show_bug.cgi?id=1566439)

- Description for the changelog Fix for docker hang after restart when live-restore is configured

- A picture of a cute animal (not mandatory but encouraged)

mbaldessari commented 6 years ago

Thanks Tom! Am I missing something or is a file missing in this commit series? rpm scratch build with the three commits here is failing with the following: _build/src/github.com/docker/docker/daemon/logger/jsonfilelog/read.go:16:2: cannot find package "github.com/docker/docker/daemon/logger/jsonfilelog/multireader"

runcom commented 6 years ago

We talked yesterday and I believe he's about to fix that Michele

mbaldessari commented 6 years ago

Ack, you guys just give me a shout when ready and I will try and test this as much as I can

TomSweeneyRedHat commented 6 years ago

@mbaldessari OH SHOOT! I forgot to include two files in this PR. I'll go straighten that out.

TomSweeneyRedHat commented 6 years ago

@mbaldessari Just reposted with the missing files. Sorry about the ooops!

mbaldessari commented 6 years ago

I dropped you a line. I built an rpm with these five commits but had no luck (i.e. issue is still there)? Not sure I missed something though

rhatdan commented 6 years ago

Tom could you squash your PRS?

TomSweeneyRedHat commented 6 years ago

PR's be squished. Touched up the commit message too.

mbaldessari commented 6 years ago

I'll recap more in detail in the BZ, but initial testing looks good from my side as well. Thanks!

rhatdan commented 6 years ago

LGTM @runcom PTAL

runcom commented 6 years ago

LGTM but I'd love @mbaldessari to LGTM this after re-testing.

mbaldessari commented 6 years ago

Tested over the weekend and worked okay for me. LGTM

rhatdan commented 6 years ago

Merging.

rhatdan commented 6 years ago

@lsm5 can @fkluknav we get a new RHEL build for this?