Add VolumeStats for Windows

add support for getting volume stats for windows

Author: jingxu97

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

@@ -96,7 +96,10 @@ func handle() {
 			klog.Fatalf("Failed to get safe mounter: %v", err)
 		}
 		deviceUtils := mountmanager.NewDeviceUtils()
-		statter := mountmanager.NewStatter()
+		statter, err := mountmanager.NewStatter()
+		if err != nil {
+			klog.Fatalf("Failed to set up Statter: %v", err)
+		}
 		meta, err := metadataservice.NewMetadataService()
 		if err != nil {
 			klog.Fatalf("Failed to set up metadata service: %v", err)

deploy/kubernetes/images/alpha/image.yaml

@@ -4,8 +4,10 @@ metadata:
   name: imagetag-gcepd-driver-alpha-win
 imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver-win
-  newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
-  newTag: "v1.0.1-gke.9"
+  #newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
+  #newTag: "v1.0.1-gke.9"
+  newName: gcr.io/jinxu-gke-multi-cloud-dev/gce-pd-windows-1909
+  newTag: v5
 ---
 
 apiVersion: builtin

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

@@ -385,7 +385,7 @@ func (ns *GCENodeServer) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGe
 		return nil, status.Error(codes.InvalidArgument, "NodeGetVolumeStats volume path was empty")
 	}
 
-	_, err := os.Stat(req.VolumePath)
+	_, err := os.Lstat(req.VolumePath)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return nil, status.Errorf(codes.NotFound, "path %s does not exist", req.VolumePath)
@@ -412,7 +412,7 @@ func (ns *GCENodeServer) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGe
 		}, nil
 	}
 
-	available, capacity, used, inodesFree, inodes, inodesUsed, err := ns.VolumeStatter.StatFS(req.VolumePath)
+	available, capacity, used, inodesFree, inodes, inodesUsed, err := getStatFS(ns.VolumeStatter, req.VolumePath)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get fs info on path %s: %v", req.VolumePath, err)
 	}

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

@@ -23,6 +23,7 @@ import (
 	"google.golang.org/grpc/status"
 	"k8s.io/utils/mount"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
+	mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
 )
 
 func getDevicePath(ns *GCENodeServer, volumeID, partition string) (string, error) {
@@ -64,3 +65,7 @@ func cleanupPublishPath(path string, m *mount.SafeFormatAndMount) error {
 func cleanupStagePath(path string, m *mount.SafeFormatAndMount) error {
 	return cleanupPublishPath(path, m)
 }
+
+func getStatFS(s mountmanager.Statter, volumePath string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
+	return s.StatFS(volumePath)
+}

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

@@ -17,9 +17,11 @@ package gceGCEDriver
 
 import (
 	"fmt"
+
 	"k8s.io/utils/mount"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	mounter "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
+	mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
 )
 
 func formatAndMount(source, target, fstype string, options []string, m *mount.SafeFormatAndMount) error {
@@ -86,3 +88,7 @@ func getDevicePath(ns *GCENodeServer, volumeID, partition string) (string, error
 	}
 	return proxy.GetDevicePath(deviceName, partition, volumeKey.Name)
 }
+
+func getStatFS(s mountmanager.Statter, volumePath string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
+	return s.StatFS(volumePath)
+}

pkg/mount-manager/statter_linux.go

@@ -25,8 +25,8 @@ var _ Statter = realStatter{}
 type realStatter struct {
 }
 
-func NewStatter() realStatter {
-	return realStatter{}
+func NewStatter() (realStatter, error) {
+	return realStatter{}, nil
 }
 
 // IsBlock checks if the given path is a block device

pkg/mount-manager/statter_windows.go

@@ -16,16 +16,30 @@ limitations under the License.
 package mountmanager
 
 import (
-	"fmt"
+	"context"
+
+	volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
+	volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1"
 )
 
 var _ Statter = realStatter{}
 
 type realStatter struct {
+	VolumeClient *volumeclient.Client
+}
+
+func NewStatter() (realStatter, error) {
+	volumeClient, err := volumeclient.NewClient()
+	if err != nil {
+		return realStatter{}, err
+	}
+	return realStatter{
+		VolumeClient: volumeClient,
+	}, nil
 }
 
-func NewStatter() realStatter {
-	return realStatter{}
+func getStatFS(s Statter, volumeId, volumePath string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
+	return s.StatFS(volumeId)
 }
 
 // IsBlock checks if the given path is a block device
@@ -34,9 +48,30 @@ func (realStatter) IsBlockDevice(fullPath string) (bool, error) {
 }
 
 //TODO (jinxu): implement StatFS to get metrics
-func (realStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
+func (r realStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
 	zero := int64(0)
-	return zero, zero, zero, zero, zero, zero, fmt.Errorf("Not implemented")
+	//return zero, zero, zero, zero, zero, zero, fmt.Errorf("Not implemented")
+
+	idRequest := &volumeapi.VolumeIDFromMountRequest{
+		Mount: path,
+	}
+	idResponse, err := r.VolumeClient.GetVolumeIDFromMount(context.Background(), idRequest)
+	if err != nil {
+		return zero, zero, zero, zero, zero, zero, err
+	}
+	volumeId := idResponse.GetVolumeId()
+
+	request := &volumeapi.VolumeStatsRequest{
+		VolumeId: volumeId,
+	}
+	response, err := r.VolumeClient.VolumeStats(context.Background(), request)
+	if err != nil {
+		return zero, zero, zero, zero, zero, zero, err
+	}
+	capacity = response.GetVolumeSize()
+	used = response.GetVolumeUsedSize()
+	available = capacity - used
+	return available, capacity, used, zero, zero, zero, nil
 }
 
 type fakeStatter struct{}