From facd4b50e84437370b87fc4ceb4724c9ae56e228 Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 20 Nov 2020 12:32:48 -0500
Subject: [PATCH] rgw: remove rgw_bucket_shard_sync_info::full_marker

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---
 src/rgw/rgw_data_sync.cc |  6 ------
 src/rgw/rgw_data_sync.h  | 11 ++++++-----
 src/rgw/rgw_json_enc.cc  |  2 --
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index bed3b9e646907..60e40398a684d 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -2866,9 +2866,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);
   }
@@ -2877,7 +2874,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);
 }
 
@@ -5524,7 +5520,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);
 }
 
@@ -5549,7 +5544,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);
 }
 
diff --git a/src/rgw/rgw_data_sync.h b/src/rgw/rgw_data_sync.h
index 0a74430ec2597..64d5d18d93a74 100644
--- a/src/rgw/rgw_data_sync.h
+++ b/src/rgw/rgw_data_sync.h
@@ -529,7 +529,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, std::map<std::string, bufferlist>& attrs);
@@ -537,17 +536,19 @@ struct rgw_bucket_shard_sync_info {
   void encode_state_attr(std::map<std::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 f4dcaa5b15736..62b29b3ed34ae 100644
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -1763,7 +1763,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);
 }
 
@@ -1788,7 +1787,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);
 }
 
-- 
2.39.5