Merge pull request #320 from andyzhangx/namePattern-list

feat: support namePattern as a list

Author: andyzhangx

pkg/common/common.go

@@ -84,7 +84,7 @@ const (
 	// DefaultVolumeMode is the default volume mode of created PV object.
 	DefaultVolumeMode = "Filesystem"
 
-	// DefaultNamePattern is the default name pattern of in PV discovery.
+	// DefaultNamePattern is the default name pattern list (separated by comma) of in PV discovery.
 	DefaultNamePattern = "*"
 )
 

pkg/common/common_test.go

@@ -109,7 +109,7 @@ func TestLoadProvisionerConfigs(t *testing.T) {
      - "2"
    volumeMode: Filesystem
    fsType: ext4
-   namePattern: nvm*
+   namePattern: nvm*,sdb*
 `,
 				"useAlphaAPI":     "true",
 				"minResyncPeriod": "1h30m",
@@ -122,7 +122,7 @@ func TestLoadProvisionerConfigs(t *testing.T) {
 						BlockCleanerCommand: []string{"/scripts/shred.sh", "2"},
 						VolumeMode:          "Filesystem",
 						FsType:              "ext4",
-						NamePattern:         "nvm*",
+						NamePattern:         "nvm*,sdb*",
 					},
 				},
 				UseAlphaAPI: true,

pkg/discovery/discovery.go

@@ -276,19 +276,31 @@ func (d *Discoverer) discoverVolumesAtPath(class string, config common.MountConf
 		mountPointMap[mp.Path] = empty{}
 	}
 
+	var namePatterns []string
+	if config.NamePattern != "" {
+		namePatterns = strings.Split(config.NamePattern, ",")
+	}
+
 	var discoErrors []error
 	var totalCapacityBlockBytes, totalCapacityFSBytes int64
 	for _, file := range files {
-		if config.NamePattern != "" {
-			matched, err := filepath.Match(config.NamePattern, file)
-			if err != nil {
-				return err
-			}
-			if !matched {
-				klog.V(5).Infof("file(%s) under(%s) does not match pattern(%s)", file, config.MountDir, config.NamePattern)
-				continue
+		var matched bool
+		for _, pattern := range namePatterns {
+			if pattern != "" {
+				matched, err = filepath.Match(pattern, file)
+				if err != nil {
+					return err
+				}
+				if matched {
+					break
+				}
 			}
 		}
+		if config.NamePattern != "" && !matched {
+			klog.V(5).Infof("file(%s) under(%s) does not match pattern(%s)", file, config.MountDir, config.NamePattern)
+			continue
+		}
+
 		startTime := time.Now()
 		filePath := filepath.Join(config.MountDir, file)
 		volMode, err := common.GetVolumeMode(d.VolUtil, filePath)