From 4318ac5e3f36b9885953f03d30c6b6a72b62d7e6 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Mon, 22 Jan 2018 17:18:43 +0200 Subject: [PATCH] Revert "luminous: rgw: user stats increased after bucket reshard" Signed-off-by: Orit Wasserman --- src/rgw/rgw_bucket.cc | 7 +++---- src/rgw/rgw_bucket.h | 10 +++------- src/rgw/rgw_rados.cc | 5 ++--- src/rgw/rgw_rados.h | 2 +- src/rgw/rgw_reshard.cc | 9 ++++----- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 776db76ba9d81..904ebc0eab6ca 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -184,8 +184,7 @@ int rgw_link_bucket(RGWRados* const store, const rgw_user& user_id, rgw_bucket& bucket, ceph::real_time creation_time, - bool update_entrypoint, - bool update_stats) + bool update_entrypoint) { int ret; string& tenant_name = bucket.tenant; @@ -218,7 +217,7 @@ int rgw_link_bucket(RGWRados* const store, rgw_get_buckets_obj(user_id, buckets_obj_id); rgw_raw_obj obj(store->get_zone_params().user_uid_pool, buckets_obj_id); - ret = store->cls_user_add_bucket(obj, new_bucket, update_stats); + ret = store->cls_user_add_bucket(obj, new_bucket); if (ret < 0) { ldout(store->ctx(), 0) << "ERROR: error adding bucket to directory: " << cpp_strerror(-ret) << dendl; @@ -892,7 +891,7 @@ int RGWBucket::link(RGWBucketAdminOpState& op_state, std::string *err_msg) } r = rgw_link_bucket(store, user_info.user_id, bucket_info.bucket, - ceph::real_time(),true, op_state.will_update_stats()); + ceph::real_time()); if (r < 0) { return r; } diff --git a/src/rgw/rgw_bucket.h b/src/rgw/rgw_bucket.h index b654b2411292d..62b2923258827 100644 --- a/src/rgw/rgw_bucket.h +++ b/src/rgw/rgw_bucket.h @@ -180,8 +180,7 @@ extern int rgw_link_bucket(RGWRados* store, const rgw_user& user_id, rgw_bucket& bucket, ceph::real_time creation_time, - bool update_entrypoint = true, - bool update_stats = true); + bool update_entrypoint = true); extern int rgw_unlink_bucket(RGWRados *store, const rgw_user& user_id, const string& tenant_name, const string& bucket_name, bool update_entrypoint = true); @@ -208,8 +207,7 @@ struct RGWBucketAdminOpState { bool fix_index; bool delete_child_objects; bool bucket_stored; - int max_aio = 0; - bool update_stats; + int max_aio; rgw_bucket bucket; @@ -219,7 +217,6 @@ struct RGWBucketAdminOpState { void set_delete_children(bool value) { delete_child_objects = value; } void set_max_aio(int value) { max_aio = value; } - void set_update_stats(bool value) { update_stats = value; } void set_user_id(const rgw_user& user_id) { if (!user_id.empty()) @@ -256,11 +253,10 @@ struct RGWBucketAdminOpState { bool is_system_op() { return uid.empty(); } bool has_bucket_stored() { return bucket_stored; } int get_max_aio() { return max_aio; } - bool will_update_stats() { return update_stats;} RGWBucketAdminOpState() : list_buckets(false), stat_buckets(false), check_objects(false), fix_index(false), delete_child_objects(false), - bucket_stored(false), update_stats(true) {} + bucket_stored(false) {} }; /* diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index cb2dc13fd0d6f..4a060a2d5b7f2 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -13359,13 +13359,12 @@ int RGWRados::cls_user_complete_stats_sync(rgw_raw_obj& obj) return 0; } -int RGWRados::cls_user_add_bucket(rgw_raw_obj& obj, const cls_user_bucket_entry& entry, - bool update_stats) +int RGWRados::cls_user_add_bucket(rgw_raw_obj& obj, const cls_user_bucket_entry& entry) { list l; l.push_back(entry); - return cls_user_update_buckets(obj, l, update_stats); + return cls_user_update_buckets(obj, l, true); } int RGWRados::cls_user_remove_bucket(rgw_raw_obj& obj, const cls_user_bucket& bucket) diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 31f88a86e8b6f..8354c8c42d8e4 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -3547,7 +3547,7 @@ public: list& entries, string *out_marker, bool *truncated); - int cls_user_add_bucket(rgw_raw_obj& obj, const cls_user_bucket_entry& entry, bool update_stats); + int cls_user_add_bucket(rgw_raw_obj& obj, const cls_user_bucket_entry& entry); int cls_user_update_buckets(rgw_raw_obj& obj, list& entries, bool add); int cls_user_complete_stats_sync(rgw_raw_obj& obj); int complete_sync_user_stats(const rgw_user& user_id); diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc index 52bbbe4e5f93c..f5a4b4a225179 100644 --- a/src/rgw/rgw_reshard.cc +++ b/src/rgw/rgw_reshard.cc @@ -475,12 +475,11 @@ int RGWBucketReshard::do_reshard( bucket_op.set_bucket_name(new_bucket_info.bucket.name); bucket_op.set_bucket_id(new_bucket_info.bucket.bucket_id); bucket_op.set_user_id(new_bucket_info.owner); - bucket_op.set_update_stats(false); string err; - ret = RGWBucketAdminOp::link(store, bucket_op, &err); - if (ret < 0) { - lderr(store->ctx()) << "failed to link new bucket instance (bucket_id=" << new_bucket_info.bucket.bucket_id << ": " << err << "; " << cpp_strerror(-ret) << ")" << dendl; - return -ret; + int r = RGWBucketAdminOp::link(store, bucket_op, &err); + if (r < 0) { + lderr(store->ctx()) << "failed to link new bucket instance (bucket_id=" << new_bucket_info.bucket.bucket_id << ": " << err << "; " << cpp_strerror(-r) << ")" << dendl; + return -r; } ret = bucket_info_updater.complete(); -- 2.39.5