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>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 52b67a9a6cc84ff3f91ef54e141a1073d10b459d..bf8dcdfeeff9e1dd643e2279c6b4e50a24b7e48b 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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);

diff --git a/src/osd/PG.h b/src/osd/PG.h
index b6808eba4eefc0095f419cdf28b315a3826ea773..a6af4969fb6a8f376bed1ac445875d10eab6f90d 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -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; }