From: David Zafman <dzafman@redhat.com>
Date: Thu, 4 Jun 2015 19:08:17 +0000 (-0700)
Subject: osd: Fix peer_features to include self
X-Git-Tag: v9.0.3~138^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d28cb9465fb9a0069bf6af6b46b9b6da10ce125;p=ceph.git

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 52b67a9a6cc..bf8dcdfeeff 100644
--- 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 b6808eba4ee..a6af4969fb6 100644
--- 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; }