fix upgrade

Signed-off-by: Leonid Chernin <leonidc@il.ibm.com>

diff --git a/src/mon/NVMeofGwMap.cc b/src/mon/NVMeofGwMap.cc
index a06fd5c98cf3396b0fe503f5a1d25d1d243f5e0f..2a58dbae0c12f6574ccc30baa945adc39683e402 100755 (executable)
--- a/src/mon/NVMeofGwMap.cc
+++ b/src/mon/NVMeofGwMap.cc
@@ -59,13 +59,18 @@ void  NVMeofGwMap::encode(ceph::buffer::list &bl, uint64_t features) const {
     DECODE_START(3, bl);
 
     decode(epoch, bl);
+    dout(10)  << "decode epoch "  << dendl;
     decode(created_gws, bl);
+    dout(10)  << "decode created gws "  << dendl;
     decode(fsm_timers, bl);
+    dout(10)  << "decode fsm timers "  << dendl;
     if (struct_v >= 2) {
       decode(gw_epoch, bl);
+      dout(10)  << "decode gw epoch "  << dendl;
     }
     if (struct_v >=3) {
       decode(disaster_locations, bl);
+      dout(10)  << "decode  disaster location "  << dendl;
     }
     DECODE_FINISH(bl);
   }

diff --git a/src/mon/NVMeofGwSerialize.h b/src/mon/NVMeofGwSerialize.h
index 5926fd8521d0f9b27c8486a6df7c3d9f2e2cd197..7f0629db9805a64608193dbc42cbda7ca6da9f75 100755 (executable)
--- a/src/mon/NVMeofGwSerialize.h
+++ b/src/mon/NVMeofGwSerialize.h
@@ -911,13 +911,14 @@ inline void encode(const BeaconSubsystem& sub,  ceph::bufferlist &bl, uint64_t f
     version = 2;
   }
   // For legacy encoding, skip deleted subsystems to maintain compatibility
+  /*
   if (version == 1 &&
       sub.change_descriptor != subsystem_change_t::SUBSYSTEM_ADDED) {
     dout(4) << "encode BeaconSubsystem: skipping subsystem " << sub.nqn
             << " with change_descriptor " << (int)sub.change_descriptor
             << " in legacy mode" << dendl;
     return; // Skip encoding this subsystem entirely
-  }
+  } */
 
   ENCODE_START(version, version, bl);
   encode(sub.nqn, bl);