From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 10 Jan 2020 22:27:07 +0000 (-0800)
Subject: mds: clarify message about blocked scrub
X-Git-Tag: v15.1.0~257^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32521%2Fhead;p=ceph.git

mds: clarify message about blocked scrub

Also, non-recursive scrub still needs rejected: a given directory's
fragments may be on other ranks.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index bf01333c3cae..0314f036abd3 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -2524,16 +2524,14 @@ void MDSRankDispatcher::handle_asok_command(
     cmd_getval(g_ceph_context, cmdmap, "scrubops", scrubop_vec);
     cmd_getval(g_ceph_context, cmdmap, "path", path);
     cmd_getval(g_ceph_context, cmdmap, "tag", tag);
-    /* if there are more than one mds active and a recursive scrub is requested,
-     * dishonor the request
-     */
-    bool is_recursive = std::find(scrubop_vec.begin(), scrubop_vec.end(), string("recursive")) != scrubop_vec.end();
-    if (mdsmap->get_max_mds() > 1 && is_recursive) {
-      ss << "There is more than one MDS active. Hence a recursive scrub "
-            "request cannot be started.";
+
+    /* Multiple MDS scrub is not currently supported. See also: https://tracker.ceph.com/issues/12274 */
+    if (mdsmap->get_max_mds() > 1) {
+      ss << "Scrub is not currently supported for multiple active MDS. Please reduce max_mds to 1 and then scrub.";
       r = -EINVAL;
       goto out;
     }
+
     finisher->queue(
       new LambdaContext(
 	[this, on_finish, f, path, tag, scrubop_vec](int r) {