Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Fix regression in handling of NotFound err during startup ENGCORE-929#317

Merged
andrewhsu merged 1 commit intodocker-archive:19.03from
thaJeztah:19.03_backport_fix_39623
Aug 9, 2019
Merged

[19.03 backport] Fix regression in handling of NotFound err during startup ENGCORE-929#317
andrewhsu merged 1 commit intodocker-archive:19.03from
thaJeztah:19.03_backport_fix_39623

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Aug 9, 2019 •
edited
Loading

backport of moby#39703 for 19.03

Signed-off-by: Deep Debroy ddebroy@docker.com
(cherry picked from commit 4d5b626)
Signed-off-by: Sebastiaan van Stijn github@gone.nl

- What I did
Address a regression during daemon startup introduced in moby#38931.

fixes moby#39623
fixes moby#39742
fixes docker/for-win#4463
fixes microsoft/navcontainerhelper#548

- How I did it
Added (back) proper handling of NotFound err

- How to verify it
Start a container in Windows like:

docker run -d --restart always --name testcontainer --network nat -p 8080:80 mcr.microsoft.com/windows/servercore:ltsc2019 ping -t 127.0.0.1

and Restart-Computer.
After reboot, make sure container comes back up properly and is not a zombie.

- Description for the changelog
Fix regression in reboot of Windows daemon

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

@ddebroy @thaJeztah
Fix regression in handling of NotFound err during startup
685565a 
Signed-off-by: Deep Debroy <ddebroy@docker.com>
(cherry picked from commit 4d5b626)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 19.03.2 milestone Aug 9, 2019
@thaJeztah thaJeztah mentioned this pull request Aug 9, 2019
Merged
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Aug 9, 2019

@ddebroy @crosbymichael @kolyshkin ptal

@thaJeztah thaJeztah changed the title [19.03 backport] Fix regression in handling of NotFound err during startup [19.03 backport] Fix regression in handling of NotFound err during startup ENGCORE-929 Aug 9, 2019
@ddebroy
Copy link
Copy Markdown

ddebroy commented Aug 9, 2019

LGTM

@crosbymichael
Copy link
Copy Markdown

crosbymichael commented Aug 9, 2019 via email

kolyshkin
kolyshkin approved these changes Aug 9, 2019
View reviewed changes
Copy link
Copy Markdown

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Aug 9, 2019

RS1 failure can be fixed by moby#39168

which wasn't backported yet

02:24:29 --- FAIL: TestClientWithRequestTimeout (0.00s)
02:24:29     client_test.go:259: assertion failed: 
02:24:29         --- context.DeadlineExceeded
02:24:29         +++ err
02:24:29         :
02:24:29         	-: context.deadlineExceededError{}
02:24:29         	+: &net.OpError{Op: "dial", Net: "tcp", Addr: s"127.0.0.1:49294", Err: &poll.TimeoutError{}}

@andrewhsu andrewhsu merged commit 29fe4e5 into docker-archive:19.03 Aug 9, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_fix_39623 branch August 9, 2019 09:03
@freddydk
Copy link
Copy Markdown

freddydk commented Aug 31, 2019

Any information on when we will see this released?
Azure VMs using image Windows Server 2019 with Containers is now including 19.03.1 and all containers are left as living dead after reboot (which happens frequently)

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Aug 31, 2019

19.03.2 will be released next week and include this patch

@freddydk
Copy link
Copy Markdown

freddydk commented Aug 31, 2019

Great, will there be a docker desktop 2.1.0.2 as well then?
Will have to reach out to Azure team to update the server images asap.

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Aug 31, 2019

Desktop releases will be released in tandem, yes

@cpuguy83
Copy link
Copy Markdown

cpuguy83 commented Sep 19, 2019

Doesn't seem like this commit is in the 19.03.2 tag.

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Sep 19, 2019

@cpuguy83 it looks to be in there?

this repo; https://github.com/docker/engine/blob/v19.03.2/daemon/daemon.go#L338

docker/docker-ce repo: https://github.com/docker/docker-ce/blob/v19.03.2/components/engine/daemon/daemon.go#L338

@cpuguy83
Copy link
Copy Markdown

cpuguy83 commented Sep 19, 2019

Ah, GH is not reporting it in the tag for some reason.
I did a compare and indeed it seems like it is there.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@kolyshkin kolyshkin kolyshkin approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

19.03.2

Development

Successfully merging this pull request may close these issues.

7 participants

@thaJeztah @ddebroy @crosbymichael @freddydk @cpuguy83 @kolyshkin @andrewhsu