Merge pull request #638 from jingxu97/oct/statter

Use existing csi proxy client in Statter

Author: k8s-ci-robot

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

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

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

@@ -42,7 +42,7 @@ func getTestGCEDriverWithCustomMounter(t *testing.T, mounter *mount.SafeFormatAn
 
 func getCustomTestGCEDriver(t *testing.T, mounter *mount.SafeFormatAndMount, deviceUtils mountmanager.DeviceUtils, metaService metadataservice.MetadataService) *GCEDriver {
 	gceDriver := GetGCEDriver()
-	nodeServer := NewNodeServer(gceDriver, mounter, deviceUtils, metaService, mountmanager.NewFakeStatter())
+	nodeServer := NewNodeServer(gceDriver, mounter, deviceUtils, metaService, mountmanager.NewFakeStatter(mounter))
 	err := gceDriver.SetupGCEDriver(driver, "test-vendor", nil, nil, nodeServer)
 	if err != nil {
 		t.Fatalf("Failed to setup GCE Driver: %v", err)
@@ -52,7 +52,8 @@ func getCustomTestGCEDriver(t *testing.T, mounter *mount.SafeFormatAndMount, dev
 
 func getTestBlockingGCEDriver(t *testing.T, readyToExecute chan chan struct{}) *GCEDriver {
 	gceDriver := GetGCEDriver()
-	nodeServer := NewNodeServer(gceDriver, mountmanager.NewFakeSafeBlockingMounter(readyToExecute), mountmanager.NewFakeDeviceUtils(), metadataservice.NewFakeService(), mountmanager.NewFakeStatter())
+	mounter := mountmanager.NewFakeSafeBlockingMounter(readyToExecute)
+	nodeServer := NewNodeServer(gceDriver, mounter, mountmanager.NewFakeDeviceUtils(), metadataservice.NewFakeService(), mountmanager.NewFakeStatter(mounter))
 	err := gceDriver.SetupGCEDriver(driver, "test-vendor", nil, nil, nodeServer)
 	if err != nil {
 		t.Fatalf("Failed to setup GCE Driver: %v", err)

pkg/mount-manager/statter_linux.go

@@ -18,19 +18,20 @@ import (
 	"fmt"
 
 	"golang.org/x/sys/unix"
+	"k8s.io/utils/mount"
 )
 
-var _ Statter = realStatter{}
+var _ Statter = &realStatter{}
 
 type realStatter struct {
 }
 
-func NewStatter() (realStatter, error) {
-	return realStatter{}, nil
+func NewStatter(mounter *mount.SafeFormatAndMount) *realStatter {
+	return &realStatter{}
 }
 
 // IsBlock checks if the given path is a block device
-func (realStatter) IsBlockDevice(fullPath string) (bool, error) {
+func (r *realStatter) IsBlockDevice(fullPath string) (bool, error) {
 	var st unix.Stat_t
 	err := unix.Stat(fullPath, &st)
 	if err != nil {
@@ -40,7 +41,7 @@ func (realStatter) IsBlockDevice(fullPath string) (bool, error) {
 	return (st.Mode & unix.S_IFMT) == unix.S_IFBLK, nil
 }
 
-func (realStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
+func (*realStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
 	statfs := &unix.Statfs_t{}
 	err = unix.Statfs(path, statfs)
 	if err != nil {
@@ -62,15 +63,15 @@ func (realStatter) StatFS(path string) (available, capacity, used, inodesFree, i
 
 type fakeStatter struct{}
 
-func NewFakeStatter() fakeStatter {
-	return fakeStatter{}
+func NewFakeStatter(mounter *mount.SafeFormatAndMount) *fakeStatter {
+	return &fakeStatter{}
 }
 
-func (fakeStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
+func (*fakeStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
 	// Assume the file exists and give some dummy values back
 	return 1, 1, 1, 1, 1, 1, nil
 }
 
-func (fakeStatter) IsBlockDevice(fullPath string) (bool, error) {
+func (*fakeStatter) IsBlockDevice(fullPath string) (bool, error) {
 	return false, nil
 }

pkg/mount-manager/statter_windows.go

@@ -17,40 +17,40 @@ package mountmanager
 
 import (
 	"context"
+	"fmt"
 
 	volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
-	volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1"
+	"k8s.io/utils/mount"
 )
 
-var _ Statter = realStatter{}
+var _ Statter = &realStatter{}
 
 type realStatter struct {
-	VolumeClient *volumeclient.Client
+	mounter *mount.SafeFormatAndMount
 }
 
-func NewStatter() (realStatter, error) {
-	volumeClient, err := volumeclient.NewClient()
-	if err != nil {
-		return realStatter{}, err
-	}
-	return realStatter{
-		VolumeClient: volumeClient,
-	}, nil
+func NewStatter(mounter *mount.SafeFormatAndMount) *realStatter {
+	return &realStatter{mounter: mounter}
 }
 
 // IsBlock checks if the given path is a block device
-func (realStatter) IsBlockDevice(fullPath string) (bool, error) {
+func (r *realStatter) IsBlockDevice(fullPath string) (bool, error) {
 	return false, nil
 }
 
 // StatFS returns volume usage information
-func (r 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)
 
+	proxy, ok := r.mounter.Interface.(*CSIProxyMounter)
+	if !ok {
+		return zero, zero, zero, zero, zero, zero, fmt.Errorf("could not cast to csi proxy class")
+	}
+
 	idRequest := &volumeapi.VolumeIDFromMountRequest{
 		Mount: path,
 	}
-	idResponse, err := r.VolumeClient.GetVolumeIDFromMount(context.Background(), idRequest)
+	idResponse, err := proxy.VolumeClient.GetVolumeIDFromMount(context.Background(), idRequest)
 	if err != nil {
 		return zero, zero, zero, zero, zero, zero, err
 	}
@@ -59,7 +59,7 @@ func (r realStatter) StatFS(path string) (available, capacity, used, inodesFree,
 	request := &volumeapi.VolumeStatsRequest{
 		VolumeId: volumeId,
 	}
-	response, err := r.VolumeClient.VolumeStats(context.Background(), request)
+	response, err := proxy.VolumeClient.VolumeStats(context.Background(), request)
 	if err != nil {
 		return zero, zero, zero, zero, zero, zero, err
 	}
@@ -71,15 +71,15 @@ func (r realStatter) StatFS(path string) (available, capacity, used, inodesFree,
 
 type fakeStatter struct{}
 
-func NewFakeStatter() fakeStatter {
-	return fakeStatter{}
+func NewFakeStatter(mounter *mount.SafeFormatAndMount) *fakeStatter {
+	return &fakeStatter{}
 }
 
-func (fakeStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
+func (*fakeStatter) StatFS(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
 	// Assume the file exists and give some dummy values back
 	return 1, 1, 1, 1, 1, 1, nil
 }
 
-func (fakeStatter) IsBlockDevice(fullPath string) (bool, error) {
+func (*fakeStatter) IsBlockDevice(fullPath string) (bool, error) {
 	return false, nil
 }

test/sanity/sanity_test.go

@@ -56,7 +56,7 @@ func TestSanity(t *testing.T) {
 	//Initialize GCE Driver
 	identityServer := driver.NewIdentityServer(gceDriver)
 	controllerServer := driver.NewControllerServer(gceDriver, cloudProvider)
-	nodeServer := driver.NewNodeServer(gceDriver, mounter, deviceUtils, metadataservice.NewFakeService(), mountmanager.NewFakeStatter())
+	nodeServer := driver.NewNodeServer(gceDriver, mounter, deviceUtils, metadataservice.NewFakeService(), mountmanager.NewFakeStatter(mounter))
 	err = gceDriver.SetupGCEDriver(driverName, vendorVersion, identityServer, controllerServer, nodeServer)
 	if err != nil {
 		t.Fatalf("Failed to initialize GCE CSI Driver: %v", err)