paxos: Do not start more evict threads once we enter cleanup.

infinit · Sep 11, 2017 · f5201f7 · f5201f7
1 parent c551917
commit f5201f7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/memo/model/doughnut/consensus/Paxos.cc b/src/memo/model/doughnut/consensus/Paxos.cc
@@ -835,6 +835,8 @@ namespace memo
         void
         Paxos::LocalPeer::_cleanup()
         {
+          ELLE_DEBUG_SCOPE("%s: cleanup", this);
+          this->_cleaning_up = true;
           this->_rebalance_inspector.reset();
           this->_rebalance_thread.terminate_now();
           this->_evict_threads.clear();
@@ -1037,7 +1039,7 @@ namespace memo
           it.first->second.async_wait(
             [this, id] (const boost::system::error_code& error)
             {
-              if (!error)
+              if (!error && !this->_cleaning_up)
                 this->_evict_threads.emplace_back(
                   new elle::reactor::Thread(
                     elle::sprintf("%s: evict %f", this, id),

diff --git a/src/memo/model/doughnut/consensus/Paxos.hh b/src/memo/model/doughnut/consensus/Paxos.hh
@@ -254,6 +254,7 @@ namespace memo
             ELLE_ATTRIBUTE_R(std::chrono::system_clock::duration, node_timeout);
             ELLE_ATTRIBUTE(std::vector<elle::reactor::Thread::unique_ptr>,
                            evict_threads);
+            ELLE_ATTRIBUTE_R(bool, cleaning_up);
           protected:
             void
             _cleanup() override;

diff --git a/src/memo/model/doughnut/consensus/Paxos.hxx b/src/memo/model/doughnut/consensus/Paxos.hxx
@@ -24,6 +24,7 @@ namespace memo
           , _rebalance_auto_expand(rebalance_auto_expand)
           , _rebalance_inspect(rebalance_inspect)
           , _node_timeout(node_timeout)
+          , _cleaning_up(false)
           , _max_addresses_size(elle::os::getenv("MEMO_PAXOS_CACHE_SIZE", 100))
           , _rebalancable()
           , _rebalanced()