From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 20 Nov 2020 17:32:48 +0000 (-0500)
Subject: rgw: remove rgw_bucket_shard_sync_info::full_marker
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=58905ddc9f2fc6399939d0c6e4d1928fd82d0100;p=ceph.git

rgw: remove rgw_bucket_shard_sync_info::full_marker

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index d5941fba3c377..ea7a91a5b9a61 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -2860,9 +2860,6 @@ void rgw_bucket_shard_sync_info::decode_from_attrs(CephContext *cct, map<string,
   if (!decode_attr(cct, attrs, BUCKET_SYNC_ATTR_PREFIX "state", &state)) {
     decode_attr(cct, attrs, "state", &state);
   }
-  if (!decode_attr(cct, attrs, BUCKET_SYNC_ATTR_PREFIX "full_marker", &full_marker)) {
-    decode_attr(cct, attrs, "full_marker", &full_marker);
-  }
   if (!decode_attr(cct, attrs, BUCKET_SYNC_ATTR_PREFIX "inc_marker", &inc_marker)) {
     decode_attr(cct, attrs, "inc_marker", &inc_marker);
   }
@@ -2871,7 +2868,6 @@ void rgw_bucket_shard_sync_info::decode_from_attrs(CephContext *cct, map<string,
 void rgw_bucket_shard_sync_info::encode_all_attrs(map<string, bufferlist>& attrs)
 {
   encode_state_attr(attrs);
-  full_marker.encode_attr(attrs);
   inc_marker.encode_attr(attrs);
 }
 
diff --git a/src/rgw/rgw_data_sync.h b/src/rgw/rgw_data_sync.h
index c0a0a0d666f41..81e9f3d412ff5 100644
--- a/src/rgw/rgw_data_sync.h
+++ b/src/rgw/rgw_data_sync.h
@@ -530,7 +530,6 @@ struct rgw_bucket_shard_sync_info {
   };
 
   uint16_t state;
-  rgw_bucket_shard_full_sync_marker full_marker;
   rgw_bucket_shard_inc_sync_marker inc_marker;
 
   void decode_from_attrs(CephContext *cct, map<string, bufferlist>& attrs);
@@ -538,17 +537,19 @@ struct rgw_bucket_shard_sync_info {
   void encode_state_attr(map<string, bufferlist>& attrs);
 
   void encode(bufferlist& bl) const {
-    ENCODE_START(1, 1, bl);
+    ENCODE_START(2, 1, bl);
     encode(state, bl);
-    encode(full_marker, bl);
     encode(inc_marker, bl);
     ENCODE_FINISH(bl);
   }
 
   void decode(bufferlist::const_iterator& bl) {
-     DECODE_START(1, bl);
+     DECODE_START(2, bl);
      decode(state, bl);
-     decode(full_marker, bl);
+     if (struct_v <= 1) {
+       rgw_bucket_shard_full_sync_marker full_marker;
+       decode(full_marker, bl);
+     }
      decode(inc_marker, bl);
      DECODE_FINISH(bl);
   }
diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc
index 0bf99392ff4c7..4c08ccac90c56 100644
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -1792,7 +1792,6 @@ void rgw_bucket_shard_sync_info::decode_json(JSONObj *obj)
   } else {
     state = StateInit;
   }
-  JSONDecoder::decode_json("full_marker", full_marker, obj);
   JSONDecoder::decode_json("inc_marker", inc_marker, obj);
 }
 
@@ -1817,7 +1816,6 @@ void rgw_bucket_shard_sync_info::dump(Formatter *f) const
     break;
   }
   encode_json("status", s, f);
-  encode_json("full_marker", full_marker, f);
   encode_json("inc_marker", inc_marker, f);
 }