Merge PR ceph#48473 into main

* refs/pull/48473/head: qa: fix _run_mount_cmd() and _get_mount_cmd() args in vstart_runner Reviewed-by: Rishabh Dave <[email protected]> Reviewed-by: Venky Shankar <[email protected]> Reviewed-by: Neeraj Pratap Singh <[email protected]>
nizamial09 · Dec 19, 2022 · ab8fbe4 · ab8fbe4
2 parents 4ffa58c + d96a734
commit ab8fbe4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.githubmap b/.githubmap
@@ -154,3 +154,4 @@ anthonyeleven Anthony D Atri <[email protected]>
 petrutlucian94 Lucian Petrut <[email protected]>
 dparmar18 Dhairya Parmar <[email protected]>
 nmshelke Nikhilkumar Shelke <[email protected]>
+neesingh-rh Neeraj Pratap Singh <[email protected]>
diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
@@ -705,18 +705,18 @@ def __init__(self, ctx, test_dir, client_id, client_keyring_path=None,
     def _create_mntpt(self):
         self.client_remote.run(args=f'mkdir -p -v {self.hostfs_mntpt}')
 
-    def _run_mount_cmd(self, mntopts, check_status):
-        retval = super(type(self), self)._run_mount_cmd(mntopts, check_status)
+    def _run_mount_cmd(self, mntopts, mntargs, check_status):
+        retval = super(type(self), self)._run_mount_cmd(mntopts, mntargs,
+                                                        check_status)
         if retval is None: # None represents success
             self._set_fuse_daemon_pid(check_status)
         return retval
 
-    def _get_mount_cmd(self, mntopts):
-        mount_cmd = super(type(self), self)._get_mount_cmd(mntopts)
+    def _get_mount_cmd(self, mntopts, mntargs):
+        mount_cmd = super(type(self), self)._get_mount_cmd(mntopts, mntargs)
 
         if os.getuid() != 0:
             mount_cmd += ['--client_die_on_failed_dentry_invalidate=false']
-
         return mount_cmd
 
     @property