]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: radogw-admin reshard status command should print text for reshard status 23019/head
authorOrit Wasserman <owasserm@redhat.com>
Mon, 2 Jul 2018 13:03:12 +0000 (16:03 +0300)
committerPrashant D <pdhange@redhat.com>
Fri, 13 Jul 2018 03:19:32 +0000 (23:19 -0400)
Fixes: http://tracker.ceph.com/issues/23257
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 14d25dca343c73108dcd6a04d9695b82d4719a63)

src/cls/rgw/cls_rgw_types.cc

index 1917235627ec738135f115b2685cdb7a2cf3b0f8..51ee342e92123eae8f4f327dec479e4cf8507d92 100644 (file)
@@ -613,7 +613,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);