From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Nov 2014 03:38:24 +0000 (-0800)
Subject: make ping verify we are connected
X-Git-Tag: v0.91~125
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83189b07da8cc26a93db431bfc2cfa8979eef72d;p=ceph.git

make ping verify we are connected
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 7aaf07080fcc..228b526ad98b 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4325,6 +4325,12 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
 	    result = -ENOTCONN;
 	    break;
 	  }
+	  map<pair<uint64_t,entity_name_t>,WatchRef>::iterator p =
+	    obc->watchers.find(make_pair(cookie, entity));
+	  if (p == obc->watchers.end()) {
+	    result = -ETIMEDOUT;
+	    break;
+	  }
 	  dout(10) << " found existing watch " << w << " by " << entity << dendl;
 	  result = 0;
         } else if (op.watch.op == CEPH_OSD_WATCH_OP_UNWATCH) {