Skip to content

Commit

Permalink
osd/osd_types: fix pg_pool_t encoding for hammer
Browse files Browse the repository at this point in the history
If we are missing the hammer feature, we will also be missing the
luminous feature, but we should still encode like hammer.

Analogous fix to e28e0c6

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 37c22b2)
  • Loading branch information
liewegas committed Apr 7, 2018
1 parent fb95ed0 commit 0802918
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/osd/osd_types.cc
Expand Up @@ -1543,8 +1543,7 @@ void pg_pool_t::encode(bufferlist& bl, uint64_t features) const
// this was the first post-hammer thing we added; if it's missing, encode
// like hammer.
v = 21;
}
if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
} else if (!HAVE_FEATURE(features, SERVER_LUMINOUS)) {
v = 24;
}

Expand Down

0 comments on commit 0802918

Please sign in to comment.