rgw: cleanup remove realm unused master_zonegroup and zonegroups

Signed-off-by: Orit Wasserman <owasserm@redhat.com>

diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc
index cb108aa59b19853d695c23b0725dbb78efc1cb52..4efe337914f31b58d82a042dbded916029a35d9a 100644 (file)
--- a/src/rgw/rgw_json_enc.cc
+++ b/src/rgw/rgw_json_enc.cc
@@ -1028,8 +1028,6 @@ void RGWDataChangesLogInfo::decode_json(JSONObj *obj)
 void RGWRealm::dump(Formatter *f) const
 {
   RGWSystemMetaObj::dump(f);
-  encode_json("master_zonegroup", master_zonegroup, f);
-  encode_json_map("zonegroups", zonegroups, f);
   encode_json("current_period", current_period, f);
 }
 
@@ -1037,8 +1035,6 @@ void RGWRealm::dump(Formatter *f) const
 void RGWRealm::decode_json(JSONObj *obj)
 {
   RGWSystemMetaObj::decode_json(obj);
-  JSONDecoder::decode_json("master_zonegroup", master_zonegroup, obj);
-  JSONDecoder::decode_json("zonegroups", zonegroups, decode_zonegroups, obj);
   JSONDecoder::decode_json("current_period", current_period, obj);
 }
 

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 9b30f7fe504a71d8c6c65f1f0d8900b20d8a644e..b35d346162a622b77f82e4b2abe809117c792539 100644 (file)
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -1282,8 +1282,6 @@ class RGWPeriod;
 
 class RGWRealm : public RGWSystemMetaObj
 {
-  string master_zonegroup;
-  map<string, RGWZoneGroup> zonegroups;
   string current_period;
 
   int create_control();
@@ -1297,8 +1295,6 @@ public:
   void encode(bufferlist& bl) const {
     ENCODE_START(1, 1, bl);
     RGWSystemMetaObj::encode(bl);
-    ::encode(master_zonegroup, bl);
-    ::encode(zonegroups, bl);
     ::encode(current_period, bl);
     ENCODE_FINISH(bl);
   }
@@ -1306,8 +1302,6 @@ public:
   void decode(bufferlist::iterator& bl) {
     DECODE_START(1, bl);
     RGWSystemMetaObj::decode(bl);
-    ::decode(master_zonegroup, bl);
-    ::decode(zonegroups, bl);
     ::decode(current_period, bl);
     DECODE_FINISH(bl);
   }