Once again change wounding logic

rescrv · Apr 3, 2017 · 431deb6 · 431deb6
1 parent 5fb53c2
commit 431deb6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/txman/daemon.cc b/txman/daemon.cc
@@ -871,10 +871,10 @@ daemon :: process_wound(comm_id, std::auto_ptr<e::buffer> msg, e::unpacker up)
     transaction_group tg;
     up = up >> tg;
     CHECK_UNPACK(TXMAN_WOUND, up);
-    LOG_IF(INFO, s_debug_mode) << transaction_group::log(tg) << " wounding " << tg;
 
     if (get_config()->is_member(tg.group, m_us.id))
     {
+        LOG_IF(INFO, s_debug_mode) << transaction_group::log(tg) << " wounding local transaction";
         // wound the local voter
         local_voter_map_t::state_reference lvsr;
         local_voter* lv = m_local_voters.get_or_create_state(tg, &lvsr);
@@ -896,6 +896,7 @@ daemon :: process_wound(comm_id, std::auto_ptr<e::buffer> msg, e::unpacker up)
     }
     else
     {
+        LOG_IF(INFO, s_debug_mode) << transaction_group::log(tg) << " forwarding wound message to group";
         send(tg.group, msg);
     }
 }

diff --git a/txman/local_voter.cc b/txman/local_voter.cc
@@ -502,8 +502,9 @@ local_voter :: work_state_machine(daemon* d)
 
         // XXX this is not robust if the coordinator totally goes missing
         // XXX this may have leader thrashing; think about it
-        if (d->get_config()->get_state(m_group.members[idx]) == txman_state::ONLINE ||
-            (!m_has_preferred_vote && !m_wounded))
+        if (!m_wounded &&
+            (d->get_config()->get_state(m_group.members[idx]) == txman_state::ONLINE ||
+             !m_has_preferred_vote))
         {
             break;
         }