fix: change the way of listing existing volumes

Author: fengzixu

cmd/hostpathplugin/main.go

@@ -65,5 +65,9 @@ func handle() {
 		os.Exit(1)
 	}
 
-	driver.Run()
+	if err := driver.Run(); err != nil {
+		fmt.Printf("Failed to run driver: %s", err.Error())
+		os.Exit(1)
+
+	}
 }

go.mod

@@ -7,15 +7,13 @@ require (
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/golang/protobuf v1.4.2
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/imdario/mergo v0.3.11 // indirect
 	github.com/kubernetes-csi/csi-lib-utils v0.3.0
 	github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709
 	github.com/stretchr/testify v1.4.0
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
 	google.golang.org/grpc v1.27.0
-	k8s.io/api v0.19.1
-	k8s.io/apimachinery v0.19.1
+	gopkg.in/yaml.v2 v2.3.0 // indirect
 	k8s.io/client-go v0.19.1
 	k8s.io/kubernetes v1.12.2
 	k8s.io/utils v0.0.0-20201104234853-8146046b121e

go.sum

@@ -105,8 +105,6 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
-github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=

pkg/hostpath/healthcheck.go

@@ -15,8 +15,9 @@ import (
 const (
 	// sourcePathPrefix should be specified by the csi-data-dir volume.
 	// You can change it by modifying the volume path of csi-data-dir volume.
-	sourcePathPrefix    = "/csi-data-dir/"
-	podVolumeTargetPath = "/var/lib/kubelet/pods"
+	sourcePathPrefix          = "/csi-data-dir/"
+	podVolumeTargetPath       = "/var/lib/kubelet/pods"
+	csiSignOfVolumeTargetPath = "kubernetes.io~csi/pvc"
 )
 
 type MountPointInfo struct {

pkg/hostpath/healthcheck_test.go

@@ -330,3 +330,15 @@ func TestParseMountInfo(t *testing.T) {
 	assert.Nil(t, err)
 	assert.NotNil(t, containerFileSystems)
 }
+
+func TestFilterVolumeName(t *testing.T) {
+	targetPath := "/var/lib/kubelet/pods/3440e8ee-10de-11eb-8895-fa163feebd84/volumes/kubernetes.io~csi/pvc-33d023c7-10de-11eb-8895-fa163feebd84/mount"
+	volumeName := filterVolumeName(targetPath)
+	assert.Equal(t, "pvc-33d023c7-10de-11eb-8895-fa163feebd84", volumeName)
+}
+
+func TestFilterVolumeID(t *testing.T) {
+	sourcePath := "/dev/vda2[/var/lib/csi-hostpath-data/39267558-10de-11eb-8fb9-0a58ac120605]"
+	volumeID := filterVolumeID(sourcePath)
+	assert.Equal(t, "39267558-10de-11eb-8fb9-0a58ac120605", volumeID)
+}

pkg/hostpath/hostpath.go

@@ -17,24 +17,23 @@ limitations under the License.
 package hostpath
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
+	"regexp"
 	"sort"
 	"strings"
 
 	"github.com/golang/glog"
 	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/tools/clientcmd"
+	fs "k8s.io/kubernetes/pkg/volume/util/fs"
 	"k8s.io/kubernetes/pkg/volume/util/volumepathhandler"
 	utilexec "k8s.io/utils/exec"
 )
@@ -129,26 +128,13 @@ func NewHostPathDriver(driverName, nodeID, endpoint string, ephemeral bool, maxV
 	glog.Infof("Driver: %v ", driverName)
 	glog.Infof("Version: %s", vendorVersion)
 
-	config, err := clientcmd.BuildConfigFromFlags("", kubeconfig)
-	if err != nil {
-		fmt.Printf("Failed to build kubeconfig: %s", err.Error())
-		os.Exit(1)
-	}
-
-	clientset, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		fmt.Printf("Faild to create k8s client: %s", err.Error())
-		os.Exit(1)
-	}
-
 	return &hostPath{
 		name:              driverName,
 		version:           vendorVersion,
 		nodeID:            nodeID,
 		endpoint:          endpoint,
 		ephemeral:         ephemeral,
 		maxVolumesPerNode: maxVolumesPerNode,
-		kclient:           clientset,
 	}, nil
 }
 
@@ -181,10 +167,12 @@ func discoverExistingSnapshots() {
 	}
 }
 
-func (hp *hostPath) Run() {
-	// Initialize existing volumes
-	hp.initExistingVolumes()
+func (hp *hostPath) Run() error {
 	// Create GRPC servers
+	if err := initialExistingVolumes(); err != nil {
+		return err
+	}
+
 	hp.ids = NewIdentityServer(hp.name, hp.version)
 	hp.ns = NewNodeServer(hp.nodeID, hp.ephemeral, hp.maxVolumesPerNode)
 	hp.cs = NewControllerServer(hp.ephemeral, hp.nodeID)
@@ -193,32 +181,8 @@ func (hp *hostPath) Run() {
 	s := NewNonBlockingGRPCServer()
 	s.Start(hp.endpoint, hp.ids, hp.cs, hp.ns)
 	s.Wait()
-}
-
-func (hp *hostPath) initExistingVolumes() {
-	pvList, err := hp.kclient.CoreV1().PersistentVolumes().List(context.Background(), metav1.ListOptions{})
-	if err != nil {
-		glog.V(3).Infof("Failed to get pv: %s", err.Error())
-		os.Exit(1)
-	}
-
-	for _, pv := range pvList.Items {
-		volAccessType := mountAccess
-		if *pv.Spec.VolumeMode == v1.PersistentVolumeBlock {
-			volAccessType = blockAccess
-		}
-
-		hostPathVolumes[pv.Spec.CSI.VolumeHandle] = hostPathVolume{
-			VolName:       pv.Name,
-			VolID:         pv.Spec.CSI.VolumeHandle,
-			VolSize:       pv.Spec.Capacity.Storage().Value(),
-			VolPath:       getVolumePath(pv.Spec.CSI.VolumeHandle),
-			VolAccessType: volAccessType,
-		}
-	}
 
-	glog.V(3).Infof("The existing volume list is: %+v\n", hostPathVolumes)
-	return
+	return nil
 }
 
 func getVolumeByID(volumeID string) (hostPathVolume, error) {
@@ -455,3 +419,85 @@ func getSortedVolumeIDs() []string {
 	sort.Strings(ids)
 	return ids
 }
+
+func filterVolumeName(targetPath string) string {
+	pathItems := strings.Split(targetPath, "kubernetes.io~csi/")
+	if len(pathItems) < 2 {
+		return ""
+	}
+
+	return strings.TrimSuffix(pathItems[1], "/mount")
+}
+
+func filterVolumeID(sourcePath string) string {
+	volumeSourcePathRegex := regexp.MustCompile(`\[(.*)\]`)
+	volumeSP := string(volumeSourcePathRegex.Find([]byte(sourcePath)))
+	if volumeSP == "" {
+		return ""
+	}
+
+	return strings.TrimSuffix(strings.TrimPrefix(volumeSP, "[/var/lib/csi-hostpath-data/"), "]")
+}
+
+func parseVolumeInfo(volume MountPointInfo) (*hostPathVolume, error) {
+	volumeName := filterVolumeName(volume.Target)
+	volumeID := filterVolumeID(volume.Source)
+	sourcePath := getSourcePath(volumeID)
+	_, fscapacity, _, _, _, _, err := fs.FsInfo(sourcePath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get capacity info: %+v", err)
+	}
+
+	hp := hostPathVolume{
+		VolName:       volumeName,
+		VolID:         volumeID,
+		VolSize:       fscapacity,
+		VolPath:       getVolumePath(volumeID),
+		VolAccessType: mountAccess,
+	}
+
+	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
+}