Windows: Wait for OOBE to prevent crashing during host update #31054
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
lowenna
reviewed
Feb 15, 2017
| @@ -601,3 +606,45 @@ func (daemon *Daemon) verifyVolumesInfo(container *container.Container) error { | |||
| func (daemon *Daemon) setupSeccompProfile() error { | |||
| return nil | |||
| } | |||
|
|
|||
| func waitOOBEComplete() error { | |||
There was a problem hiding this comment.
Wondering if these two OOBE functions should be in pkg\system? (Nit, not essential)
There was a problem hiding this comment.
I think pkg/system is generally for platform agnostic versions of things. Not to say I would be against moving it makes sense there though.
|
LGTM with one minor comment. |
|
@johnstep FYI |
johnstep
requested changes
Feb 15, 2017
daemon/daemon_windows.go
Outdated
| return nil | ||
| } | ||
|
|
||
| func isOOBEComplete() (OOBEComplete bool, err error) { |
There was a problem hiding this comment.
Looks like isOOBEComplete is unused.
cmd/dockerd/daemon_windows.go
Outdated
| func notifySystem() { | ||
| // preNotifySystem sends a message to the host when the API is active, but before the daemon is | ||
| func preNotifySystem() { | ||
| // start the service now to prevent timeouts waiting for daemon to started |
Signed-off-by: Darren Stahl <darst@microsoft.com>
This was referenced Mar 24, 2017
Closed
|
@thaJeztah If #32152 is merged, the changelog from this PR is no longer needed. |
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.
Signed-off-by: Darren Stahl darst@microsoft.com
- What I did
Prevent a Daemon crash during host update.
- How I did it
Some services Docker depends on are not active during a host update. This PR holds daemon initialization until after a host update is completed.
It also notifies the Windows Service Control Manager that the service has started as soon as the API is active to prevent service start timeouts waiting for OOBE or daemon initialization.
- How to verify it
Install Docker service on a machine that receives manual OS updates, such as a Windows Insider machine. After an update is installed, the daemon was not running, with an SCM log stating that it terminated unexpectedly. With this update, the daemon will be running.
- Description for the changelog
Prevent crash during Windows host update.
/cc @jhowardmsft @jstarks