From: Milind Changire Date: Tue, 8 Jul 2025 01:48:41 +0000 (+0530) Subject: qa: deactivate snap-schedule to avoid race with snap delete X-Git-Tag: v19.2.5~36^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=657fa030fa93812a9412f9bade6bc6597d25d8a0;p=ceph.git qa: deactivate snap-schedule to avoid race with snap delete Signed-off-by: Milind Changire (cherry picked from commit 4d9d11c7c70671cef5648adce44b8d86d7c67b3a) --- diff --git a/qa/tasks/cephfs/test_snap_schedules.py b/qa/tasks/cephfs/test_snap_schedules.py index 6285473de1a8..cd48ff1b3533 100644 --- a/qa/tasks/cephfs/test_snap_schedules.py +++ b/qa/tasks/cephfs/test_snap_schedules.py @@ -733,6 +733,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self._verify_snap_schedule(self.CREATE_VERSION, 'sv05', 'mygrp05') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv05', 'mygrp05') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv05', '--group', 'mygrp05', path='.', fs='cephfs') self.remove_snapshots(path, self.get_snap_dir_name()) self._fs_cmd('subvolume', 'rm', 'cephfs', 'sv05', '--group_name', 'mygrp05') @@ -748,6 +749,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('add', '--subvol', 'sv06', '--group', 'mygrp06', path='.', snap_schedule='1m', fs='cephfs') with self.assertRaises(CommandFailedError): self.fs_snap_schedule_cmd('list', '--subvol', 'sv06', path='.', fs='cephfs') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv06', '--group', 'mygrp06', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv06', '--group', 'mygrp06', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv06', 'mygrp06') @@ -765,6 +767,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('add', '--subvol', 'sv07', '--group', 'mygrp07', path='.', snap_schedule='1m', fs='cephfs') with self.assertRaises(CommandFailedError): self.fs_snap_schedule_cmd('list', '--group', 'mygrp07', path='.', fs='cephfs') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv07', '--group', 'mygrp07', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv07', '--group', 'mygrp07', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv07', 'mygrp07') @@ -781,6 +784,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('add', '--subvol', 'sv08', '--group', 'mygrp08', path='.', snap_schedule='1m', fs='cephfs') self.fs_snap_schedule_cmd('list', '--subvol', 'sv08', '--group', 'mygrp08', path='.', fs='cephfs') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv08', '--group', 'mygrp08', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv08', '--group', 'mygrp08', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv08', 'mygrp08') @@ -798,6 +802,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('add', '--subvol', 'sv09', '--group', 'mygrp09', path='.', snap_schedule='1m', fs='cephfs') with self.assertRaises(CommandFailedError): self.fs_snap_schedule_cmd('retention', 'add', '--subvol', 'sv09', path='.', retention_spec_or_period='h', retention_count='5') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv09', '--group', 'mygrp09', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv09', '--group', 'mygrp09', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv09', 'mygrp09') @@ -815,6 +820,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('add', '--subvol', 'sv10', '--group', 'mygrp10', path='.', snap_schedule='1m', fs='cephfs') with self.assertRaises(CommandFailedError): self.fs_snap_schedule_cmd('retention', 'add', '--group', 'mygrp10', path='.', retention_spec_or_period='h', retention_count='5') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv10', '--group', 'mygrp10', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv10', '--group', 'mygrp10', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv10', 'mygrp10') @@ -831,6 +837,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('add', '--subvol', 'sv11', '--group', 'mygrp11', path='.', snap_schedule='1m', fs='cephfs') self.fs_snap_schedule_cmd('retention', 'add', '--subvol', 'sv11', '--group', 'mygrp11', path='.', retention_spec_or_period='h', retention_count=5, fs='cephfs') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv11', '--group', 'mygrp11', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv11', '--group', 'mygrp11', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv11', 'mygrp11') @@ -849,6 +856,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('retention', 'add', '--subvol', 'sv12', '--group', 'mygrp12', path='.', retention_spec_or_period='h', retention_count=5, fs='cephfs') with self.assertRaises(CommandFailedError): self.fs_snap_schedule_cmd('activate', '--subvol', 'sv12', path='.', fs='cephfs') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv12', '--group', 'mygrp12', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv12', '--group', 'mygrp12', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv12', 'mygrp12') @@ -867,6 +875,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('retention', 'add', '--subvol', 'sv13', '--group', 'mygrp13', path='.', retention_spec_or_period='h', retention_count=5, fs='cephfs') with self.assertRaises(CommandFailedError): self.fs_snap_schedule_cmd('activate', '--group', 'mygrp13', path='.', fs='cephfs') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv13', '--group', 'mygrp13', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv13', '--group', 'mygrp13', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv13', 'mygrp13') @@ -886,6 +895,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('activate', '--subvol', 'sv14', '--group', 'mygrp14', path='.', fs='cephfs') self._verify_snap_schedule(self.CREATE_VERSION, 'sv14', 'mygrp14') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv14', '--group', 'mygrp14', path='.', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv14', 'mygrp14') self.remove_snapshots(path, self.get_snap_dir_name()) @@ -905,6 +915,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('activate', '--subvol', 'sv15', '--group', 'mygrp15', path='.', fs='cephfs') with self.assertRaises(CommandFailedError): self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv15', path='.', fs='cephfs') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv15', '--group', 'mygrp15', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv15', '--group', 'mygrp15', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv15', 'mygrp15') @@ -924,6 +935,7 @@ class TestSnapSchedulesSubvolAndGroupArguments(TestSnapSchedulesHelper): self.fs_snap_schedule_cmd('activate', '--subvol', 'sv16', '--group', 'mygrp16', path='.', fs='cephfs') with self.assertRaises(CommandFailedError): self.fs_snap_schedule_cmd('deactivate', '--group', 'mygrp16', path='.', fs='cephfs') + self.fs_snap_schedule_cmd('deactivate', '--subvol', 'sv16', '--group', 'mygrp16', path='.', fs='cephfs') self.fs_snap_schedule_cmd('remove', '--subvol', 'sv16', '--group', 'mygrp16', path='.', snap_schedule='1m', fs='cephfs') path = self._get_subvol_snapdir_path(self.CREATE_VERSION, 'sv16', 'mygrp16')