]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: send appropriate op to cancel bucket index pending operation 3639/head
authorYehuda Sadeh <yehuda@redhat.com>
Thu, 5 Feb 2015 17:33:26 +0000 (09:33 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Thu, 5 Feb 2015 17:48:36 +0000 (09:48 -0800)
Fixes: #10770
Backport: firefly, giant

Reported-by: baijiaruo <baijiaruo@126.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_rados.cc

index 90ea927fe5d0dfb49b6c2e2d227c1c451721c885..0b6681b2f9f04c9a54b392ceb999a2fb4c86d8a5 100644 (file)
@@ -7412,7 +7412,7 @@ int RGWRados::cls_obj_complete_cancel(BucketShard& bs, string& tag, rgw_obj& obj
 {
   RGWObjEnt ent;
   obj.get_index_key(&ent.key);
-  return cls_obj_complete_op(bs, CLS_RGW_OP_ADD, tag, -1 /* pool id */, 0, ent, RGW_OBJ_CATEGORY_NONE, NULL, bilog_flags);
+  return cls_obj_complete_op(bs, CLS_RGW_OP_CANCEL, tag, -1 /* pool id */, 0, ent, RGW_OBJ_CATEGORY_NONE, NULL, bilog_flags);
 }
 
 int RGWRados::cls_obj_set_bucket_tag_timeout(rgw_bucket& bucket, uint64_t timeout)