backport of commit dfadb2b

hashicorp · Feb 15, 2022 · 9df3a66 · 9df3a66
1 parent 8de9f8c
commit 9df3a66
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/client/allocrunner/taskrunner/plugin_supervisor_hook.go b/client/allocrunner/taskrunner/plugin_supervisor_hook.go
@@ -238,6 +238,7 @@ WAITFORREADY:
 			}
 
 			// Mark the plugin as healthy in a task event
+			h.logger.Debug("CSI plugin is ready")
 			h.previousHealthState = pluginHealthy
 			event := structs.NewTaskEvent(structs.TaskPluginHealthy)
 			event.SetMessage(fmt.Sprintf("plugin: %s", h.task.CSIPluginConfig.ID))
@@ -251,6 +252,7 @@ WAITFORREADY:
 	deregisterPluginFn, err := h.registerPlugin(client, socketPath)
 	if err != nil {
 		h.kill(ctx, fmt.Errorf("CSI plugin failed to register: %v", err))
+		return
 	}
 
 	// Step 3: Start the lightweight supervisor loop. At this point, failures