Merge pull request #308 from red-hat-storage/sync_us--devel

Syncing latest changes from upstream devel for ceph-csi
red-hat-storage · May 29, 2024 · 760fb4e · 760fb4e
2 parents cda2165 + ce3ec6a
commit 760fb4e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -37,15 +37,12 @@ queue_rules:
               - "status-success=ci/centos/k8s-e2e-external-storage/1.27"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.28"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
-              - "status-success=ci/centos/k8s-e2e-external-storage/1.30"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
-              - "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
               - "status-success=ci/centos/mini-e2e/k8s-1.27"
               - "status-success=ci/centos/mini-e2e/k8s-1.28"
               - "status-success=ci/centos/mini-e2e/k8s-1.29"
-              - "status-success=ci/centos/mini-e2e/k8s-1.30"
               - "status-success=ci/centos/upgrade-tests-cephfs"
               - "status-success=ci/centos/upgrade-tests-rbd"
           - and:
@@ -193,15 +190,12 @@ pull_request_rules:
               - "status-success=ci/centos/k8s-e2e-external-storage/1.27"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.28"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
-              - "status-success=ci/centos/k8s-e2e-external-storage/1.30"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
-              - "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
               - "status-success=ci/centos/mini-e2e/k8s-1.27"
               - "status-success=ci/centos/mini-e2e/k8s-1.28"
               - "status-success=ci/centos/mini-e2e/k8s-1.29"
-              - "status-success=ci/centos/mini-e2e/k8s-1.30"
               - "status-success=ci/centos/upgrade-tests-cephfs"
               - "status-success=ci/centos/upgrade-tests-rbd"
           - and:
@@ -283,15 +277,12 @@ pull_request_rules:
               - "status-success=ci/centos/k8s-e2e-external-storage/1.27"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.28"
               - "status-success=ci/centos/k8s-e2e-external-storage/1.29"
-              - "status-success=ci/centos/k8s-e2e-external-storage/1.30"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
               - "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
-              - "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
               - "status-success=ci/centos/mini-e2e/k8s-1.27"
               - "status-success=ci/centos/mini-e2e/k8s-1.28"
               - "status-success=ci/centos/mini-e2e/k8s-1.29"
-              - "status-success=ci/centos/mini-e2e/k8s-1.30"
               - "status-success=ci/centos/upgrade-tests-cephfs"
               - "status-success=ci/centos/upgrade-tests-rbd"
               - "status-success=DCO"

diff --git a/internal/cephfs/nodeserver.go b/internal/cephfs/nodeserver.go
@@ -393,6 +393,7 @@ func getBackingSnapshotRoot(
 
 		return "", status.Errorf(codes.Internal, err.Error())
 	}
+	defer dir.Close()
 
 	// Read the contents of <root path>/.snap directory into a string slice.