diff options
| author | Sage Weil <sage@newdream.net> | 2012-02-24 13:22:49 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-02-24 13:22:49 -0800 |
| commit | 008ce6b2d471dbef27cb24fad90d512cbf35bc1b (patch) | |
| tree | 823d5de58f750567d128aa08c3138a7d1ebf97bd /src/messages | |
| parent | be761149f5f829d0aa4bfc65891848efc59f7143 (diff) | |
| parent | 732f3ec94e39d458230b7728b2a936d431e19322 (diff) | |
| download | ceph-008ce6b2d471dbef27cb24fad90d512cbf35bc1b.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src/messages')
| -rw-r--r-- | src/messages/MOSDMap.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h index f7838f7b7ae..cd4a9519e1d 100644 --- a/src/messages/MOSDMap.h +++ b/src/messages/MOSDMap.h @@ -22,7 +22,7 @@ class MOSDMap : public Message { - static const int HEAD_VERSION = 2; + static const int HEAD_VERSION = 3; public: uuid_d fsid; @@ -85,8 +85,13 @@ public: void encode_payload(uint64_t features) { ::encode(fsid, payload); if ((features & CEPH_FEATURE_PGID64) == 0 || - (features & CEPH_FEATURE_PGPOOL3) == 0) { - header.version = 1; + (features & CEPH_FEATURE_PGPOOL3) == 0 || + (features & CEPH_FEATURE_OSDENC) == 0) { + if ((features & CEPH_FEATURE_PGID64) == 0 || + (features & CEPH_FEATURE_PGPOOL3) == 0) + header.version = 1; // old old_client version + else + header.version = 2; // old pg_pool_t // reencode maps using old format // |