From 83189b07da8cc26a93db431bfc2cfa8979eef72d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Nov 2014 19:38:24 -0800
Subject: [PATCH] make ping verify we are connected

---
 src/osd/ReplicatedPG.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 7aaf07080fccd..228b526ad98b9 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) {
-- 
2.39.5