Merge pull request #20396 from tianshan/cancel_op_miss_update_header

rgw: fix index cancel op miss update header Reviewed-by: Casey Bodley <cbodley@redhat.com>
ceph · Feb 16, 2018 · 191ab13 · 191ab13
2 parents 08f7686 + 690482d
commit 191ab13
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
@@ -854,10 +854,15 @@ int rgw_bucket_complete_op(cls_method_context_t hctx, bufferlist *in, bufferlist
     if (op.tag.size()) {
       bufferlist new_key_bl;
       encode(entry, new_key_bl);
-      return cls_cxx_map_set_val(hctx, idx, &new_key_bl);
-    } else {
-      return 0;
+      rc = cls_cxx_map_set_val(hctx, idx, &new_key_bl);
+      if (rc < 0)
+        return rc;
     }
+
+    if (op.log_op && !header.syncstopped) {
+      return write_bucket_header(hctx, &header);
+    }
+    return 0;
   }
 
   if (entry.exists) {