remove error return from Stop() (nothing to really do about it, the controllers must make best effort to clean up)

Author: sawka

pkg/blockcontroller/blockcontroller.go

@@ -65,7 +65,7 @@ type BlockControllerRuntimeStatus struct {
 // Controller interface that all block controllers must implement
 type Controller interface {
 	Start(ctx context.Context, blockMeta waveobj.MetaMapType, rtOpts *waveobj.RuntimeOpts, force bool) error
-	Stop(graceful bool, newStatus string, destroy bool) error
+	Stop(graceful bool, newStatus string, destroy bool)
 	GetRuntimeStatus() *BlockControllerRuntimeStatus // does not return nil
 	SendInput(input *BlockInputUnion) error
 }

pkg/blockcontroller/shellcontroller.go

@@ -93,7 +93,7 @@ func (sc *ShellController) Start(ctx context.Context, blockMeta waveobj.MetaMapT
 	return nil
 }
 
-func (sc *ShellController) Stop(graceful bool, newStatus string, destroy bool) error {
+func (sc *ShellController) Stop(graceful bool, newStatus string, destroy bool) {
 	sc.Lock.Lock()
 	defer sc.Lock.Unlock()
 
@@ -102,7 +102,7 @@ func (sc *ShellController) Stop(graceful bool, newStatus string, destroy bool) e
 			sc.ProcStatus = newStatus
 			sc.sendUpdate_nolock()
 		}
-		return nil
+		return
 	}
 
 	sc.ShellProc.Close()
@@ -116,7 +116,6 @@ func (sc *ShellController) Stop(graceful bool, newStatus string, destroy bool) e
 	// Update status
 	sc.ProcStatus = newStatus
 	sc.sendUpdate_nolock()
-	return nil
 }
 
 func (sc *ShellController) getRuntimeStatus_nolock() BlockControllerRuntimeStatus {

pkg/blockcontroller/shelljobcontroller.go

@@ -10,6 +10,7 @@ import (
 	"io/fs"
 	"log"
 	"sync"
+	"time"
 
 	"github.com/google/uuid"
 	"github.com/wavetermdev/waveterm/pkg/blocklogger"
@@ -188,17 +189,21 @@ func (sjc *ShellJobController) Start(ctx context.Context, blockMeta waveobj.Meta
 	return nil
 }
 
-func (sjc *ShellJobController) Stop(graceful bool, newStatus string, destroy bool) error {
+func (sjc *ShellJobController) Stop(graceful bool, newStatus string, destroy bool) {
 	if !destroy {
-		return nil
+		return
 	}
 	jobId := sjc.getJobId()
 	if jobId == "" {
-		return nil
+		return
 	}
-	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
 	jobcontroller.DetachJobFromBlock(ctx, jobId, false)
-	return jobcontroller.TerminateJobManager(ctx, jobId)
+	err := jobcontroller.TerminateJobManager(ctx, jobId)
+	if err != nil {
+		log.Printf("error terminating job manager: %v\n", err)
+	}
 }
 
 func (sjc *ShellJobController) SendInput(inputUnion *BlockInputUnion) error {

pkg/blockcontroller/tsunamicontroller.go

@@ -235,13 +235,13 @@ func (c *TsunamiController) Start(ctx context.Context, blockMeta waveobj.MetaMap
 	return nil
 }
 
-func (c *TsunamiController) Stop(graceful bool, newStatus string, destroy bool) error {
+func (c *TsunamiController) Stop(graceful bool, newStatus string, destroy bool) {
 	log.Printf("TsunamiController.Stop called for block %s (graceful: %t, newStatus: %s)", c.blockId, graceful, newStatus)
 	c.runLock.Lock()
 	defer c.runLock.Unlock()
 
 	if c.tsunamiProc == nil {
-		return nil
+		return
 	}
 
 	if c.tsunamiProc.Cmd.Process != nil {
@@ -262,7 +262,6 @@ func (c *TsunamiController) Stop(graceful bool, newStatus string, destroy bool)
 	})
 	c.clearSchemas()
 	go c.sendStatusUpdate()
-	return nil
 }
 
 func (c *TsunamiController) GetRuntimeStatus() *BlockControllerRuntimeStatus {

pkg/jobcontroller/jobcontroller.go

@@ -466,7 +466,7 @@ func tryTerminateJobManager(ctx context.Context, jobId string) {
 }
 
 func TerminateJobManager(ctx context.Context, jobId string) error {
-	err := wstore.DBUpdateFn[*waveobj.Job](ctx, jobId, func(job *waveobj.Job) {
+	err := wstore.DBUpdateFn(ctx, jobId, func(job *waveobj.Job) {
 		job.TerminateOnReconnect = true
 	})
 	if err != nil {