summaryrefslogtreecommitdiffhomepage
path: root/runsc/boot/loader.go
diff options
context:
space:
mode:
Diffstat (limited to 'runsc/boot/loader.go')
-rw-r--r--runsc/boot/loader.go7
1 files changed, 1 insertions, 6 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go
index d8282d1d1..8d71d7447 100644
--- a/runsc/boot/loader.go
+++ b/runsc/boot/loader.go
@@ -16,7 +16,6 @@
package boot
import (
- gcontext "context"
"errors"
"fmt"
mrand "math/rand"
@@ -469,8 +468,6 @@ func createProcessArgs(id string, spec *specs.Spec, creds *auth.Credentials, k *
return procArgs, nil
}
-const destroyTimeout = 15 * gtime.Second
-
// Destroy cleans up all resources used by the loader.
//
// Note that this will block until all open control server connections have
@@ -485,9 +482,7 @@ func (l *Loader) Destroy() {
// Stop the control server. This will indirectly stop any
// long-running control operations that are in flight, e.g.
// profiling operations.
- ctx, cancel := gcontext.WithTimeout(context.Background(), destroyTimeout)
- defer cancel()
- l.ctrl.stop(ctx)
+ l.ctrl.stop()
// Release all kernel resources. This is only safe after we can no longer
// save/restore.