import ceph pacific 16.2.5

[ceph.git] / ceph / qa / tasks / fwd_scrub.py

diff --git a/ceph/qa/tasks/fwd_scrub.py b/ceph/qa/tasks/fwd_scrub.py
index a7ae1c4ed74a485e18ac03df292f882979dd7808..44fd97baa0a6377fd0b7818af3cb3c602bbba7ed 100644 (file)
--- a/ceph/qa/tasks/fwd_scrub.py
+++ b/ceph/qa/tasks/fwd_scrub.py
@@ -61,8 +61,10 @@ class ForwardScrubber(Thrasher, Greenlet):
 
     def _scrub(self, path="/", recursive=True):
         self.logger.info(f"scrubbing fs: {self.fs.name}")
-        recopt = ["recursive", "force"] if recursive else ["force"]
-        out_json = self.fs.run_scrub(["start", path] + recopt)
+        scrubopts = ["force"]
+        if recursive:
+            scrubopts.append("recursive")
+        out_json = self.fs.run_scrub(["start", path, ",".join(scrubopts)])
         assert out_json is not None
 
         tag = out_json['scrub_tag']