engine: increase process kill timeout (#3444)

integration/local_resource_test.go

@@ -33,8 +33,8 @@ func TestLocalResourceCleanup(t *testing.T) {
 
 	select {
 	case <-f.activeTiltUp.done:
-	case <-time.After(2 * time.Second):
-		t.Fatal("Tilt failed to exit within 2 seconds of SIGTERM")
+	case <-time.After(5 * time.Second):
+		t.Fatal("Tilt failed to exit within 5 seconds of SIGTERM")
 	}
 
 	// hello.sh writes to cleanup.txt on SIGTERM

internal/engine/local/execer.go

@@ -175,7 +175,10 @@ func processRun(ctx context.Context, cmd model.Cmd, w io.Writer, statusCh chan s
 		} else {
 			// wait and then send SIGKILL to the process group, unless the command finished
 			select {
-			case <-time.After(50 * time.Millisecond):
+			// we wait 30 seconds to give the process enough time to finish doing any cleanup.
+			// this is the same timeout that Kubernetes uses
+			// TODO(dmiller): make this configurable via the Tiltfile
+			case <-time.After(30 * time.Second):
 				procutil.KillProcessGroup(c)
 			case <-doneCh:
 			}

internal/engine/local/execer_test.go

@@ -157,7 +157,7 @@ func (f *processExecFixture) waitForStatusAndNoError(expectedStatus status) {
 				f.t.Error("Unexpected Error sm")
 				return
 			}
-		case <-time.After(10 * time.Second):
+		case <-time.After(35 * time.Second):
 			f.t.Fatal("Timed out waiting for cmd sm")
 		}
 	}