Merge 0d3b86a into backport/csi-client-events-npe/closely-free-gnat

hashicorp · Dec 12, 2022 · 882e5d0 · 882e5d0
2 parents e35b034 + 0d3b86a
commit 882e5d0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.changelog/15518.txt b/.changelog/15518.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+csi: Fixed a bug where a crashing plugin could panic the Nomad client
+```
diff --git a/client/dynamicplugins/registry.go b/client/dynamicplugins/registry.go
@@ -269,12 +269,14 @@ func (d *dynamicRegistry) DeregisterPlugin(ptype, name, allocID string) error {
 		}
 	}
 
-	broadcaster := d.broadcasterForPluginType(ptype)
-	event := &PluginUpdateEvent{
-		EventType: EventTypeDeregistered,
-		Info:      info,
+	if info != nil {
+		broadcaster := d.broadcasterForPluginType(ptype)
+		event := &PluginUpdateEvent{
+			EventType: EventTypeDeregistered,
+			Info:      info,
+		}
+		broadcaster.broadcast(event)
 	}
-	broadcaster.broadcast(event)
 
 	return d.sync()
 }

diff --git a/client/pluginmanager/csimanager/manager.go b/client/pluginmanager/csimanager/manager.go
@@ -149,7 +149,7 @@ func (c *csiManager) resyncPluginsFromRegistry(ptype string) {
 
 // handlePluginEvent syncs a single event against the plugin registry
 func (c *csiManager) handlePluginEvent(event *dynamicplugins.PluginUpdateEvent) {
-	if event == nil {
+	if event == nil || event.Info == nil {
 		return
 	}
 	c.logger.Trace("dynamic plugin event",