Merge pull request #3742 from ceph/wip-10788

osd: proxy features with proxied reads; only proxy reads to new peers

Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge

diff --cc src/osd/OSDMap.cc
Simple merge

diff --cc src/osd/OSDMap.h
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge

diff --cc src/osdc/Objecter.h
index 581d99a0659c0fef4e07e2d2747792d0178c93d0,46f47d30447148153ec87c416abbf9f5fa8b9c4c..fef7cd42cabd681c550cb362191c4db350102e52
--- 1/src/osdc/Objecter.h
--- 2/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@@ -1190,17 -1190,13 +1191,18 @@@ public
        session(NULL), incarnation(0),
        target(o, ol, f),
        con(NULL),
+       features(CEPH_FEATURES_SUPPORTED_DEFAULT),
        snapid(CEPH_NOSNAP),
        outbl(NULL),
 -      priority(0), onack(ac), oncommit(co),
 +      priority(0),
 +      onack(ac),
 +      oncommit(co),
        ontimeout(NULL),
 -      tid(0), attempts(0),
 -      objver(ov), reply_epoch(NULL),
 +      oncommit_sync(NULL),
 +      tid(0),
 +      attempts(0),
 +      objver(ov),
 +      reply_epoch(NULL),
        map_dne_bound(0),
        budgeted(false),
        should_resend(true),