From f4dae60d4cc1ae4099c8d5da785f32a7c39f5a79 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Thu, 29 Mar 2018 13:57:28 +0300 Subject: [PATCH] rgw: warn user about on going resharding when canceling it Fixes: http://tracker.ceph.com/issues/21619 Signed-off-by: Orit Wasserman --- src/rgw/rgw_admin.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index e9dc04d29f18b..b88a8fee104fe 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -5867,11 +5867,15 @@ next: RGWBucketReshard br(store, bucket_info, attrs); int ret = br.cancel(); if (ret < 0) { - cerr << "Error canceling bucket " << bucket_name << " resharding: " << cpp_strerror(-ret) << - std::endl; + if (ret == -EBUSY) { + cerr << "There is ongoing resharding, please retry after " << g_conf->rgw_reshard_bucket_lock_duration << + " seconds " << std::endl; + } else { + cerr << "Error canceling bucket " << bucket_name << " resharding: " << cpp_strerror(-ret) << + std::endl; + } return ret; } - RGWReshard reshard(store); cls_rgw_reshard_entry entry; -- 2.39.5