From 5a53ffa8a9e8590ea0d1992fad9a30cde135cbac Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 5 Oct 2016 11:41:42 -0700 Subject: [PATCH] rgw: remove user email index using helper function Signed-off-by: Yehuda Sadeh (cherry picked from commit 10dbfc540aef5c3d45b7e3aabe61090c302f47ab) --- src/rgw/rgw_user.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc index ef4e644063ef2..648a94b08ae06 100644 --- a/src/rgw/rgw_user.cc +++ b/src/rgw/rgw_user.cc @@ -2128,11 +2128,10 @@ int RGWUser::execute_modify(RGWUserAdminOpState& op_state, std::string *err_msg) user_info.user_email = op_email; } else if (op_email.empty() && op_state.user_email_specified) { - rgw_obj email_obj(store->zone.user_email_pool, user_info.user_email); ldout(store->ctx(), 10) << "removing email index: " << user_info.user_email << dendl; - ret = store->delete_system_obj(email_obj); + ret = rgw_remove_email_index(store, user_info.user_email); if (ret < 0 && ret != -ENOENT) { - ldout(store->ctx(), 0) << "ERROR: could not remove " << user_info.user_id << ":" << email_obj << ", should be fixed (err=" << ret << ")" << dendl; + ldout(store->ctx(), 0) << "ERROR: could not remove " << user_info.user_id << " index (err=" << ret << ")" << dendl; return ret; } user_info.user_email = ""; -- 2.39.5