From 6db3bcc18914fcb74f46535cf8f2965081412fbd Mon Sep 17 00:00:00 2001
From: Iraklis Psaroudakis <kingherc@gmail.com>
Date: Wed, 2 Nov 2022 18:40:04 +0200
Subject: [PATCH 1/2] Skip prevoting if single-node discovery

Fixes #89867
---
 .../org/elasticsearch/cluster/coordination/Coordinator.java   | 4 ++++
 .../cluster/coordination/AbstractCoordinatorTestCase.java     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
index 33e3528246d12..ed46503327751 100644
--- a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
+++ b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
@@ -1628,6 +1628,10 @@ public void run() {
                         }
 
                         if (prevotingRound != null) {
+                            if (singleNodeDiscovery) {
+                                logger.debug("skip prevoting as single-node discovery is enabled and prevoting is already in progress");
+                                return;
+                            }
                             prevotingRound.close();
                         }
                         prevotingRound = preVoteCollector.start(lastAcceptedState, getDiscoveredNodes());
diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java
index 7ad3578dfe046..dd3247147f67e 100644
--- a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java
+++ b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java
@@ -208,7 +208,7 @@ protected static int defaultInt(Setting<Integer> setting) {
         return setting.get(Settings.EMPTY);
     }
 
-    // Updating the cluster state involves up to 7 delays:
+    // Updating the cluster state involves up to the following number of delays:
     // 1. submit the task to the master service
     // 2. state publisher task on master
     // 3. master sends out PublishRequests to nodes

From c09b10c6bfe4e1b515fe6e2c7a137563a7ac6d69 Mon Sep 17 00:00:00 2001
From: Iraklis Psaroudakis <kingherc@gmail.com>
Date: Wed, 2 Nov 2022 18:43:01 +0200
Subject: [PATCH 2/2] Fix message

---
 .../org/elasticsearch/cluster/coordination/Coordinator.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
index ed46503327751..4844d079c46ef 100644
--- a/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
+++ b/server/src/main/java/org/elasticsearch/cluster/coordination/Coordinator.java
@@ -1629,7 +1629,7 @@ public void run() {
 
                         if (prevotingRound != null) {
                             if (singleNodeDiscovery) {
-                                logger.debug("skip prevoting as single-node discovery is enabled and prevoting is already in progress");
+                                logger.debug("skip prevoting as single-node discovery is enabled");
                                 return;
                             }
                             prevotingRound.close();