From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Nov 2014 03:47:53 +0000 (-0800)
Subject: osdc/Objecter: stop sending pings once we get an error
X-Git-Tag: v0.91~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b583152e83b4fce0be83eaf97703ba7da3dbe74e;p=ceph.git

osdc/Objecter: stop sending pings once we get an error

If we get ENOTCONN or ETIMEDOUT we can stop pinging.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 09970b0764d8..d9a80387b490 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1673,7 +1673,7 @@ void Objecter::tick()
         assert(op->session);
         ldout(cct, 10) << " pinging osd that serves lingering tid " << p->first << " (osd." << op->session->osd << ")" << dendl;
         toping.insert(op->session);
-	if (op->cookie)
+	if (op->cookie && !op->last_error)
 	  _send_linger_ping(op);
       }
       for (map<uint64_t,CommandOp*>::iterator p = s->command_ops.begin();