crush: CHOOSE_LEAF -> CHOOSELEAF throughout

This aligns the internal identifier names with the user-visible names in
the decompiled crush map language.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc
index 7b0919ce5d732ec84bebf40e318902c243dfab72..f585b3b6ecc88c33a5f7fd2a060c58808832c071 100644 (file)
--- a/src/crush/CrushCompiler.cc
+++ b/src/crush/CrushCompiler.cc
@@ -260,7 +260,7 @@ int CrushCompiler::decompile(ostream &out)
        out << "\tstep set_choose_tries " << crush.get_rule_arg1(i, j)
            << "\n";
        break;
-      case CRUSH_RULE_SET_CHOOSE_LEAF_TRIES:
+      case CRUSH_RULE_SET_CHOOSELEAF_TRIES:
        out << "\tstep set_chooseleaf_tries " << crush.get_rule_arg1(i, j)
            << "\n";
        break;
@@ -278,14 +278,14 @@ int CrushCompiler::decompile(ostream &out)
        print_type_name(out, crush.get_rule_arg2(i, j), crush);
        out << "\n";
        break;
-      case CRUSH_RULE_CHOOSE_LEAF_FIRSTN:
+      case CRUSH_RULE_CHOOSELEAF_FIRSTN:
        out << "\tstep chooseleaf firstn "
            << crush.get_rule_arg1(i, j) 
            << " type ";
        print_type_name(out, crush.get_rule_arg2(i, j), crush);
        out << "\n";
        break;
-      case CRUSH_RULE_CHOOSE_LEAF_INDEP:
+      case CRUSH_RULE_CHOOSELEAF_INDEP:
        out << "\tstep chooseleaf indep "
            << crush.get_rule_arg1(i, j) 
            << " type ";

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index dc5e2bdfce44733f1ff947076b072c2798630b33..5173ce244451dae01b56e73c62c45400a0dad71a 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -693,12 +693,12 @@ int CrushWrapper::add_simple_rule(string name, string root_name,
   assert(rule);
   int step = 0;
   if (mode == "indep")
-    crush_rule_set_step(rule, step++, CRUSH_RULE_SET_CHOOSE_LEAF_TRIES, 5, 0);
+    crush_rule_set_step(rule, step++, CRUSH_RULE_SET_CHOOSELEAF_TRIES, 5, 0);
   crush_rule_set_step(rule, step++, CRUSH_RULE_TAKE, root, 0);
   if (type)
     crush_rule_set_step(rule, step++,
-                       mode == "firstn" ? CRUSH_RULE_CHOOSE_LEAF_FIRSTN :
-                       CRUSH_RULE_CHOOSE_LEAF_INDEP,
+                       mode == "firstn" ? CRUSH_RULE_CHOOSELEAF_FIRSTN :
+                       CRUSH_RULE_CHOOSELEAF_INDEP,
                        CRUSH_CHOOSE_N,
                        type);
   else
@@ -1103,12 +1103,12 @@ void CrushWrapper::dump_rules(Formatter *f) const
        f->dump_int("num", get_rule_arg1(i, j));
        f->dump_string("type", get_type_name(get_rule_arg2(i, j)));
        break;
-      case CRUSH_RULE_CHOOSE_LEAF_FIRSTN:
+      case CRUSH_RULE_CHOOSELEAF_FIRSTN:
        f->dump_string("op", "chooseleaf_firstn");
        f->dump_int("num", get_rule_arg1(i, j));
        f->dump_string("type", get_type_name(get_rule_arg2(i, j)));
        break;
-      case CRUSH_RULE_CHOOSE_LEAF_INDEP:
+      case CRUSH_RULE_CHOOSELEAF_INDEP:
        f->dump_string("op", "chooseleaf_indep");
        f->dump_int("num", get_rule_arg1(i, j));
        f->dump_string("type", get_type_name(get_rule_arg2(i, j)));
@@ -1117,7 +1117,7 @@ void CrushWrapper::dump_rules(Formatter *f) const
        f->dump_string("op", "set_choose_tries");
        f->dump_int("num", get_rule_arg1(i, j));
        break;
-      case CRUSH_RULE_SET_CHOOSE_LEAF_TRIES:
+      case CRUSH_RULE_SET_CHOOSELEAF_TRIES:
        f->dump_string("op", "set_chooseleaf_tries");
        f->dump_int("num", get_rule_arg1(i, j));
        break;

diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index dd2de4f434329762f9c0b30e1a6f7b1e4192b01d..d1bdc19667b11c4637c8378d6ebdf818f16f865e 100644 (file)
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -567,7 +567,7 @@ public:
     return set_rule_step(ruleno, step, CRUSH_RULE_SET_CHOOSE_TRIES, val, 0);
   }
   int set_rule_step_set_chooseleaf_tries(unsigned ruleno, unsigned step, int val) {
-    return set_rule_step(ruleno, step, CRUSH_RULE_SET_CHOOSE_LEAF_TRIES, val, 0);
+    return set_rule_step(ruleno, step, CRUSH_RULE_SET_CHOOSELEAF_TRIES, val, 0);
   }
   int set_rule_step_choose_firstn(unsigned ruleno, unsigned step, int val, int type) {
     return set_rule_step(ruleno, step, CRUSH_RULE_CHOOSE_FIRSTN, val, type);
@@ -576,10 +576,10 @@ public:
     return set_rule_step(ruleno, step, CRUSH_RULE_CHOOSE_INDEP, val, type);
   }
   int set_rule_step_choose_leaf_firstn(unsigned ruleno, unsigned step, int val, int type) {
-    return set_rule_step(ruleno, step, CRUSH_RULE_CHOOSE_LEAF_FIRSTN, val, type);
+    return set_rule_step(ruleno, step, CRUSH_RULE_CHOOSELEAF_FIRSTN, val, type);
   }
   int set_rule_step_choose_leaf_indep(unsigned ruleno, unsigned step, int val, int type) {
-    return set_rule_step(ruleno, step, CRUSH_RULE_CHOOSE_LEAF_INDEP, val, type);
+    return set_rule_step(ruleno, step, CRUSH_RULE_CHOOSELEAF_INDEP, val, type);
   }
   int set_rule_step_emit(unsigned ruleno, unsigned step) {
     return set_rule_step(ruleno, step, CRUSH_RULE_EMIT, 0, 0);

diff --git a/src/crush/crush.h b/src/crush/crush.h
index 54e8f5f7e5708968ff0faaad325a0b0f62d28882..158c822b4d46e1ad783130de79b7eaa857360419 100644 (file)
--- a/src/crush/crush.h
+++ b/src/crush/crush.h
@@ -53,11 +53,11 @@ enum {
                                      /* arg2 = type */
        CRUSH_RULE_CHOOSE_INDEP = 3,  /* same */
        CRUSH_RULE_EMIT = 4,          /* no args */
-       CRUSH_RULE_CHOOSE_LEAF_FIRSTN = 6,
-       CRUSH_RULE_CHOOSE_LEAF_INDEP = 7,
+       CRUSH_RULE_CHOOSELEAF_FIRSTN = 6,
+       CRUSH_RULE_CHOOSELEAF_INDEP = 7,
 
        CRUSH_RULE_SET_CHOOSE_TRIES = 8, /* override choose_total_tries */
-       CRUSH_RULE_SET_CHOOSE_LEAF_TRIES = 9, /* override chooseleaf_descend_once */
+       CRUSH_RULE_SET_CHOOSELEAF_TRIES = 9, /* override chooseleaf_descend_once */
 };
 
 /*

diff --git a/src/crush/mapper.c b/src/crush/mapper.c
index 38faa690e08ea4f7fc2e58b2e9c3707984b33114..684ada6288aa8da1b6fa34397e7b61920604c8c8 100644 (file)
--- a/src/crush/mapper.c
+++ b/src/crush/mapper.c
@@ -660,25 +660,25 @@ int crush_do_rule(const struct crush_map *map,
                                choose_tries = curstep->arg1;
                        break;
 
-               case CRUSH_RULE_SET_CHOOSE_LEAF_TRIES:
+               case CRUSH_RULE_SET_CHOOSELEAF_TRIES:
                        if (curstep->arg1 > 0)
                                choose_leaf_tries = curstep->arg1;
                        break;
 
-               case CRUSH_RULE_CHOOSE_LEAF_FIRSTN:
+               case CRUSH_RULE_CHOOSELEAF_FIRSTN:
                case CRUSH_RULE_CHOOSE_FIRSTN:
                        firstn = 1;
                        /* fall through */
-               case CRUSH_RULE_CHOOSE_LEAF_INDEP:
+               case CRUSH_RULE_CHOOSELEAF_INDEP:
                case CRUSH_RULE_CHOOSE_INDEP:
                        if (wsize == 0)
                                break;
 
                        recurse_to_leaf =
                                curstep->op ==
-                                CRUSH_RULE_CHOOSE_LEAF_FIRSTN ||
+                                CRUSH_RULE_CHOOSELEAF_FIRSTN ||
                                curstep->op ==
-                               CRUSH_RULE_CHOOSE_LEAF_INDEP;
+                               CRUSH_RULE_CHOOSELEAF_INDEP;
 
                        /* reset output */
                        osize = 0;

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 60ebb8ff38e90b32ef706e6ac8133b03c9eeee9a..6cb4ab60c54471e0c05e1c17ee09ba1dd90dffc7 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1888,7 +1888,7 @@ void OSDMap::build_simple_crush_map(CephContext *cct, CrushWrapper& crush,
     assert(rule);
     crush_rule_set_step(rule, 0, CRUSH_RULE_TAKE, rootid, 0);
     crush_rule_set_step(rule, 1,
-                       cct->_conf->osd_crush_chooseleaf_type ? CRUSH_RULE_CHOOSE_LEAF_FIRSTN : CRUSH_RULE_CHOOSE_FIRSTN,
+                       cct->_conf->osd_crush_chooseleaf_type ? CRUSH_RULE_CHOOSELEAF_FIRSTN : CRUSH_RULE_CHOOSE_FIRSTN,
                        CRUSH_CHOOSE_N,
                        cct->_conf->osd_crush_chooseleaf_type);
     crush_rule_set_step(rule, 2, CRUSH_RULE_EMIT, 0, 0);
@@ -2051,10 +2051,10 @@ void OSDMap::build_simple_crush_map_from_conf(CephContext *cct, CrushWrapper& cr
 
     if (racks.size() > 3) {
       // spread replicas across hosts
-      crush_rule_set_step(rule, 1, CRUSH_RULE_CHOOSE_LEAF_FIRSTN, CRUSH_CHOOSE_N, 2);
+      crush_rule_set_step(rule, 1, CRUSH_RULE_CHOOSELEAF_FIRSTN, CRUSH_CHOOSE_N, 2);
     } else if (hosts.size() > 1) {
       // spread replicas across hosts
-      crush_rule_set_step(rule, 1, CRUSH_RULE_CHOOSE_LEAF_FIRSTN, CRUSH_CHOOSE_N, 1);
+      crush_rule_set_step(rule, 1, CRUSH_RULE_CHOOSELEAF_FIRSTN, CRUSH_CHOOSE_N, 1);
     } else {
       // just spread across osds
       crush_rule_set_step(rule, 1, CRUSH_RULE_CHOOSE_FIRSTN, CRUSH_CHOOSE_N, 0);

diff --git a/src/test/crush/indep.cc b/src/test/crush/indep.cc
index 92d61ea485e2deafc3e9a294c5fbe20952d3d980..896e58fb12905a4663e7f4602a23c334264d8753 100644 (file)
--- a/src/test/crush/indep.cc
+++ b/src/test/crush/indep.cc
@@ -54,10 +54,10 @@ CrushWrapper *build_indep_map(CephContext *cct, int num_rack, int num_host,
 
   crush_rule *rule = crush_make_rule(4, 0, 123, 1, 20);
   assert(rule);
-  crush_rule_set_step(rule, 0, CRUSH_RULE_SET_CHOOSE_LEAF_TRIES, 10, 0);
+  crush_rule_set_step(rule, 0, CRUSH_RULE_SET_CHOOSELEAF_TRIES, 10, 0);
   crush_rule_set_step(rule, 1, CRUSH_RULE_TAKE, rootno, 0);
   crush_rule_set_step(rule, 2,
-                     CRUSH_RULE_CHOOSE_LEAF_INDEP,
+                     CRUSH_RULE_CHOOSELEAF_INDEP,
                      CRUSH_CHOOSE_N,
                      1);
   crush_rule_set_step(rule, 3, CRUSH_RULE_EMIT, 0, 0);

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index caebf2d56207e3b09b0e8056fce7fd6e9f338dfa..f1a0364662356700b46a45e02a1292f5a51f6033 100644 (file)
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -602,7 +602,7 @@ int main(int argc, const char **argv)
     crush_rule *rule = crush_make_rule(3, ruleset, CEPH_PG_TYPE_REP, 2, 2);
     assert(rule);
     crush_rule_set_step(rule, 0, CRUSH_RULE_TAKE, rootid, 0);
-    crush_rule_set_step(rule, 1, CRUSH_RULE_CHOOSE_LEAF_FIRSTN, CRUSH_CHOOSE_N, 1);
+    crush_rule_set_step(rule, 1, CRUSH_RULE_CHOOSELEAF_FIRSTN, CRUSH_CHOOSE_N, 1);
     crush_rule_set_step(rule, 2, CRUSH_RULE_EMIT, 0, 0);
     int rno = crush_add_rule(crush.crush, rule, -1);
     crush.set_rule_name(rno, "data");