Merge pull request #1994 from k8s-infra-cherrypick-robot/cherry-pick-1993-to-release-1.17

[release-1.17] Fix logic bug while checking available LSSDs for RAIDing for Data Cache

Author: k8s-ci-robot

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

@@ -368,24 +368,14 @@ func fetchLssdsForRaiding(lssdCount int) ([]string, error) {
 		return nil, fmt.Errorf("Error listing RAIDed LSSDs %v", err)
 	}
 
-	unRaidedLssds := []string{}
-	for _, l := range allLssds {
-		if !slices.Contains(raidedLssds, l) {
-			unRaidedLssds = append(unRaidedLssds, l)
-		}
-		if len(unRaidedLssds) == lssdCount {
-			break
-		}
-	}
-
 	LSSDsWithEmptyMountPoint, err := driver.FetchLSSDsWihtEmptyMountPoint()
 	if err != nil {
 		return nil, fmt.Errorf("Error listing LSSDs with empty mountpoint: %v", err)
 	}
 
 	// We need to ensure the disks to be used for Data Cache are both unRAIDed & not containing mountpoints for ephemeral storage already
-	availableLssds := slices.Filter(nil, unRaidedLssds, func(e string) bool {
-		return slices.Contains(LSSDsWithEmptyMountPoint, e)
+	availableLssds := slices.Filter(nil, allLssds, func(e string) bool {
+		return slices.Contains(LSSDsWithEmptyMountPoint, e) && !slices.Contains(raidedLssds, e)
 	})
 
 	if len(availableLssds) == 0 {
@@ -395,7 +385,8 @@ func fetchLssdsForRaiding(lssdCount int) ([]string, error) {
 	if len(availableLssds) < lssdCount {
 		return nil, fmt.Errorf("Not enough LSSDs available to set up caching. Available LSSDs: %v, wanted LSSDs: %v", len(availableLssds), lssdCount)
 	}
-	return availableLssds, nil
+
+	return availableLssds[:lssdCount], nil
 }
 
 func setupDataCache(ctx context.Context, nodeName string, nodeId string) error {