diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-11-01 18:52:22 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-11-01 18:52:22 +0000 |
| commit | b31a97c1767cce79adab1135bddca84cf834e51d (patch) | |
| tree | a9887bd7f9507e33a9b50815a6d8751c4657dd8c /runsc/boot | |
| parent | e7f30113e2a244a8acc080097909406688c50236 (diff) | |
| parent | e70f28664af53b0428405c695c90a91b9bb43f67 (diff) | |
Merge release-20190806.1-361-ge70f286 (automated)
Diffstat (limited to 'runsc/boot')
| -rw-r--r-- | runsc/boot/controller.go | 4 | ||||
| -rw-r--r-- | runsc/boot/loader.go | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/runsc/boot/controller.go b/runsc/boot/controller.go index 928285683..f62be4c59 100644 --- a/runsc/boot/controller.go +++ b/runsc/boot/controller.go @@ -380,7 +380,9 @@ func (cm *containerManager) Restore(o *RestoreOpts, _ *struct{}) error { } // Since we have a new kernel we also must make a new watchdog. - dog := watchdog.New(k, watchdog.DefaultTimeout, cm.l.conf.WatchdogAction) + dogOpts := watchdog.DefaultOpts + dogOpts.TaskTimeoutAction = cm.l.conf.WatchdogAction + dog := watchdog.New(k, dogOpts) // Change the loader fields to reflect the changes made when restoring. cm.l.k = k diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 86df384f8..4d1bd2d08 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -300,7 +300,9 @@ func New(args Args) (*Loader, error) { } // Create a watchdog. - dog := watchdog.New(k, watchdog.DefaultTimeout, args.Conf.WatchdogAction) + dogOpts := watchdog.DefaultOpts + dogOpts.TaskTimeoutAction = args.Conf.WatchdogAction + dog := watchdog.New(k, dogOpts) procArgs, err := newProcess(args.ID, args.Spec, creds, k, k.RootPIDNamespace()) if err != nil { |