diff options
author | Mykola Golub <mgolub@suse.com> | 2018-02-22 21:32:42 +0100 |
---|---|---|
committer | Jason Dillaman <dillaman@redhat.com> | 2018-08-15 00:29:45 +0200 |
commit | 72df087dbd17c27c9524a07a195745686b721e89 (patch) | |
tree | 2205db9657b672ad97ae6cb77d308f3e8824dd40 /src | |
parent | rbd: show when parent is migration source in info output (diff) | |
download | ceph-72df087dbd17c27c9524a07a195745686b721e89.tar.xz ceph-72df087dbd17c27c9524a07a195745686b721e89.zip |
rbd: make status show migration details if it is in progress
Signed-off-by: Mykola Golub <mgolub@suse.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/tools/rbd/action/Status.cc | 97 |
1 files changed, 93 insertions, 4 deletions
diff --git a/src/tools/rbd/action/Status.cc b/src/tools/rbd/action/Status.cc index 43b8b9b7286..253f9508f30 100644 --- a/src/tools/rbd/action/Status.cc +++ b/src/tools/rbd/action/Status.cc @@ -5,6 +5,7 @@ #include "tools/rbd/Shell.h" #include "tools/rbd/Utils.h" #include "include/rbd_types.h" +#include "include/stringify.h" #include "common/errno.h" #include "common/Formatter.h" #include <iostream> @@ -17,7 +18,8 @@ namespace status { namespace at = argument_types; namespace po = boost::program_options; -static int do_show_status(librbd::Image &image, Formatter *f) +static int do_show_status(librados::IoCtx& io_ctx, const std::string &image_name, + librbd::Image &image, Formatter *f) { int r; std::list<librbd::image_watcher_t> watchers; @@ -26,6 +28,63 @@ static int do_show_status(librbd::Image &image, Formatter *f) if (r < 0) return r; + uint64_t features; + r = image.features(&features); + if (r < 0) { + return r; + } + + librbd::image_migration_status_t migration_status; + std::string source_pool_name; + std::string dest_pool_name; + std::string migration_state; + if ((features & RBD_FEATURE_MIGRATING) != 0) { + r = librbd::RBD().migration_status(io_ctx, image_name.c_str(), + &migration_status, + sizeof(migration_status)); + if (r < 0) { + std::cerr << "rbd: getting migration status failed: " << cpp_strerror(r) + << std::endl; + // not fatal + } else { + librados::IoCtx src_io_ctx; + r = librados::Rados(io_ctx).ioctx_create2(migration_status.source_pool_id, src_io_ctx); + if (r < 0) { + source_pool_name = stringify(migration_status.source_pool_id); + } else { + source_pool_name = src_io_ctx.get_pool_name(); + } + + librados::IoCtx dst_io_ctx; + r = librados::Rados(io_ctx).ioctx_create2(migration_status.dest_pool_id, dst_io_ctx); + if (r < 0) { + dest_pool_name = stringify(migration_status.dest_pool_id); + } else { + dest_pool_name = dst_io_ctx.get_pool_name(); + } + + switch (migration_status.state) { + case RBD_IMAGE_MIGRATION_STATE_ERROR: + migration_state = "error"; + break; + case RBD_IMAGE_MIGRATION_STATE_PREPARING: + migration_state = "preparing"; + break; + case RBD_IMAGE_MIGRATION_STATE_PREPARED: + migration_state = "prepared"; + break; + case RBD_IMAGE_MIGRATION_STATE_EXECUTING: + migration_state = "executing"; + break; + case RBD_IMAGE_MIGRATION_STATE_EXECUTED: + migration_state = "executed"; + break; + default: + migration_state = "unknown"; + } + } + } + if (f) f->open_object_section("status"); @@ -38,7 +97,19 @@ static int do_show_status(librbd::Image &image, Formatter *f) f->dump_unsigned("cookie", watcher.cookie); f->close_section(); } - f->close_section(); + f->close_section(); // watchers + if (!migration_state.empty()) { + f->open_object_section("migration"); + f->dump_string("source_pool_name", source_pool_name); + f->dump_string("source_image_name", migration_status.source_image_name); + f->dump_string("source_image_id", migration_status.source_image_id); + f->dump_string("dest_pool_name", dest_pool_name); + f->dump_string("dest_image_name", migration_status.dest_image_name); + f->dump_string("dest_image_id", migration_status.dest_image_id); + f->dump_string("state", migration_state); + f->dump_string("state_description", migration_status.state_description); + f->close_section(); // migration + } } else { if (watchers.size()) { std::cout << "Watchers:" << std::endl; @@ -49,9 +120,27 @@ static int do_show_status(librbd::Image &image, Formatter *f) } else { std::cout << "Watchers: none" << std::endl; } + if (!migration_state.empty()) { + std::cout << "Migration:" << std::endl; + std::cout << "\tsource: " << source_pool_name << "/" + << migration_status.source_image_name; + if (!migration_status.source_image_id.empty()) { + std::cout << " (" << migration_status.source_image_id << ")"; + } + std::cout << std::endl; + std::cout << "\tdestination: " << dest_pool_name << "/" + << migration_status.dest_image_name << " (" + << migration_status.dest_image_id << ")" << std::endl; + std::cout << "\tstate: " << migration_state; + if (!migration_status.state_description.empty()) { + std::cout << " (" << migration_status.state_description << ")"; + } + std::cout << std::endl; + } } + if (f) { - f->close_section(); + f->close_section(); // status f->flush(std::cout); } @@ -94,7 +183,7 @@ int execute(const po::variables_map &vm, return r; } - r = do_show_status(image, formatter.get()); + r = do_show_status(io_ctx, image_name, image, formatter.get()); if (r < 0) { std::cerr << "rbd: show status failed: " << cpp_strerror(r) << std::endl; return r; |