Only run data cache watcher if a data cache nodepool exist & adding

check for VG cleanup

Author: halimsam

cmd/gce-pd-csi-driver/main.go

@@ -259,10 +259,12 @@ func handle() {
 			if nodeName == nil || *nodeName == "" {
 				klog.Errorf("Data Cache enabled, but --node-name not passed")
 			}
-			if err := setupDataCache(ctx, *nodeName, nodeServer.MetadataService.GetName()); err != nil {
-				klog.Errorf("DataCache setup failed: %v", err)
+			if nsArgs.DataCacheEnabledNodePool {
+				if err := setupDataCache(ctx, *nodeName, nodeServer.MetadataService.GetName()); err != nil {
+					klog.Errorf("DataCache setup failed: %v", err)
+				}
+				go driver.StartWatcher(*nodeName)
 			}
-			go driver.StartWatcher(*nodeName)
 		}
 	}
 

pkg/gce-pd-csi-driver/cache.go

@@ -453,6 +453,10 @@ func createVg(volumeGroupName string, raidedLocalSsds string) error {
 }
 
 func reduceVolumeGroup(volumeGroupName string, force bool) {
+	if !checkVgExists(volumeGroupName) {
+		klog.V(2).Infof("Volume group %v not found, no further action needed", volumeGroupName)
+		return
+	}
 	args := []string{
 		"--removemissing",
 		volumeGroupName,