]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: s/do_timeout/do_notify_timeout/ per the upcoming do_watch_timeout().
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Mon, 15 Mar 2021 11:54:22 +0000 (11:54 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Wed, 12 May 2021 13:26:50 +0000 (13:26 +0000)
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/osd/watch.cc
src/crimson/osd/watch.h

index 5639eca0609334bef219a1f5c5cba823dcbbeb57..bdceaf68682a80944806c36d2cd1bbba64f00b85 100644 (file)
@@ -209,7 +209,7 @@ seastar::future<> Notify::send_completion(
   return conn->send(std::move(reply));
 }
 
-void Notify::do_timeout()
+void Notify::do_notify_timeout()
 {
   logger().debug("{} complete={}", __func__, complete);
   if (complete) {
index 5ad1f05d898d6122abadeec288ac22830458d40b..cc58d93903156d4ef4c2bdc2aac578a16555b101 100644 (file)
@@ -116,7 +116,7 @@ class Notify : public seastar::enable_shared_from_this<Notify> {
   bool complete{false};
   bool discarded{false};
   seastar::timer<seastar::lowres_clock> timeout_timer{
-    [this] { do_timeout(); }
+    [this] { do_notify_timeout(); }
   };
 
   /// (gid,cookie) -> reply_bl for everyone who acked the notify
@@ -129,7 +129,7 @@ class Notify : public seastar::enable_shared_from_this<Notify> {
     std::set<WatchRef> timedout_watchers = {});
 
   /// Called on Notify timeout
-  void do_timeout();
+  void do_notify_timeout();
 
   Notify(crimson::net::ConnectionRef conn,
          const notify_info_t& ninfo,