1
0
mirror of https://github.com/ceph/ceph synced 2025-03-22 02:08:13 +00:00

osd: Fix peer_features to include self

This should have no practical effect unless we could have
features getting turned off in a later release, since we
can assume any features being checked for are supported locally.

Signed-off-by: David Zafman <dzafman@redhat.com>
This commit is contained in:
David Zafman 2015-06-04 12:08:17 -07:00
parent d3f34d4c01
commit 6d28cb9465
2 changed files with 2 additions and 2 deletions
src/osd

View File

@ -217,7 +217,7 @@ PG::PG(OSDService *o, OSDMapRef curmap,
active_pushes(0),
recovery_state(this),
pg_id(p),
peer_features((uint64_t)-1)
peer_features(CEPH_FEATURES_SUPPORTED_DEFAULT)
{
#ifdef PG_DEBUG_REFS
osd->add_pgid(p, this);

View File

@ -2017,7 +2017,7 @@ public:
const spg_t& get_pgid() const { return pg_id; }
int get_nrep() const { return acting.size(); }
void reset_peer_features() { peer_features = (uint64_t)-1; }
void reset_peer_features() { peer_features = CEPH_FEATURES_SUPPORTED_DEFAULT; }
uint64_t get_min_peer_features() const { return peer_features; }
void apply_peer_features(uint64_t f) { peer_features &= f; }