Shutdown -> Cancel + cautionary unlock

Author: maxdml

dbos/admin_server_test.go

@@ -30,7 +30,7 @@ func TestAdminServer(t *testing.T) {
 		// Ensure cleanup
 		defer func() {
 			if ctx != nil {
-				ctx.Shutdown()
+				ctx.Cancel()
 			}
 		}()
 
@@ -73,7 +73,7 @@ func TestAdminServer(t *testing.T) {
 		// Ensure cleanup
 		defer func() {
 			if ctx != nil {
-				ctx.Shutdown()
+				ctx.Cancel()
 			}
 		}()
 

dbos/dbos.go

@@ -58,7 +58,7 @@ type DBOSContext interface {
 
 	// Context Lifecycle
 	Launch() error
-	Shutdown()
+	Cancel()
 
 	// Workflow operations
 	RunAsStep(_ DBOSContext, fn StepFunc, input any) (any, error)
@@ -315,9 +315,8 @@ func (c *dbosContext) Launch() error {
 	return nil
 }
 
-// We might consider renaming this to "Cancel" to me more idiomatic
 // TODO: shutdown should really have a timeout and return an error if it wasn't able to shutdown everything
-func (c *dbosContext) Shutdown() {
+func (c *dbosContext) Cancel() {
 	c.logger.Info("Shutting down DBOS context")
 
 	// Cancel the context to signal all resources to stop

dbos/dbos_test.go

@@ -20,7 +20,7 @@ func TestConfigValidationErrorTypes(t *testing.T) {
 		}
 		defer func() {
 			if ctx != nil {
-				ctx.Shutdown()
+				ctx.Cancel()
 			}
 		}() // Clean up executor
 

dbos/logger_test.go

@@ -24,7 +24,7 @@ func TestLogger(t *testing.T) {
 		}
 		t.Cleanup(func() {
 			if dbosCtx != nil {
-				dbosCtx.Shutdown()
+				dbosCtx.Cancel()
 			}
 		})
 
@@ -62,7 +62,7 @@ func TestLogger(t *testing.T) {
 		}
 		t.Cleanup(func() {
 			if dbosCtx != nil {
-				dbosCtx.Shutdown()
+				dbosCtx.Cancel()
 			}
 		})
 

dbos/utils_test.go

@@ -72,7 +72,7 @@ func setupDBOS(t *testing.T, dropDB bool, checkLeaks bool) DBOSContext {
 	t.Cleanup(func() {
 		dbosCtx.(*dbosContext).logger.Info("Cleaning up DBOS instance...")
 		if dbosCtx != nil {
-			dbosCtx.Shutdown()
+			dbosCtx.Cancel()
 		}
 		dbosCtx = nil
 		if checkLeaks {

dbos/workflows_test.go

@@ -1072,6 +1072,8 @@ func sendIdempotencyWorkflow(ctx DBOSContext, input sendWorkflowInput) (string,
 func receiveIdempotencyWorkflow(ctx DBOSContext, topic string) (string, error) {
 	msg, err := Recv[string](ctx, WorkflowRecvInput{Topic: topic, Timeout: 3 * time.Second})
 	if err != nil {
+		// Unlock the test in this case
+		receiveIdempotencyStartEvent.Set()
 		return "", err
 	}
 	receiveIdempotencyStartEvent.Set()