beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #37583 from Microsoft/jjh.37562

Browse source 
Don't invoke HCS shutdown if terminate called; removes unused vars and no-op calls
This commit is contained in:
Sebastiaan van Stijn 2018-08-03 22:05:06 +02:00 committed by GitHub
commit eeea12db7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
libcontainerd/client_local_windows.go
View file

@ -42,18 +42,17 @@ type container struct {
// have access to the Spec
ociSpec *specs.Spec
isWindows bool
manualStopRequested bool
hcsContainer hcsshim.Container
isWindows bool
hcsContainer hcsshim.Container
id string
status Status
exitedAt time.Time
exitCode uint32
waitCh chan struct{}
init *process
execs map[string]*process
updatePending bool
id string
status Status
exitedAt time.Time
exitCode uint32
waitCh chan struct{}
init *process
execs map[string]*process
terminateInvoked bool
}
// Win32 error codes that are used for various workarounds
@ -324,15 +323,15 @@ func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions inter
logger.Debug("starting container")
if err = hcsContainer.Start(); err != nil {
c.logger.WithError(err).Error("failed to start container")
ctr.debugGCS()
ctr.Lock()
if err := c.terminateContainer(ctr); err != nil {
c.logger.WithError(err).Error("failed to cleanup after a failed Start")
} else {
c.logger.Debug("cleaned up after failed Start by calling Terminate")
}
ctr.Unlock()
return err
}
ctr.debugGCS()
c.Lock()
c.containers[id] = ctr
@ -528,11 +527,13 @@ func (c *client) createLinux(id string, spec *specs.Spec, runtimeOptions interfa
if err = hcsContainer.Start(); err != nil {
c.logger.WithError(err).Error("failed to start container")
ctr.debugGCS()
ctr.Lock()
if err := c.terminateContainer(ctr); err != nil {
c.logger.WithError(err).Error("failed to cleanup after a failed Start")
} else {
c.logger.Debug("cleaned up after failed Start by calling Terminate")
}
ctr.Unlock()
return err
}
ctr.debugGCS()
@ -852,8 +853,6 @@ func (c *client) SignalProcess(_ context.Context, containerID, processID string,
return err
}
ctr.manualStopRequested = true
logger := c.logger.WithFields(logrus.Fields{
"container": containerID,
"process": processID,
@ -865,11 +864,14 @@ func (c *client) SignalProcess(_ context.Context, containerID, processID string,
if processID == InitProcessName {
if syscall.Signal(signal) == syscall.SIGKILL {
// Terminate the compute system
ctr.Lock()
ctr.terminateInvoked = true
if err := ctr.hcsContainer.Terminate(); err != nil {
if !hcsshim.IsPending(err) {
logger.WithError(err).Error("failed to terminate hccshim container")
}
}
ctr.Unlock()
} else {
// Shut down the container
if err := ctr.hcsContainer.Shutdown(); err != nil {
@ -1171,12 +1173,17 @@ func (c *client) getProcess(containerID, processID string) (*container, *process
return ctr, p, nil
}
// ctr mutex must be held when calling this function.
func (c *client) shutdownContainer(ctr *container) error {
const shutdownTimeout = time.Minute * 5
err := ctr.hcsContainer.Shutdown()
var err error
const waitTimeout = time.Minute * 5
if hcsshim.IsPending(err) {
err = ctr.hcsContainer.WaitTimeout(shutdownTimeout)
if !ctr.terminateInvoked {
err = ctr.hcsContainer.Shutdown()
}
if hcsshim.IsPending(err) || ctr.terminateInvoked {
err = ctr.hcsContainer.WaitTimeout(waitTimeout)
} else if hcsshim.IsAlreadyStopped(err) {
err = nil
}
@ -1196,8 +1203,10 @@ func (c *client) shutdownContainer(ctr *container) error {
return nil
}
// ctr mutex must be held when calling this function.
func (c *client) terminateContainer(ctr *container) error {
const terminateTimeout = time.Minute * 5
ctr.terminateInvoked = true
err := ctr.hcsContainer.Terminate()
if hcsshim.IsPending(err) {
@ -1263,7 +1272,6 @@ func (c *client) reapProcess(ctr *container, p *process) int {
ctr.exitedAt = exitedAt
ctr.exitCode = uint32(exitCode)
close(ctr.waitCh)
ctr.Unlock()
if err := c.shutdownContainer(ctr); err != nil {
exitCode = -1
@ -1277,6 +1285,7 @@ func (c *client) reapProcess(ctr *container, p *process) int {
} else {
logger.Debug("completed container shutdown")
}
ctr.Unlock()
if err := ctr.hcsContainer.Close(); err != nil {
exitCode = -1