Skip to content

[release-1.8] Fix provisioned-iops-on-create passing logic #1284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2023
+38 −23
Merged

[release-1.8] Fix provisioned-iops-on-create passing logic #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/common/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,12 @@ func TestConvertStringToInt64(t *testing.T) {
expInt64: 10000,
expectError: false,
},
{
desc: "test higher number",
inputStr: "15000",
expInt64: 15000,
expectError: false,
},
{
desc: "round M to number",
inputStr: "1M",
Expand Down
25 changes: 14 additions & 11 deletions pkg/gce-cloud-provider/compute/gce-compute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,9 @@ func convertV1DiskToBetaDisk(v1Disk *computev1.Disk, provisionedThroughputOnCrea
ReplicaZones: v1Disk.ReplicaZones,
DiskEncryptionKey: dek,
}
if v1Disk.ProvisionedIops > 0 {
betaDisk.ProvisionedIops = v1Disk.ProvisionedIops
}
if provisionedThroughputOnCreate > 0 {
betaDisk.ProvisionedThroughput = provisionedThroughputOnCreate
}
Expand Down Expand Up @@ -449,12 +452,11 @@ func (cloud *CloudProvider) insertRegionalDisk(
}

diskToCreate := &computev1.Disk{
Name: volKey.Name,
SizeGb: common.BytesToGbRoundUp(capBytes),
Description: description,
Type: cloud.GetDiskTypeURI(cloud.project, volKey, params.DiskType),
Labels: params.Labels,
ProvisionedIops: params.ProvisionedIOPSOnCreate,
Name: volKey.Name,
SizeGb: common.BytesToGbRoundUp(capBytes),
Description: description,
Type: cloud.GetDiskTypeURI(cloud.project, volKey, params.DiskType),
Labels: params.Labels,
}
if snapshotID != "" {
_, snapshotType, _, err := common.SnapshotIDToProjectKey(snapshotID)
Expand Down Expand Up @@ -562,11 +564,12 @@ func (cloud *CloudProvider) insertZonalDisk(
}

diskToCreate := &computev1.Disk{
Name: volKey.Name,
SizeGb: common.BytesToGbRoundUp(capBytes),
Description: description,
Type: cloud.GetDiskTypeURI(project, volKey, params.DiskType),
Labels: params.Labels,
Name: volKey.Name,
SizeGb: common.BytesToGbRoundUp(capBytes),
Description: description,
Type: cloud.GetDiskTypeURI(project, volKey, params.DiskType),
Labels: params.Labels,
ProvisionedIops: params.ProvisionedIOPSOnCreate,
}

if snapshotID != "" {
Expand Down
7 changes: 6 additions & 1 deletion test/e2e/tests/single_zone_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,12 @@ func createAndValidateUniqueZonalDisk(client *remote.CsiClient, project, zone st
Expect(err).To(BeNil(), "Could not get disk from cloud directly")
Expect(cloudDisk.Type).To(ContainSubstring(diskType))
Expect(cloudDisk.Status).To(Equal(readyState))
Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
if diskType == "pd-extreme" {
Expect(cloudDisk.SizeGb).To(Equal(defaultExtremeSizeGb))
} else {
Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
}

Expect(cloudDisk.Name).To(Equal(volName))
return
}
Expand Down
23 changes: 12 additions & 11 deletions test/e2e/tests/single_zone_pd_extreme_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ import (
)

const (
extremeDiskType = "pd-extreme"
provisionedIOPSOnCreate = "100000Gi"
provisionedIOPSOnCreateInt = int64(100000)
extremeDiskType = "pd-extreme"
defaultExtremeSizeGb int64 = 500
provisionedIOPSOnCreate = "12345"
provisionedIOPSOnCreateInt = int64(12345)
)

var _ = Describe("GCE PD CSI Driver pd-extreme", func() {
Expand All @@ -53,7 +54,7 @@ var _ = Describe("GCE PD CSI Driver pd-extreme", func() {
common.ParameterKeyType: extremeDiskType,
common.ParameterKeyProvisionedIOPSOnCreate: provisionedIOPSOnCreate,
}
volID, err := client.CreateVolume(volName, params, defaultSizeGb, nil, nil)
volID, err := client.CreateVolume(volName, params, defaultExtremeSizeGb, nil, nil)
Expect(err).To(BeNil(), "CreateVolume failed with error: %v", err)

// Validate Disk Created
Expand All @@ -62,7 +63,7 @@ var _ = Describe("GCE PD CSI Driver pd-extreme", func() {
Expect(cloudDisk.Type).To(ContainSubstring(extremeDiskType))
Expect(cloudDisk.ProvisionedIops).To(Equal(provisionedIOPSOnCreateInt))
Expect(cloudDisk.Status).To(Equal(readyState))
Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
Expect(cloudDisk.SizeGb).To(Equal(defaultExtremeSizeGb))
Expect(cloudDisk.Name).To(Equal(volName))

defer func() {
Expand Down Expand Up @@ -90,7 +91,7 @@ var _ = Describe("GCE PD CSI Driver pd-extreme", func() {
common.ParameterKeyType: extremeDiskType,
common.ParameterKeyProvisionedIOPSOnCreate: provisionedIOPSOnCreate,
}
volID, err := client.CreateVolume(volName, params, defaultSizeGb, nil, nil)
volID, err := client.CreateVolume(volName, params, defaultExtremeSizeGb, nil, nil)
Expect(err).To(BeNil(), "CreateVolume failed with error: %v", err)

// Validate Disk Created
Expand All @@ -99,7 +100,7 @@ var _ = Describe("GCE PD CSI Driver pd-extreme", func() {
Expect(cloudDisk.Type).To(ContainSubstring(extremeDiskType))
Expect(cloudDisk.ProvisionedIops).To(Equal(provisionedIOPSOnCreateInt))
Expect(cloudDisk.Status).To(Equal(readyState))
Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
Expect(cloudDisk.SizeGb).To(Equal(defaultExtremeSizeGb))
Expect(cloudDisk.Labels).To(Equal(map[string]string{
"key1": "value1",
"key2": "value2",
Expand Down Expand Up @@ -157,7 +158,7 @@ var _ = Describe("GCE PD CSI Driver pd-extreme", func() {
common.ParameterKeyDiskEncryptionKmsKey: key.Name,
common.ParameterKeyType: extremeDiskType,
common.ParameterKeyProvisionedIOPSOnCreate: provisionedIOPSOnCreate,
}, defaultSizeGb,
}, defaultExtremeSizeGb,
&csi.TopologyRequirement{
Requisite: []*csi.Topology{
{
Expand All @@ -173,7 +174,7 @@ var _ = Describe("GCE PD CSI Driver pd-extreme", func() {
Expect(cloudDisk.Type).To(ContainSubstring(extremeDiskType))
Expect(cloudDisk.ProvisionedIops).To(Equal(provisionedIOPSOnCreateInt))
Expect(cloudDisk.Status).To(Equal(readyState))
Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
Expect(cloudDisk.SizeGb).To(Equal(defaultExtremeSizeGb))
Expect(cloudDisk.Name).To(Equal(volName))

defer func() {
Expand Down Expand Up @@ -250,7 +251,7 @@ var _ = Describe("GCE PD CSI Driver pd-extreme", func() {
common.ParameterKeyPVName: "test-pv-name",
common.ParameterKeyType: extremeDiskType,
common.ParameterKeyProvisionedIOPSOnCreate: provisionedIOPSOnCreate,
}, defaultSizeGb, nil /* topReq */, nil)
}, defaultExtremeSizeGb, nil /* topReq */, nil)
Expect(err).To(BeNil(), "CreateVolume failed with error: %v", err)

// Validate Disk Created
Expand All @@ -259,7 +260,7 @@ var _ = Describe("GCE PD CSI Driver pd-extreme", func() {
Expect(cloudDisk.Type).To(ContainSubstring(extremeDiskType))
Expect(cloudDisk.ProvisionedIops).To(Equal(provisionedIOPSOnCreateInt))
Expect(cloudDisk.Status).To(Equal(readyState))
Expect(cloudDisk.SizeGb).To(Equal(defaultSizeGb))
Expect(cloudDisk.SizeGb).To(Equal(defaultExtremeSizeGb))
Expect(cloudDisk.Name).To(Equal(volName))
Expect(cloudDisk.Description).To(Equal("{\"kubernetes.io/created-for/pv/name\":\"test-pv-name\",\"kubernetes.io/created-for/pvc/name\":\"test-pvc\",\"kubernetes.io/created-for/pvc/namespace\":\"test-pvc-namespace\",\"storage.gke.io/created-by\":\"pd.csi.storage.gke.io\"}"))
defer func() {
Expand Down