From 25fcaca19c76765284787c61584d25efd105a0ca Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 5 Feb 2015 09:33:26 -0800 Subject: [PATCH] rgw: send appropriate op to cancel bucket index pending operation Fixes: #10770 Backport: firefly, giant Reported-by: baijiaruo Signed-off-by: Yehuda Sadeh (cherry picked from commit dfee96e3aebcaeef18c721ab73f0460eba69f1c7) Conflicts: src/rgw/rgw_rados.cc resolved by manual s/ADD/CANCEL/ --- src/rgw/rgw_rados.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 709deefe5215c..cbd30e7a736a5 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -6039,7 +6039,7 @@ int RGWRados::cls_obj_complete_cancel(rgw_bucket& bucket, string& tag, string& n { RGWObjEnt ent; ent.name = name; - return cls_obj_complete_op(bucket, CLS_RGW_OP_ADD, tag, -1 /* pool id */, 0, ent, RGW_OBJ_CATEGORY_NONE, NULL); + return cls_obj_complete_op(bucket, CLS_RGW_OP_CANCEL, tag, -1 /* pool id */, 0, ent, RGW_OBJ_CATEGORY_NONE, NULL); } int RGWRados::cls_obj_set_bucket_tag_timeout(rgw_bucket& bucket, uint64_t timeout) -- 2.39.5