]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: radogw-admin reshard status command should print text for reshard status 20779/head
authorOrit Wasserman <owasserm@redhat.com>
Mon, 2 Jul 2018 13:03:12 +0000 (16:03 +0300)
committerOrit Wasserman <owasserm@redhat.com>
Thu, 5 Jul 2018 12:58:19 +0000 (15:58 +0300)
Fixes: http://tracker.ceph.com/issues/23257
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/cls/rgw/cls_rgw_types.cc

index 223d165547cde6e1a79fc02cd3e230819cf19e5a..9bec682bcce97f7e0c87eb31b8802ba0926d20e4 100644 (file)
@@ -664,7 +664,21 @@ void cls_rgw_reshard_entry::generate_test_instances(list<cls_rgw_reshard_entry*>
 
 void cls_rgw_bucket_instance_entry::dump(Formatter *f) const
 {
-  encode_json("reshard_status", (int)reshard_status, f);
+  string status_str;
+  switch(reshard_status) {
+    case CLS_RGW_RESHARD_NONE:
+      status_str= "none";
+      break;
+    case CLS_RGW_RESHARD_IN_PROGRESS:
+      status_str = "in-progress";
+      break;
+    case CLS_RGW_RESHARD_DONE:
+      status_str = "done";
+      break;
+    default:
+      status_str = "invalid";
+  }
+  encode_json("reshard_status", status_str, f);
   encode_json("new_bucket_instance_id", new_bucket_instance_id, f);
   encode_json("num_shards", num_shards, f);