From: Sage Weil <sage@inktank.com>
Date: Fri, 17 May 2013 18:44:10 +0000 (-0700)
Subject: client: skip insert_trace on safe requests
X-Git-Tag: v0.81~19^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=635607ffad74ebf2eb992982c29983349d46224c;p=ceph.git

client: skip insert_trace on safe requests

Only do this for the first reply.

Signed-off-by: Sage Weil <sage@inktank.com>
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index dca27b9917ea..b1e21a3dd6f0 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -988,6 +988,12 @@ Inode* Client::insert_trace(MetaRequest *request, MetaSession *session)
 	   << dendl;
 
   bufferlist::iterator p = reply->get_trace_bl().begin();
+  if (request->got_unsafe) {
+    ldout(cct, 10) << "insert_trace -- already got unsafe; ignoring" << dendl;
+    assert(p.end());
+    return NULL;
+  }
+
   if (p.end()) {
     ldout(cct, 10) << "insert_trace -- no trace" << dendl;