RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw:fix rgw boot failed after upgrade to master latest version

Browse Source 
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
This commit is contained in:
weiqiaomiao 2016-07-23 15:49:48 +08:00
parent f84be8f6a6
commit d8ad08559c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rgw/rgw_rados.h
View File

@ -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;