From 1cfbd3e1c84d35e741cfc068a8e88f0eff4ea9e1 Mon Sep 17 00:00:00 2001
From: Andrzej Bialecki <ab@apache.org>
Date: Mon, 28 Jan 2019 17:28:19 +0100
Subject: [PATCH] SOLR-13072: Make sure the new overseer leader is present.

---
 .../solr/cloud/autoscaling/NodeMarkersRegistrationTest.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeMarkersRegistrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeMarkersRegistrationTest.java
index 24781da7bb2..342b0e75608 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeMarkersRegistrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/NodeMarkersRegistrationTest.java
@@ -121,6 +121,11 @@ public class NodeMarkersRegistrationTest extends SolrCloudTestCase {
     assertEquals(0, listener.addedNodes.size());
     // wait until the new overseer is up
     Thread.sleep(5000);
+    String newOverseerLeader;
+    do {
+      overSeerStatus = cluster.getSolrClient().request(CollectionAdminRequest.getOverseerStatus());
+      newOverseerLeader = (String) overSeerStatus.get("leader");
+    } while (newOverseerLeader == null || newOverseerLeader.equals(overseerLeader));
     
     assertEquals(1, listener.lostNodes.size());
     assertEquals(overseerLeader, listener.lostNodes.iterator().next());