Merge pull request #14149 from smithfarm/wip-18777-kraken

kraken: rbd: rbd --pool=x rename y z does not work Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Apr 12, 2017 · 14caf24 · 14caf24
2 parents 041b553 + 85b5817
commit 14caf24
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/qa/workunits/rbd/copy.sh b/qa/workunits/rbd/copy.sh
@@ -95,7 +95,8 @@ test_rename() {
     rbd create -p rbd2 -s 1 foo
     rbd rename rbd2/foo rbd2/bar
     rbd -p rbd2 ls | grep bar
-    ! rbd rename rbd2/bar foo
+    rbd rename rbd2/bar foo
+    rbd rename --pool rbd2 foo bar
     ! rbd rename rbd2/bar --dest-pool rbd foo
     rbd rename --pool rbd2 bar --dest-pool rbd2 foo
     rbd -p rbd2 ls | grep foo

diff --git a/src/tools/rbd/action/Rename.cc b/src/tools/rbd/action/Rename.cc
@@ -42,9 +42,9 @@ int execute(const po::variables_map &vm) {
     return r;
   }
 
-  std::string dst_pool_name;
   std::string dst_image_name;
   std::string dst_snap_name;
+  std::string dst_pool_name = pool_name;
   r = utils::get_pool_image_snapshot_names(
     vm, at::ARGUMENT_MODIFIER_DEST, &arg_index, &dst_pool_name, &dst_image_name,
     &dst_snap_name, utils::SNAPSHOT_PRESENCE_NONE, utils::SPEC_VALIDATION_FULL);