kraken: mon: add override annotation to callback classes

The only purpose of this patch is to avoid merge conflicts while
cherry-picking commit 561cbded0c7e28231b1c7ce18663b8d7d40aad6d.
Alternatively one could cherry-pick 1effdfe19bf9fd6d546620b96eaf452e889b15dc,
but that one brings a lot of unrelated changes.

Signed-off-by: Alexey Sheplyakov <asheplyakov@mirantis.com>

diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc
index d8e66e24d453cb3d75d2506014b00b40b1c7971b..7bf552a86f5975368c78c5b6f3c498563c3fc8d8 100644 (file)
--- a/src/mon/Elector.cc
+++ b/src/mon/Elector.cc
@@ -147,7 +147,7 @@ void Elector::reset_timer(double plus)
     Elector *elector;
   public:
     explicit C_ElectionExpire(Elector *e) : elector(e) { }
-    void finish(int r) {
+    void finish(int r) override {
       elector->expire();
     }
   };

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 1dcdd622710b3b55eb2033da33d033d7dcd2b6e2..e3200522141c5209a602045654b40b1a5f64b956 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -5014,7 +5014,7 @@ void Monitor::scrub_event_start()
   struct C_Scrub : public Context {
     Monitor *mon;
     explicit C_Scrub(Monitor *m) : mon(m) { }
-    void finish(int r) {
+    void finish(int r) override {
       mon->scrub_start();
     }
   };
@@ -5048,7 +5048,7 @@ void Monitor::scrub_reset_timeout()
   struct C_ScrubTimeout : public Context {
     Monitor *mon;
     explicit C_ScrubTimeout(Monitor *m) : mon(m) { }
-    void finish(int r) {
+    void finish(int r) override {
       mon->scrub_timeout();
     }
   };
@@ -5063,7 +5063,7 @@ class C_Mon_Tick : public Context {
   Monitor *mon;
 public:
   explicit C_Mon_Tick(Monitor *m) : mon(m) {}
-  void finish(int r) {
+  void finish(int r) override {
     mon->tick();
   }
 };

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 81701dd1cde362c07a41327aeac91155014b77cc..f5cafb7fd2426214e2a2b3c4ee3df826e55bd73b 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -332,7 +332,7 @@ private:
   struct C_SyncTimeout : public Context {
     Monitor *mon;
     explicit C_SyncTimeout(Monitor *m) : mon(m) {}
-    void finish(int r) {
+    void finish(int r) override {
       mon->sync_timeout();
     }
   };
@@ -499,7 +499,7 @@ private:
   struct C_TimeCheck : public Context {
     Monitor *mon;
     explicit C_TimeCheck(Monitor *m) : mon(m) { }
-    void finish(int r) {
+    void finish(int r) override {
       mon->timecheck_start_round();
     }
   };
@@ -544,7 +544,7 @@ private:
   struct C_ProbeTimeout : public Context {
     Monitor *mon;
     explicit C_ProbeTimeout(Monitor *m) : mon(m) {}
-    void finish(int r) {
+    void finish(int r) override {
       mon->probe_timeout(r);
     }
   };
@@ -709,7 +709,7 @@ public:
   struct C_HealthToClogTick : public Context {
     Monitor *mon;
     explicit C_HealthToClogTick(Monitor *m) : mon(m) { }
-    void finish(int r) {
+    void finish(int r) override {
       if (r < 0)
         return;
       mon->do_health_to_clog();
@@ -720,7 +720,7 @@ public:
   struct C_HealthToClogInterval : public Context {
     Monitor *mon;
     explicit C_HealthToClogInterval(Monitor *m) : mon(m) { }
-    void finish(int r) {
+    void finish(int r) override {
       if (r < 0)
         return;
       mon->do_health_to_clog_interval();

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 978f7267958893fda100f334caf2ff18b1d3ad87..84e7327cf8b0dcbd614a0a7d718f2e8f363837d0 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -41,7 +41,7 @@ class Paxos::C_CollectTimeout : public Context {
   Paxos *paxos;
 public:
   explicit C_CollectTimeout(Paxos *p) : paxos(p) {}
-  void finish(int r) {
+  void finish(int r) override {
     if (r == -ECANCELED)
       return;
     paxos->collect_timeout();
@@ -52,7 +52,7 @@ class Paxos::C_AcceptTimeout : public Context {
   Paxos *paxos;
 public:
   explicit C_AcceptTimeout(Paxos *p) : paxos(p) {}
-  void finish(int r) {
+  void finish(int r) override {
     if (r == -ECANCELED)
       return;
     paxos->accept_timeout();
@@ -63,7 +63,7 @@ class Paxos::C_LeaseAckTimeout : public Context {
   Paxos *paxos;
 public:
   explicit C_LeaseAckTimeout(Paxos *p) : paxos(p) {}
-  void finish(int r) {
+  void finish(int r) override {
     if (r == -ECANCELED)
       return;
     paxos->lease_ack_timeout();
@@ -74,7 +74,7 @@ class Paxos::C_LeaseTimeout : public Context {
   Paxos *paxos;
 public:
   explicit C_LeaseTimeout(Paxos *p) : paxos(p) {}
-  void finish(int r) {
+  void finish(int r) override {
     if (r == -ECANCELED)
       return;
     paxos->lease_timeout();
@@ -85,7 +85,7 @@ class Paxos::C_LeaseRenew : public Context {
   Paxos *paxos;
 public:
   explicit C_LeaseRenew(Paxos *p) : paxos(p) {}
-  void finish(int r) {
+  void finish(int r) override {
     if (r == -ECANCELED)
       return;
     paxos->lease_renew_timeout();
@@ -96,7 +96,7 @@ class Paxos::C_Trimmed : public Context {
   Paxos *paxos;
 public:
   explicit C_Trimmed(Paxos *p) : paxos(p) { }
-  void finish(int r) {
+  void finish(int r) override {
     paxos->trimming = false;
   }
 };

diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index 09143e7c1250e2b880e3087238ea2306e84bc6d6..f666c8f98024da2bec5ded3b3229816d3fad3ffa 100644 (file)
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -104,7 +104,7 @@ bool PaxosService::dispatch(MonOpRequestRef op)
            PaxosService *ps;
          public:
            explicit C_Propose(PaxosService *p) : ps(p) { }
-           void finish(int r) {
+           void finish(int r) override {
              ps->proposal_timer = 0;
              if (r >= 0)
                ps->propose_pending();

diff --git a/src/mon/QuorumService.h b/src/mon/QuorumService.h
index 69d5390587841d8f01bf7d257592c92899eadbf7..f1100520a0d0753132511d4d2ce227d67339c60d 100644 (file)
--- a/src/mon/QuorumService.h
+++ b/src/mon/QuorumService.h
@@ -31,7 +31,7 @@ class QuorumService
   struct C_Tick : public Context {
     QuorumService *s;
     C_Tick(QuorumService *qs) : s(qs) { }
-    void finish(int r) {
+    void finish(int r) override {
       if (r < 0)
         return;
       s->tick();