Merge pull request #2007 from Sneha-at/update-master

Fix units for cache size while calculating chunk size for LVM

Author: k8s-ci-robot

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

@@ -215,7 +215,7 @@ func setupCaching(devicePath string, req *csi.NodeStageVolumeRequest, nodeId str
 			req.GetPublishContext()[common.ContextDataCacheMode],
 			volumeGroupName + "/" + mainLvName,
 			"--chunksize",
-			chunkSize, // default unit is KiB
+			chunkSize,
 			"--force",
 			"-y",
 		}
@@ -569,7 +569,7 @@ func isCachingSetup(mainLvName string) (error, bool) {
 func fetchChunkSizeKiB(cacheSize string) (string, error) {
 	var chunkSize float64
 
-	cacheSizeInt, err := common.ConvertGiStringToInt64(cacheSize)
+	cacheSizeInt, err := strconv.ParseInt(cacheSize, 10, 64)
 	if err != nil {
 		return "0", err
 	}

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

@@ -13,22 +13,22 @@ func TestFetchChunkSizeKiB(t *testing.T) {
 	}{
 		{
 			name:         "chunk size is in the allowed range",
-			cacheSize:    "500Gi",
+			cacheSize:    "500",
 			expChunkSize: "512KiB", //range defined in fetchChunkSizeKiB
 		},
 		{
 			name:         "chunk size is set to the range ceil",
-			cacheSize:    "30000000Gi",
+			cacheSize:    "30000000",
 			expChunkSize: "1048576KiB", //range defined in fetchChunkSizeKiB - max 1GiB
 		},
 		{
 			name:         "chunk size is set to the allowed range floor",
-			cacheSize:    "10Gi",
+			cacheSize:    "100",
 			expChunkSize: "160KiB", //range defined in fetchChunkSizeKiB - min 160 KiB
 		},
 		{
 			name:         "cacheSize set to KiB also sets the chunk size to range floor",
-			cacheSize:    "100Ki",
+			cacheSize:    "1",
 			expChunkSize: "160KiB", //range defined in fetchChunkSizeKiB - min 160 KiB
 		},
 		{

test/remote/client-wrappers.go

@@ -56,7 +56,7 @@ const (
 	// Keys in the volume context.
 	contextForceAttach = "force-attach"
 
-	defaultLocalSsdCacheSize = "200Gi"
+	defaultLocalSsdCacheSize = "200"
 	defaultDataCacheMode     = common.DataCacheModeWriteThrough
 )