Merge pull request #4216 from dotnwat/backport-4188

[21.11.x]: backport #4157
redpanda-data · Apr 6, 2022 · 1cda696 · 1cda696
2 parents 311f8e2 + 018f358
commit 1cda696
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/src/v/raft/prevote_stm.cc b/src/v/raft/prevote_stm.cc
@@ -163,13 +163,8 @@ ss::future<bool> prevote_stm::do_prevote() {
     // dispatch requests to all voters
     _config->for_each_voter([this](vnode id) { (void)dispatch_prevote(id); });
 
-    // wait until majority
-    const size_t majority = (_config->unique_voter_count() / 2) + 1;
-
-    return _sem.wait(majority)
-      .then([this] { return process_replies(); })
-      // process results
-      .then([this]() { return _success; });
+    // process results
+    return process_replies().then([this]() { return _success; });
 }
 
 ss::future<> prevote_stm::process_replies() {

diff --git a/src/v/raft/vote_stm.cc b/src/v/raft/vote_stm.cc
@@ -144,18 +144,11 @@ ss::future<> vote_stm::do_vote() {
     // dispatch requests to all voters
     _config->for_each_voter([this](vnode id) { (void)dispatch_one(id); });
 
-    // wait until majority
-    const size_t majority = (_config->unique_voter_count() / 2) + 1;
-
-    return _sem.wait(majority)
-      .then([this] { return process_replies(); })
-      // porcess results
-      .then([this]() {
-          return _ptr->_op_lock.get_units().then(
-            [this](ss::semaphore_units<> u) {
-                return update_vote_state(std::move(u));
-            });
-      });
+    return process_replies().then([this]() {
+        return _ptr->_op_lock.get_units().then([this](ss::semaphore_units<> u) {
+            return update_vote_state(std::move(u));
+        });
+    });
 }
 
 ss::future<> vote_stm::process_replies() {