Normalize GCNV create requests below minimum size

Author: onkarganjewar

storage_drivers/gcp/gcp_gcnv.go

@@ -779,9 +779,6 @@ func (d *NASStorageDriver) Create(
 		defaultSize, _ := capacity.ToBytes(pool.InternalAttributes()[Size])
 		sizeBytes, _ = strconv.ParseUint(defaultSize, 10, 64)
 	}
-	if err = drivers.CheckMinVolumeSize(sizeBytes, MinimumVolumeSizeBytes); err != nil {
-		return err
-	}
 
 	if sizeBytes < minimumGCNVVolumeSizeBytes {
 

storage_drivers/gcp/gcp_gcnv_san.go

@@ -636,8 +636,14 @@ func (d *SANStorageDriver) Create(
 	}
 
 	// Ensure the volume size meets minimum requirements
-	if err = drivers.CheckMinVolumeSize(sizeBytes, MinimumVolumeSizeBytes); err != nil {
-		return err
+	if sizeBytes < MinimumVolumeSizeBytes {
+		Logc(ctx).WithFields(LogFields{
+			"name":          name,
+			"requestedSize": sizeBytes,
+			"minimumSize":   MinimumVolumeSizeBytes,
+		}).Warningf("Requested size is too small. Setting volume size to the minimum allowable.")
+
+		sizeBytes = MinimumVolumeSizeBytes
 	}
 
 	// NOTE: Snapshot reserve is applied later after parsing; the size checks below use the base size.

storage_drivers/gcp/gcp_gcnv_san_test.go

@@ -1633,6 +1633,41 @@ func TestSANDriver_Create_InvalidSize(t *testing.T) {
 	assert.Contains(t, err.Error(), "invalid volume size")
 }
 
+func TestSANDriver_Create_BelowMinimumSize(t *testing.T) {
+	mockAPI, driver := newMockSANDriver(t)
+
+	// Request half of MinimumVolumeSizeBytes (512 MiB) — should normalize up, not fail.
+	belowMinSize := strconv.FormatUint(MinimumVolumeSizeBytes/2, 10)
+
+	volConfig := &storage.VolumeConfig{
+		Name:         testVolumeName,
+		InternalName: testVolumeInternalName,
+		Size:         belowMinSize,
+		FileSystem:   "ext4",
+	}
+
+	pool := driver.pools["test-pool"]
+
+	mockAPI.EXPECT().RefreshGCNVResources(ctx).Return(nil).Times(1)
+	mockAPI.EXPECT().VolumeExists(ctx, volConfig).Return(false, nil, nil).Times(1)
+	mockAPI.EXPECT().CapacityPoolsForStoragePool(ctx, pool, "", drivers.TieringPolicyNone).Return([]*api.CapacityPool{{Name: "test-pool"}}).Times(1)
+	mockAPI.EXPECT().FilterCapacityPoolsOnTopology(ctx, gomock.Any(), gomock.Any(), gomock.Any()).Return([]*api.CapacityPool{{Name: "test-pool"}}).Times(1)
+	mockAPI.EXPECT().CreateVolume(ctx, gomock.Any()).DoAndReturn(
+		func(_ context.Context, req *api.VolumeCreateRequest) (*api.Volume, error) {
+			// Size must be >= MinimumVolumeSizeBytes after normalization
+			assert.GreaterOrEqual(t, req.SizeBytes, int64(MinimumVolumeSizeBytes), "create request size must be at least minimum")
+			v := getTestVolume()
+			v.Name = testVolumeName
+			v.CreationToken = testVolumeInternalName
+			return v, nil
+		},
+	)
+	mockAPI.EXPECT().WaitForVolumeState(ctx, gomock.Any(), api.VolumeStateReady, gomock.Any(), gomock.Any()).Return(api.VolumeStateReady, nil).Times(1)
+
+	err := driver.Create(ctx, volConfig, pool, nil)
+	assert.NoError(t, err, "Create should succeed for sub-minimum size by normalizing up")
+}
+
 func TestSANDriver_Create_RefreshError(t *testing.T) {
 	mockAPI, driver := newMockSANDriver(t)
 

storage_drivers/gcp/gcp_gcnv_test.go

@@ -2255,17 +2255,28 @@ func TestCreate_BelowAbsoluteMinimumSize(t *testing.T) {
 
 	storagePool := driver.pools["gcnv_pool"]
 
-	volConfig, _, _, _ := getStructsForCreateNFSVolume(ctx, driver, storagePool)
-	volConfig.Size = "1k"
+	volConfig, capacityPool, volume, createRequest := getStructsForCreateNFSVolume(ctx, driver, storagePool)
+	volConfig.Size = "1024"
+	createRequest.UnixPermissions = "0777"
+	createRequest.SizeBytes = int64(capacity.OneGiB * 100)
+	volume.SizeBytes = int64(capacity.OneGiB * 100)
 
 	mockAPI.EXPECT().RefreshGCNVResources(ctx).Return(nil).Times(1)
 	mockAPI.EXPECT().VolumeExists(ctx, volConfig).Return(false, nil, nil).Times(1)
+	mockAPI.EXPECT().CapacityPoolsForStoragePool(ctx, storagePool,
+		api.ServiceLevelPremium, gomock.Any()).Return([]*api.CapacityPool{capacityPool}).Times(1)
+	mockAPI.EXPECT().FilterCapacityPoolsOnTopology(ctx, []*api.CapacityPool{capacityPool},
+		volConfig.RequisiteTopologies, volConfig.PreferredTopologies).Return([]*api.CapacityPool{capacityPool}).Times(1)
+	mockAPI.EXPECT().CreateVolume(ctx, createRequest).Return(volume, nil).Times(1)
+	mockAPI.EXPECT().WaitForVolumeState(ctx, volume, api.VolumeStateReady, []string{api.VolumeStateError},
+		driver.volumeCreateTimeout).Return(api.VolumeStateReady, nil).Times(1)
 
 	result := driver.Create(ctx, volConfig, storagePool, nil)
-	fmt.Println("------", result)
 
-	assert.Error(t, result, "create failed")
-	assert.Equal(t, "", volConfig.InternalID, "internal ID set on volConfig")
+	assert.NoError(t, result, "create failed")
+	assert.Equal(t, int64(capacity.OneGiB*100), createRequest.SizeBytes, "request size mismatch")
+	assert.Equal(t, defaultVolumeSizeStr, volConfig.Size, "config size mismatch")
+	assert.Equal(t, volume.FullName, volConfig.InternalID, "internal ID not set on volConfig")
 }
 
 func TestCreate_AboveMaximumSize(t *testing.T) {