Skip to content

always use unique name for volume and snapshot #476

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
Mar 7, 2024
Merged

always use unique name for volume and snapshot #476

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
66 changes: 29 additions & 37 deletions pkg/sanity/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,12 +543,7 @@ var _ = DescribeSanity("Controller Service [Controller Server]", func(sc *TestCo
})

It("should not fail when creating volume with maximum-length name", func() {

nameBytes := make([]byte, MaxNameLength)
for i := 0; i < MaxNameLength; i++ {
nameBytes[i] = 'a'
}
name := string(nameBytes)
name := UniqueStringWithLength("sanity-controller-create-maxlen", MaxNameLength)
By("creating a volume")
size := TestVolumeSize(sc)

Expand Down Expand Up @@ -1136,18 +1131,18 @@ var _ = DescribeSanity("ListSnapshots [Controller Server]", func(sc *TestContext

By("creating first unrelated snapshot")
// Create volume source and afterwards the first unrelated snapshot.
volReq := MakeCreateVolumeReq(sc, "listSnapshots-volume-unrelated1")
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, "listSnapshots-snapshot-unrelated1")
volReq := MakeCreateVolumeReq(sc, UniqueString("listSnapshots-volume-unrelated-s-1"))
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, UniqueString("listSnapshots-snapshot-unrelated-s-1"))

By("creating target snapshot")
// Create volume source and afterwards the target snapshot.
volReq = MakeCreateVolumeReq(sc, "listSnapshots-volume-target")
snapshotTarget, _ := r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, "listSnapshots-snapshot-target")
volReq = MakeCreateVolumeReq(sc, UniqueString("listSnapshots-volume-target-s"))
snapshotTarget, _ := r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, UniqueString("listSnapshots-snapshot-target-s"))

By("creating second unrelated snapshot")
// Create volume source and afterwards the second unrelated snapshot.
volReq = MakeCreateVolumeReq(sc, "listSnapshots-volume-unrelated2")
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, "listSnapshots-snapshot-unrelated2")
volReq = MakeCreateVolumeReq(sc, UniqueString("listSnapshots-volume-unrelated-s-2"))
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, UniqueString("listSnapshots-snapshot-unrelated-s-2"))

By("listing snapshots")

Expand Down Expand Up @@ -1187,18 +1182,18 @@ var _ = DescribeSanity("ListSnapshots [Controller Server]", func(sc *TestContext

By("creating first unrelated snapshot")
// Create volume source and afterwards the first unrelated snapshot.
volReq := MakeCreateVolumeReq(sc, "listSnapshots-volume-unrelated1")
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, "listSnapshots-snapshot-unrelated1")
volReq := MakeCreateVolumeReq(sc, UniqueString("listSnapshots-volume-unrelated-v-1"))
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, UniqueString("listSnapshots-snapshot-unrelated-v-1"))

By("creating target snapshot")
// Create volume source and afterwards the target snapshot.
volReq = MakeCreateVolumeReq(sc, "listSnapshots-volume-target")
snapshotTarget, _ := r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, "listSnapshots-snapshot-target")
volReq = MakeCreateVolumeReq(sc, UniqueString("listSnapshots-volume-target-v"))
snapshotTarget, _ := r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, UniqueString("listSnapshots-snapshot-target-v"))

By("creating second unrelated snapshot")
// Create volume source and afterwards the second unrelated snapshot.
volReq = MakeCreateVolumeReq(sc, "listSnapshots-volume-unrelated2")
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, "listSnapshots-snapshot-unrelated2")
volReq = MakeCreateVolumeReq(sc, UniqueString("listSnapshots-volume-unrelated-v-2"))
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, UniqueString("listSnapshots-snapshot-unrelated-v-2"))

By("listing snapshots")

Expand Down Expand Up @@ -1247,8 +1242,8 @@ var _ = DescribeSanity("ListSnapshots [Controller Server]", func(sc *TestContext
totalSnapshots := len(snapshots.GetEntries())

By("creating a snapshot")
volReq := MakeCreateVolumeReq(sc, "listSnapshots-volume-3")
snapshot, _ := r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, "listSnapshots-snapshot-3")
volReq := MakeCreateVolumeReq(sc, UniqueString("listSnapshots-volume-3"))
snapshot, _ := r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, UniqueString("listSnapshots-snapshot-3"))
verifySnapshotInfo(snapshot.GetSnapshot())

snapshots, err = r.ListSnapshots(context.Background(), req)
Expand Down Expand Up @@ -1302,8 +1297,8 @@ var _ = DescribeSanity("ListSnapshots [Controller Server]", func(sc *TestContext
requiredSnapshots := minSnapshotCount - initialTotalSnapshots

for i := 1; i <= requiredSnapshots; i++ {
volReq := MakeCreateVolumeReq(sc, "volume"+strconv.Itoa(i))
snapshot, _ := r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, "snapshot"+strconv.Itoa(i))
volReq := MakeCreateVolumeReq(sc, UniqueString("volume"+strconv.Itoa(i)))
snapshot, _ := r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, UniqueString("snapshot"+strconv.Itoa(i)))
verifySnapshotInfo(snapshot.GetSnapshot())
}

Expand Down Expand Up @@ -1389,13 +1384,13 @@ var _ = DescribeSanity("DeleteSnapshot [Controller Server]", func(sc *TestContex
It("should return appropriate values (no optional values added)", func() {

By("creating a volume")
volReq := MakeCreateVolumeReq(sc, "DeleteSnapshot-volume-1")
volReq := MakeCreateVolumeReq(sc, UniqueString("DeleteSnapshot-volume-1"))
volume, err := r.CreateVolume(context.Background(), volReq)
Expect(err).NotTo(HaveOccurred())

// Create Snapshot First
By("creating a snapshot")
snapshotReq := MakeCreateSnapshotReq(sc, "DeleteSnapshot-snapshot-1", volume.GetVolume().GetVolumeId())
snapshotReq := MakeCreateSnapshotReq(sc, UniqueString("DeleteSnapshot-snapshot-1"), volume.GetVolume().GetVolumeId())
r.MustCreateSnapshot(context.Background(), snapshotReq)
})
})
Expand Down Expand Up @@ -1456,29 +1451,30 @@ var _ = DescribeSanity("CreateSnapshot [Controller Server]", func(sc *TestContex
It("should succeed when requesting to create a snapshot with already existing name and same source volume ID", func() {

By("creating a volume")
volReq := MakeCreateVolumeReq(sc, "CreateSnapshot-volume-1")
volReq := MakeCreateVolumeReq(sc, UniqueString("CreateSnapshot-volume-1"))
volume := r.MustCreateVolume(context.Background(), volReq)

By("creating a snapshot")
snapReq1 := MakeCreateSnapshotReq(sc, "CreateSnapshot-snapshot-1", volume.GetVolume().GetVolumeId())
snapReq1 := MakeCreateSnapshotReq(sc, UniqueString("CreateSnapshot-snapshot-1"), volume.GetVolume().GetVolumeId())
r.MustCreateSnapshot(context.Background(), snapReq1)

By("creating a snapshot with the same name and source volume ID")
r.MustCreateSnapshot(context.Background(), snapReq1)
})

It("should fail when requesting to create a snapshot with already existing name and different source volume ID", func() {
snapshotName := UniqueString("CreateSnapshot-snapshot-2")

By("creating a snapshot")
volReq := MakeCreateVolumeReq(sc, "CreateSnapshot-volume-2")
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, "CreateSnapshot-snapshot-2")
volReq := MakeCreateVolumeReq(sc, UniqueString("CreateSnapshot-volume-2"))
r.MustCreateSnapshotFromVolumeRequest(context.Background(), volReq, snapshotName)

By("creating a new source volume")
volReq = MakeCreateVolumeReq(sc, "CreateSnapshot-volume-3")
volReq = MakeCreateVolumeReq(sc, UniqueString("CreateSnapshot-volume-3"))
volume2 := r.MustCreateVolume(context.Background(), volReq)

By("creating a snapshot with the same name but different source volume ID")
req := MakeCreateSnapshotReq(sc, "CreateSnapshot-snapshot-2", volume2.GetVolume().GetVolumeId())
req := MakeCreateSnapshotReq(sc, snapshotName, volume2.GetVolume().GetVolumeId())
_, err := r.CreateSnapshot(context.Background(), req)
Expect(err).To(HaveOccurred())
serverError, ok := status.FromError(err)
Expand All @@ -1489,14 +1485,10 @@ var _ = DescribeSanity("CreateSnapshot [Controller Server]", func(sc *TestContex
It("should succeed when creating snapshot with maximum-length name", func() {

By("creating a volume")
volReq := MakeCreateVolumeReq(sc, "CreateSnapshot-volume-3")
volReq := MakeCreateVolumeReq(sc, UniqueString("CreateSnapshot-volume-maxlen-name"))
volume := r.MustCreateVolume(context.Background(), volReq)

nameBytes := make([]byte, MaxNameLength)
for i := 0; i < MaxNameLength; i++ {
nameBytes[i] = 'a'
}
name := string(nameBytes)
name := UniqueStringWithLength("CreateSnapshot-snapshot-maxlen", MaxNameLength)

By("creating a snapshot")
snapReq1 := MakeCreateSnapshotReq(sc, name, volume.GetVolume().GetVolumeId())
Expand Down Expand Up @@ -1693,7 +1685,7 @@ func VolumeLifecycle(r *Resources, sc *TestContext, count int) {

// Create Volume First
By("creating a single node writer volume")
name := UniqueString("sanity-controller-publish")
name := UniqueString(fmt.Sprintf("sanity-controller-publish-%d", count))

vol := r.MustCreateVolume(
context.Background(),
Expand Down
2 changes: 1 addition & 1 deletion pkg/sanity/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func isPluginCapabilitySupported(c csi.IdentityClient,

func runControllerTest(sc *TestContext, r *Resources, controllerPublishSupported bool, nodeStageSupported bool, nodeVolumeStatsSupported bool, count int) {

name := UniqueString("sanity-node-full")
name := UniqueString(fmt.Sprintf("sanity-node-full-%d", count))

By("getting node information")
ni, err := r.NodeGetInfo(
Expand Down
8 changes: 8 additions & 0 deletions pkg/sanity/sanity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,14 @@ func UniqueString(prefix string) string {
return prefix + uniqueSuffix
}

func UniqueStringWithLength(prefix string, length int) string {
str := UniqueString(prefix)
if len(str) > length {
panic(fmt.Sprintf("prefix %q is too long, use a shorter one", prefix))
}
return str + strings.Repeat("a", length-len(str))
}

// Return codes for CheckPath
type PathKind string

Expand Down