Merge PR ceph#56638 into main

* refs/pull/56638/head:
	qa: do not iterate list being modified
	qa: remove unnecessary background job cleanup

Reviewed-by: Xiubo Li <[email protected]>
Reviewed-by: Leonid Usov <[email protected]>
Reviewed-by: Venky Shankar <[email protected]>

Author: batrick

qa/tasks/cephfs/mount.py

@@ -1399,7 +1399,7 @@ def kill_background(self, p=None):
         For a process that was returned by one of the _background member functions,
         kill it hard.
         """
-        procs = [p] if p is not None else self.background_procs
+        procs = [p] if p is not None else list(self.background_procs)
         for p in procs:
             log.debug(f"terminating {p}")
             self._kill_background(p)

qa/tasks/cephfs/test_client_recovery.py

@@ -377,7 +377,7 @@ def test_filelock(self):
         """
 
         flockable = self._is_flockable()
-        lock_holder = self.mount_a.lock_background(do_flock=flockable)
+        self.mount_a.lock_background(do_flock=flockable)
 
         self.mount_b.wait_for_visible("background_file-2")
         self.mount_b.check_filelock(do_flock=flockable)
@@ -387,8 +387,6 @@ def test_filelock(self):
 
         self.mount_b.check_filelock(do_flock=flockable)
 
-        self.mount_a._kill_background(lock_holder)
-
     def test_filelock_eviction(self):
         """
         Check that file lock held by evicted client is given to

qa/tasks/cephfs/test_misc.py

@@ -69,15 +69,13 @@ def test_getattr_caps(self):
 
         # create a file and hold it open. MDS will issue CEPH_CAP_EXCL_*
         # to mount_a
-        p = self.mount_a.open_background("testfile")
+        self.mount_a.open_background("testfile")
         self.mount_b.wait_for_visible("testfile")
 
         # this triggers a lookup request and an open request. The debug
         # code will check if lookup/open reply contains xattrs
         self.mount_b.run_shell(["cat", "testfile"])
 
-        self.mount_a.kill_background(p)
-
     def test_root_rctime(self):
         """
         Check that the root inode has a non-default rctime on startup.

qa/tasks/cephfs/test_openfiletable.py

@@ -31,7 +31,7 @@ def test_max_items_per_obj(self):
         file_count = 8
         for i in range(0, file_count):
             filename = "open_file{}".format(i)
-            p = self.mount_a.open_background(filename)
+            self.mount_a.open_background(filename)
             self.mount_a.write_n_mb(filename, size_mb)
 
         time.sleep(10)
@@ -44,9 +44,6 @@ def test_max_items_per_obj(self):
 
         self.fs.radosm(["stat", "mds0_openfiles.1"])
 
-        # Now close the file
-        self.mount_a.kill_background(p)
-
     def test_perf_counters(self):
         """
         Opening a file should increment omap_total_updates by 1.

qa/tasks/cephfs/test_strays.py

@@ -712,7 +712,7 @@ def test_migrate_unlinked_dir(self):
         self._force_migrate("pin")
 
         # Hold the dir open so it cannot be purged
-        p = self.mount_a.open_dir_background("pin/to-be-unlinked")
+        self.mount_a.open_dir_background("pin/to-be-unlinked")
 
         # Unlink the dentry
         self.mount_a.run_shell(["rmdir", "pin/to-be-unlinked"])
@@ -736,8 +736,6 @@ def test_migrate_unlinked_dir(self):
         # self.assertEqual(self.get_mdc_stat("strays_created", mds_id=rank_0_id), 1)
         # https://github.com/ceph/ceph/pull/44335#issuecomment-1125940158
 
-        self.mount_a.kill_background(p)
-
     def assert_backtrace(self, ino, expected_path):
         """
         Assert that the backtrace in the data pool for an inode matches