osd/Watch: inform watchers when they cause a notify timeout

If a watcher doesn't ack in time, let them know that they triggered a
notify failure.

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

diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc
index 247a3f079a6a209367812e06d91aa18311bbd550..0aed7673c76aab854f40e7b23525e3cbd4cf9ae1 100644 (file)
--- a/src/common/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -185,6 +185,7 @@ const char *ceph_watch_event_name(int e)
        switch (e) {
        case CEPH_WATCH_EVENT_NOTIFY: return "notify";
        case CEPH_WATCH_EVENT_NOTIFY_COMPLETE: return "notify_complete";
+       case CEPH_WATCH_EVENT_FAILED_NOTIFY: return "failed_notify";
        }
        return "???";
 }

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 5eebdd8fddb83fc8f23bb0eb113cc22ff00f5635..92bbb7236040310276b067afb36bdcef44560e48 100644 (file)
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -132,6 +132,7 @@ struct ceph_dir_layout {
 enum {
        CEPH_WATCH_EVENT_NOTIFY           = 1, /* notifying watcher */
        CEPH_WATCH_EVENT_NOTIFY_COMPLETE  = 2, /* notifier notified when done */
+       CEPH_WATCH_EVENT_FAILED_NOTIFY    = 3, /* we made a notify time out */
 };
 
 const char *ceph_watch_event_name(int o);

diff --git a/src/osd/Watch.cc b/src/osd/Watch.cc
index 9ca852a2621deba37693fec75007a1a3090ae3ce..51afac16cee0e6ab6cc0cf7ad1fd892e3a57e6fb 100644 (file)
--- a/src/osd/Watch.cc
+++ b/src/osd/Watch.cc
@@ -188,8 +188,12 @@ void Notify::maybe_complete_notify()
     reply->set_data(bl);
     if (timed_out)
       reply->return_code = -ETIMEDOUT;
-    osd->send_message_osd_client(reply, client.get());
+    client->send_message(reply);
     unregister_cb();
+
+    for (set<WatchRef>::iterator p = watchers.begin(); p != watchers.end(); ++p) {
+      (*p)->send_failed_notify(this);
+    }
     complete = true;
   }
 }
@@ -425,7 +429,16 @@ void Watch::send_notify(NotifyRef notif)
     cookie, notif->version, notif->notify_id,
     CEPH_WATCH_EVENT_NOTIFY, notif->payload);
   notify_msg->notifier_gid = notif->client_gid;
-  osd->send_message_osd_client(notify_msg, conn.get());
+  conn->send_message(notify_msg);
+}
+
+void Watch::send_failed_notify(Notify *notif)
+{
+  bufferlist empty;
+  MWatchNotify *reply(new MWatchNotify(cookie, notif->version, notif->notify_id,
+                                      CEPH_WATCH_EVENT_FAILED_NOTIFY, empty));
+  reply->notifier_gid = notif->client_gid;
+  conn->send_message(reply);
 }
 
 void Watch::notify_ack(uint64_t notify_id, bufferlist& reply_bl)

diff --git a/src/osd/Watch.h b/src/osd/Watch.h
index 7eb42e13c6de38804039748093815fd57ced62ad..2e199c5535ba06477ae42468aa6c20ce9b0bf8de 100644 (file)
--- a/src/osd/Watch.h
+++ b/src/osd/Watch.h
@@ -190,6 +190,9 @@ public:
   /// Unregisters the timeout callback
   void unregister_cb();
 
+  /// send a failed notify message
+  void send_failed_notify(Notify *notif);
+
   /// NOTE: must be called with pg lock held
   ~Watch();