mon: pool set <pool> crush_ruleset must not use rule_exists

Implement CrushWrapper::ruleset_exists that iterates over the existing
rulesets to find the one matching the ruleset argument.

ceph osd pool set <pool> crush_ruleset must not use
CrushWrapper::rule_exists, which checks for a *rule* existing, whereas
the value being set is a *ruleset*. (cherry picked from commit
fb504baed98d57dca8ec141bcc3fd021f99d82b0)

A test via ceph osd pool set data crush_ruleset verifies the ruleset
argument is accepted.

http://tracker.ceph.com/issues/8599 fixes: #8599

Backport: firefly, emperor, dumpling
Signed-off-by: John Spray <john.spray@inktank.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit d02d46e25080d5f7bb8ddd4874d9019a078b816b)

Conflicts:
	src/mon/OSDMonitor.cc

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index b832f53126d920b68106ca1fd87db4e811b35509..719e267971ccc298f4cfdf9bc816cc6c9bb930b8 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -46,6 +46,31 @@ function check_response()
        fi
 }
 
+#
+# Verify ceph osd pool set data crush_ruleset when
+# when ruleset != rule_id http://tracker.ceph.com/issues/8599
+#
+MAP=$TMPFILE.map.$$
+ceph osd getcrushmap -o $MAP
+[ -s $MAP ]
+crushtool --decompile $MAP -o $MAP.decompiled
+RULESET=55
+cat >> $MAP.decompiled <<EOF
+rule testrule1 {
+       ruleset $RULESET
+       type replicated
+       min_size 1
+       max_size 10
+       step take default
+       step choose firstn 0 type osd
+       step emit
+}
+EOF
+crushtool --compile $MAP.decompiled -o $MAP.modified
+ceph osd setcrushmap -i $MAP.modified
+ceph osd pool set data crush_ruleset $RULESET
+ceph osd pool set data crush_ruleset 0
+rm $MAP{,.decompiled,.modified}
 
 
 #

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index b4bb67bb7429b16b2125e153391a53e291a1ca3e..17f61e2cf562215783b12092780d70417188010c 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -760,6 +760,17 @@ public:
     if (!crush) return -1;
     return crush_find_rule(crush, ruleset, type, size);
   }
+
+  bool ruleset_exists(int ruleset) const {
+    for (size_t i = 0; i < crush->max_rules; ++i) {
+     if (crush->rules[i]->mask.ruleset == ruleset) {
+       return true;
+     }
+    }
+
+    return false;
+  }
+
   void do_rule(int rule, int x, vector<int>& out, int maxout,
               const vector<__u32>& weight) const {
     Mutex::Locker l(mapper_lock);

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 2431fa84d127243eba60f8a140fcd6af6c68c25f..48d9e6c2d7db1bcb9a9daae31769e6ea5fee9e9c 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3669,7 +3669,7 @@ done:
          ss << "set pool " << pool << " pgp_num to " << n;
        }
       } else if (var == "crush_ruleset") {
-       if (osdmap.crush->rule_exists(n)) {
+       if (osdmap.crush->ruleset_exists(n)) {
          pending_inc.new_pools[pool].crush_ruleset = n;
          ss << "set pool " << pool << " crush_ruleset to " << n;
        } else {