Change restart delay for Windows service to 15s

kevpar · kevpar · commit cee19d1e6eaf · 2019-05-29T16:41:27.000-07:00
Previously we waited for 60 seconds after the service faults to restart
it. However, there isn't much benefit to waiting this long. We expect
15 seconds to be a more reasonable delay.

Signed-off-by: Kevin Parsons &lt;kevpar@microsoft.com&gt;
diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go
@@ -270,8 +270,8 @@ func registerService() error {
 		Delay uint32
 	}
 	t := []scAction{
-		{Type: scActionRestart, Delay: uint32(60 * time.Second / time.Millisecond)},
-		{Type: scActionRestart, Delay: uint32(60 * time.Second / time.Millisecond)},
+		{Type: scActionRestart, Delay: uint32(15 * time.Second / time.Millisecond)},
+		{Type: scActionRestart, Delay: uint32(15 * time.Second / time.Millisecond)},
 		{Type: scActionNone},
 	}
 	lpInfo := serviceFailureActions{ResetPeriod: uint32(24 * time.Hour / time.Second), ActionsCount: uint32(3), Actions: uintptr(unsafe.Pointer(&t[0]))}

Original file line number	Diff line number	Diff line change
`@@ -270,8 +270,8 @@ func registerService() error {`
`270`	`270`	`Delay uint32`
`271`	`271`	`}`
`272`	`272`	`t := []scAction{`
`273`		`- {Type: scActionRestart, Delay: uint32(60 * time.Second / time.Millisecond)},`
`274`		`- {Type: scActionRestart, Delay: uint32(60 * time.Second / time.Millisecond)},`
	`273`	`+ {Type: scActionRestart, Delay: uint32(15 * time.Second / time.Millisecond)},`
	`274`	`+ {Type: scActionRestart, Delay: uint32(15 * time.Second / time.Millisecond)},`
`275`	`275`	`{Type: scActionNone},`
`276`	`276`	`}`
`277`	`277`	`lpInfo := serviceFailureActions{ResetPeriod: uint32(24 * time.Hour / time.Second), ActionsCount: uint32(3), Actions: uintptr(unsafe.Pointer(&t[0]))}`