update sources to v12.1.2

[ceph.git] / ceph / src / cls / rgw / cls_rgw_types.h

diff --git a/ceph/src/cls/rgw/cls_rgw_types.h b/ceph/src/cls/rgw/cls_rgw_types.h
index cc09cff53ef4dc4940b0d56de90d03f086bc6511..97b53742b85729d85dd678951bbd7ccb3b7ca7aa 100644 (file)
--- a/ceph/src/cls/rgw/cls_rgw_types.h
+++ b/ceph/src/cls/rgw/cls_rgw_types.h
@@ -34,6 +34,8 @@ enum RGWModifyOp {
   CLS_RGW_OP_LINK_OLH        = 4,
   CLS_RGW_OP_LINK_OLH_DM     = 5, /* creation of delete marker */
   CLS_RGW_OP_UNLINK_INSTANCE = 6,
+  CLS_RGW_OP_SYNCSTOP        = 7,
+  CLS_RGW_OP_RESYNC          = 8,
 };
 
 enum RGWBILogFlags {
@@ -660,17 +662,19 @@ struct rgw_bucket_dir_header {
   uint64_t master_ver;
   string max_marker;
   cls_rgw_bucket_instance_entry new_instance;
+  bool syncstopped;
 
-  rgw_bucket_dir_header() : tag_timeout(0), ver(0), master_ver(0) {}
+  rgw_bucket_dir_header() : tag_timeout(0), ver(0), master_ver(0), syncstopped(false) {}
 
   void encode(bufferlist &bl) const {
-    ENCODE_START(6, 2, bl);
+    ENCODE_START(7, 2, bl);
     ::encode(stats, bl);
     ::encode(tag_timeout, bl);
     ::encode(ver, bl);
     ::encode(master_ver, bl);
     ::encode(max_marker, bl);
     ::encode(new_instance, bl);
+    ::encode(syncstopped,bl);
     ENCODE_FINISH(bl);
   }
   void decode(bufferlist::iterator &bl) {
@@ -695,6 +699,9 @@ struct rgw_bucket_dir_header {
     } else {
       new_instance = cls_rgw_bucket_instance_entry();
     }
+    if (struct_v >= 7) {
+      ::decode(syncstopped,bl);
+    }
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;