Merge pull request #10409 from weiqiaomiao/wqm-wip-rgw-reboot

rgw:fix rgw boot failed after upgrade to master latest version
ceph · Jul 29, 2016 · bacc5b0 · bacc5b0
2 parents e7cfdc8 + d8ad085
commit bacc5b0
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
@@ -895,11 +895,10 @@ struct RGWZoneParams : RGWSystemMetaObj {
   int fix_pool_names();
 
   void encode(bufferlist& bl) const {
-    ENCODE_START(6, 1, bl);
+    ENCODE_START(7, 1, bl);
     ::encode(domain_root, bl);
     ::encode(control_pool, bl);
     ::encode(gc_pool, bl);
-    ::encode(lc_pool, bl);
     ::encode(log_pool, bl);
     ::encode(intent_log_pool, bl);
     ::encode(usage_log_pool, bl);
@@ -912,15 +911,15 @@ struct RGWZoneParams : RGWSystemMetaObj {
     ::encode(placement_pools, bl);
     ::encode(metadata_heap, bl);
     ::encode(realm_id, bl);
+    ::encode(lc_pool, bl);
     ENCODE_FINISH(bl);
   }
 
   void decode(bufferlist::iterator& bl) {
-    DECODE_START(6, bl);
+    DECODE_START(7, bl);
     ::decode(domain_root, bl);
     ::decode(control_pool, bl);
     ::decode(gc_pool, bl);
-    ::decode(lc_pool, bl);
     ::decode(log_pool, bl);
     ::decode(intent_log_pool, bl);
     ::decode(usage_log_pool, bl);
@@ -943,6 +942,11 @@ struct RGWZoneParams : RGWSystemMetaObj {
     if (struct_v >= 6) {
       ::decode(realm_id, bl);
     }
+    if (struct_v >= 7) {
+      ::decode(lc_pool, bl);
+    } else {
+      lc_pool = name + ".rgw.lc";
+    }
     DECODE_FINISH(bl);
   }
   void dump(Formatter *f) const;