From: Venky Shankar <vshankar@redhat.com>
Date: Mon, 19 Feb 2024 06:36:32 +0000 (-0500)
Subject: qa: disable snapshot_clone_no_wait for some tests
X-Git-Tag: v19.1.0~214^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47b0b59eb8bfd1e093e56f973052ffa77e2c47ab;p=ceph.git

qa: disable snapshot_clone_no_wait for some tests

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit e5099d67a2478e199bba6a435300964756005525)
---

diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py
index 650ebcf26c8f..037b046304eb 100644
--- a/qa/tasks/cephfs/test_volumes.py
+++ b/qa/tasks/cephfs/test_volumes.py
@@ -5760,6 +5760,9 @@ class TestSubvolumeSnapshotClones(TestVolumesHelper):
         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 @@ class TestSubvolumeSnapshotClones(TestVolumesHelper):
         # 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 @@ class TestSubvolumeSnapshotClones(TestVolumesHelper):
         # 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)