restore nil-check for watch

hashicorp · Nov 25, 2020 · b3a9402 · b3a9402
1 parent 88a7e71
commit b3a9402
Showing 1 changed file with 24 additions and 24 deletions.
diff --git a/nomad/state/state_store.go b/nomad/state/state_store.go
@@ -2102,9 +2102,9 @@ func (s *StateStore) CSIVolumes(ws memdb.WatchSet) (memdb.ResultIterator, error)
 	if err != nil {
 		return nil, fmt.Errorf("csi_volumes lookup failed: %v", err)
 	}
-
-	ws.Add(iter.WatchCh())
-
+	if ws != nil {
+		ws.Add(iter.WatchCh())
+	}
 	return iter, nil
 }
 
@@ -2118,9 +2118,9 @@ func (s *StateStore) CSIVolumeByID(ws memdb.WatchSet, namespace, id string) (*st
 	if err != nil {
 		return nil, fmt.Errorf("volume lookup failed: %s %v", id, err)
 	}
-
-	ws.Add(watchCh)
-
+	if ws != nil {
+		ws.Add(watchCh)
+	}
 	if obj == nil {
 		return nil, nil
 	}
@@ -2163,9 +2163,9 @@ func (s *StateStore) CSIVolumesByIDPrefix(ws memdb.WatchSet, namespace, volumeID
 	if err != nil {
 		return nil, err
 	}
-
-	ws.Add(iter.WatchCh())
-
+	if ws != nil {
+		ws.Add(iter.WatchCh())
+	}
 	return iter, nil
 }
 
@@ -2206,9 +2206,9 @@ func (s *StateStore) CSIVolumesByNodeID(ws memdb.WatchSet, nodeID string) (memdb
 		}
 		iter.Add(raw)
 	}
-
-	ws.Add(iter.WatchCh())
-
+	if ws != nil {
+		ws.Add(iter.WatchCh())
+	}
 	return iter, nil
 }
 
@@ -2220,9 +2220,9 @@ func (s *StateStore) CSIVolumesByNamespace(ws memdb.WatchSet, namespace string)
 	if err != nil {
 		return nil, fmt.Errorf("volume lookup failed: %v", err)
 	}
-
-	ws.Add(iter.WatchCh())
-
+	if ws != nil {
+		ws.Add(iter.WatchCh())
+	}
 	return iter, nil
 }
 
@@ -2479,9 +2479,9 @@ func (s *StateStore) CSIPlugins(ws memdb.WatchSet) (memdb.ResultIterator, error)
 	if err != nil {
 		return nil, fmt.Errorf("csi_plugins lookup failed: %v", err)
 	}
-
-	ws.Add(iter.WatchCh())
-
+	if ws != nil {
+		ws.Add(iter.WatchCh())
+	}
 	return iter, nil
 }
 
@@ -2493,9 +2493,9 @@ func (s *StateStore) CSIPluginsByIDPrefix(ws memdb.WatchSet, pluginID string) (m
 	if err != nil {
 		return nil, err
 	}
-
-	ws.Add(iter.WatchCh())
-
+	if ws != nil {
+		ws.Add(iter.WatchCh())
+	}
 	return iter, nil
 }
 
@@ -2517,9 +2517,9 @@ func (s *StateStore) CSIPluginByIDTxn(txn Txn, ws memdb.WatchSet, id string) (*s
 	if err != nil {
 		return nil, fmt.Errorf("csi_plugin lookup failed: %s %v", id, err)
 	}
-
-	ws.Add(watchCh)
-
+	if ws != nil {
+		ws.Add(watchCh)
+	}
 	if obj != nil {
 		return obj.(*structs.CSIPlugin), nil
 	}