fix

Author: fengzixu

pkg/hostpath/hostpath.go

@@ -167,9 +167,53 @@ func discoverExistingSnapshots() {
 	}
 }
 
+func discoveryExistingVolumes() error {
+	cmdPath := locateCommandPath("findmnt")
+	out, err := exec.Command(cmdPath, "--json").CombinedOutput()
+	if err != nil {
+		glog.V(3).Infof("failed to execute command: %+v", cmdPath)
+		return err
+	}
+
+	if len(out) < 1 {
+		return fmt.Errorf("mount point info is nil")
+	}
+
+	mountInfos, err := parseMountInfo([]byte(out))
+	if err != nil {
+		return fmt.Errorf("failed to parse the mount infos: %+v", err)
+	}
+
+	mountInfosOfPod := MountPointInfo{}
+	for _, mountInfo := range mountInfos {
+		if mountInfo.Target == podVolumeTargetPath {
+			mountInfosOfPod = mountInfo
+			break
+		}
+	}
+
+	// getting existing volumes based on the mount point infos.
+	// It's a temporary solution to recall volumes.
+	for _, pv := range mountInfosOfPod.ContainerFileSystem {
+		if !strings.Contains(pv.Target, csiSignOfVolumeTargetPath) {
+			continue
+		}
+
+		hp, err := parseVolumeInfo(pv)
+		if err != nil {
+			return err
+		}
+
+		hostPathVolumes[hp.VolID] = *hp
+	}
+
+	glog.V(4).Infof("Existing Volumes: %+v", hostPathVolumes)
+	return nil
+}
+
 func (hp *hostPath) Run() error {
 	// Create GRPC servers
-	if err := initialExistingVolumes(); err != nil {
+	if err := discoveryExistingVolumes(); err != nil {
 		return err
 	}
 
@@ -458,46 +502,3 @@ func parseVolumeInfo(volume MountPointInfo) (*hostPathVolume, error) {
 
 	return &hp, nil
 }
-
-func initialExistingVolumes() error {
-	cmdPath := locateCommandPath("findmnt")
-	out, err := exec.Command(cmdPath, "--json").CombinedOutput()
-	if err != nil {
-		glog.V(3).Infof("failed to execute command: %+v", cmdPath)
-		return err
-	}
-
-	if len(out) < 1 {
-		return fmt.Errorf("mount point info is nil")
-	}
-
-	mountInfos, err := parseMountInfo([]byte(out))
-	if err != nil {
-		return fmt.Errorf("failed to parse the mount infos: %+v", err)
-	}
-
-	mountInfosOfPod := MountPointInfo{}
-	for _, mountInfo := range mountInfos {
-		if mountInfo.Target == podVolumeTargetPath {
-			mountInfosOfPod = mountInfo
-			break
-		}
-	}
-
-	// getting existing volumes based on the mount point infos.
-	// It's a temporary solution to recall volumes.
-	for _, pv := range mountInfosOfPod.ContainerFileSystem {
-		if !strings.Contains(pv.Target, csiSignOfVolumeTargetPath) {
-			continue
-		}
-
-		hp, err := parseVolumeInfo(pv)
-		if err != nil {
-			return err
-		}
-
-		hostPathVolumes[hp.VolID] = *hp
-	}
-
-	return nil
-}