From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 21 Nov 2023 19:25:11 +0000 (-0500)
Subject: rgw: fix RGWPeriod encoding after removing realm_name
X-Git-Tag: v19.0.0~47^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F54600%2Fhead;p=ceph.git

rgw: fix RGWPeriod encoding after removing realm_name

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

diff --git a/src/rgw/driver/rados/rgw_zone.h b/src/rgw/driver/rados/rgw_zone.h
index 7542c33451a13..1f837e312c098 100644
--- a/src/rgw/driver/rados/rgw_zone.h
+++ b/src/rgw/driver/rados/rgw_zone.h
@@ -778,6 +778,8 @@ public:
     encode(master_zonegroup, bl);
     encode(period_config, bl);
     encode(realm_id, bl);
+    std::string realm_name; // removed
+    encode(realm_name, bl);
     ENCODE_FINISH(bl);
   }
 
@@ -793,6 +795,8 @@ public:
     decode(master_zonegroup, bl);
     decode(period_config, bl);
     decode(realm_id, bl);
+    std::string realm_name; // removed
+    decode(realm_name, bl);
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;