From: Samuel Just <sam.just@inktank.com>
Date: Tue, 24 Feb 2015 19:15:06 +0000 (-0800)
Subject: Merge pull request #3742 from ceph/wip-10788
X-Git-Tag: v0.93~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=29861b1b64540b6b09a735adf619335a48edfad8;p=ceph.git

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>
---

29861b1b64540b6b09a735adf619335a48edfad8
diff --cc src/osdc/Objecter.h
index 581d99a0659c0,46f47d3044714..fef7cd42cabd6
--- a/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),