Merge PR ceph#55660 into main

* refs/pull/55660/head: qa: disable snapshot_clone_no_wait for some tests Reviewed-by: Neeraj Pratap Singh <neesingh@redhat.com>
scantist-ossops-m2 · Feb 21, 2024 · 29fba08 · 29fba08
2 parents 41e6d78 + e5099d6
commit 29fba08
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py
@@ -5760,6 +5760,9 @@ def test_subvolume_snapshot_info_if_no_clone_pending(self):
         snapshot = self._gen_subvol_snap_name()
         clone_list =  [f'clone_{i}' for i in range(3)]
 
+        # disable "capped" clones
+        self.config_set('mgr', 'mgr/volumes/snapshot_clone_no_wait', False)
+
         # create subvolume.
         self._fs_cmd("subvolume", "create", self.volname, subvolume, "--mode=777")
 
@@ -5810,6 +5813,9 @@ def test_subvolume_snapshot_info_if_clone_pending_for_no_group(self):
         # insert delay at the beginning of snapshot clone
         self.config_set('mgr', 'mgr/volumes/snapshot_clone_delay', 5)
 
+        # disable "capped" clones
+        self.config_set('mgr', 'mgr/volumes/snapshot_clone_no_wait', False)
+
         # schedule a clones
         for clone in clone_list:
             self._fs_cmd("subvolume", "snapshot", "clone", self.volname, subvolume, snapshot, clone)
@@ -5913,6 +5919,9 @@ def test_subvolume_snapshot_info_if_orphan_clone(self):
         # insert delay at the beginning of snapshot clone
         self.config_set('mgr', 'mgr/volumes/snapshot_clone_delay', 15)
 
+        # disable "capped" clones
+        self.config_set('mgr', 'mgr/volumes/snapshot_clone_no_wait', False)
+
         # schedule a clones
         for clone in clone_list:
             self._fs_cmd("subvolume", "snapshot", "clone", self.volname, subvolume, snapshot, clone)