crushtool: add --move

Fixes: http://tracker.ceph.com/issues/23471
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 22c943511e5d5187235d2455af8ad4158bf0053f)

Conflicts: src/tools/crushtool.cc: argparse_withargs() was introduced in
  3fc7b2fd, but the backport of that commit removed it. so we should use
  ceph_argparse_witharg() instead.

diff --git a/src/test/cli/crushtool/help.t b/src/test/cli/crushtool/help.t
index 621f92ff6e3c9b6a585c26fb227f5ed1a60776e0..389b0614551f4e3281b53c83f553e36bb00a5bee 100755 (executable)
--- a/src/test/cli/crushtool/help.t
+++ b/src/test/cli/crushtool/help.t
@@ -60,6 +60,8 @@
      -i mapfn --add-bucket name type [--loc type name ...]
                            insert a bucket into the hierachy at the given
                            location
+     -i mapfn --move       name --loc type name ...
+                           move the given item to specified location
      -i mapfn --reweight   recalculate all bucket weights
      -i mapfn --create-simple-rule name root type mode
                            create crush rule <name> to start from <root>,

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index 1391c89104ac2bc73aa1888a0da9de06c92fe65f..aca8136cd09326dee50cea38c7d1a42c5cae8cd0 100644 (file)
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -169,6 +169,8 @@ void usage()
   cout << "   -i mapfn --add-bucket name type [--loc type name ...]\n"
        << "                         insert a bucket into the hierachy at the given\n"
        << "                         location\n";
+  cout << "   -i mapfn --move       name --loc type name ...\n"
+       << "                         move the given item to specified location\n";
   cout << "   -i mapfn --reweight   recalculate all bucket weights\n";
   cout << "   -i mapfn --create-simple-rule name root type mode\n"
        << "                         create crush rule <name> to start from <root>,\n"
@@ -282,6 +284,41 @@ int do_add_bucket(CephContext* cct,
   return 0;
 }
 
+// return 1 for no change, 0 for successful change, negative on error
+int do_move_item(CephContext* cct,
+                const char *me,
+                CrushWrapper& crush,
+                const string& name,
+                const map<string,string>& loc)
+{
+  if (!crush.name_exists(name)) {
+    cerr << me << " item '" << name << "' does not exist" << std::endl;
+    return -ENOENT;
+  }
+  int id = crush.get_item_id(name);
+  if (loc.empty()) {
+    cerr << me << " expecting additional --loc argument to --move" << std::endl;
+    return -EINVAL;
+  }
+  if (crush.check_item_loc(cct, id, loc, (int*)nullptr)) {
+    // it's already there
+    cerr << me << " item '" << name << "' already at " << loc << std::endl;
+    return 1;
+  }
+  if (id >= 0) {
+    switch (int r = crush.create_or_move_item(cct, id, 0, name, loc)) {
+    case 0:
+      return 1;
+    case 1:
+      return 0;
+    default:
+      return r;
+    }
+  } else {
+    return crush.move_bucket(cct, id, loc);
+  }
+}
+
 int main(int argc, const char **argv)
 {
   vector<const char*> args;
@@ -289,6 +326,7 @@ int main(int argc, const char **argv)
 
   const char *me = argv[0];
   std::string infn, srcfn, outfn, add_name, add_type, remove_name, reweight_name;
+  std::string move_name;
   bool compile = false;
   bool decompile = false;
   bool check = false;
@@ -307,6 +345,7 @@ int main(int argc, const char **argv)
   int add_item = -1;
   bool add_bucket = false;
   bool update_item = false;
+  bool move_item = false;
   bool add_rule = false;
   std::string rule_name, rule_root, rule_type, rule_mode, rule_device_class;
   bool del_rule = false;
@@ -477,6 +516,13 @@ int main(int argc, const char **argv)
       add_type = *i;
       i = args.erase(i);
       add_bucket = true;
+    } else if (ceph_argparse_witharg(args, i, &val, err, "--move", (char*)NULL)) {
+      move_name.assign(val);
+      if (!err.str().empty()) {
+       cerr << err.str() << std::endl;
+       return EXIT_FAILURE;
+      }
+      move_item = true;
     } else if (ceph_argparse_witharg(args, i, &val, err, "--create-simple-rule", (char*)NULL)) {
       rule_name.assign(val);
       if (!err.str().empty()) {
@@ -696,7 +742,7 @@ int main(int argc, const char **argv)
     return EXIT_FAILURE;
   }
   if (!check && !compile && !decompile && !build && !test && !reweight && !adjust && !tree && !dump &&
-      add_item < 0 && !add_bucket && !add_rule && !del_rule && full_location < 0 &&
+      add_item < 0 && !add_bucket && !move_item && !add_rule && !del_rule && full_location < 0 &&
       remove_name.empty() && reweight_name.empty()) {
     cerr << "no action specified; -h for help" << std::endl;
     return EXIT_FAILURE;
@@ -998,6 +1044,14 @@ int main(int argc, const char **argv)
     }
   }
 
+  if (move_item) {
+    int r = do_move_item(cct.get(), me, crush, move_name, add_loc);
+    if (!r) {
+      modified = true;
+    } else {
+      return r;
+    }
+  }
   if (add_rule) {
     if (crush.rule_exists(rule_name)) {
       cerr << "rule " << rule_name << " already exists" << std::endl;