Skip to content

Commit bd6ec6c

Browse files
committed
TEST: Fix indentation in FullClusterRestartIT (#34420)
1 parent 6bdcf8b commit bd6ec6c

File tree

1 file changed

+26
-25
lines changed

1 file changed

+26
-25
lines changed

qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -790,33 +790,34 @@ public void testRecovery() throws Exception {
790790
assertTrue("expected to find a primary but didn't\n" + recoveryResponse, foundPrimary);
791791
assertEquals("mismatch while checking for translog recovery\n" + recoveryResponse, shouldHaveTranslog, restoredFromTranslog);
792792

793-
String currentLuceneVersion = Version.CURRENT.luceneVersion.toString();
794-
String bwcLuceneVersion = getOldClusterVersion().luceneVersion.toString();
795-
if (shouldHaveTranslog && false == currentLuceneVersion.equals(bwcLuceneVersion)) {
796-
int numCurrentVersion = 0;
797-
int numBwcVersion = 0;
798-
Request segmentsRequest = new Request("GET", "/_cat/segments/" + index);
799-
segmentsRequest.addParameter("h", "prirep,shard,index,version");
800-
segmentsRequest.addParameter("s", "prirep,shard,index");
801-
String segmentsResponse = toStr(client().performRequest(segmentsRequest));
802-
for (String line : segmentsResponse.split("\n")) {
803-
if (false == line.startsWith("p")) {
804-
continue;
805-
}
806-
Matcher m = Pattern.compile("(\\d+\\.\\d+\\.\\d+)$").matcher(line);
807-
assertTrue(line, m.find());
808-
String version = m.group(1);
809-
if (currentLuceneVersion.equals(version)) {
810-
numCurrentVersion++;
811-
} else if (bwcLuceneVersion.equals(version)) {
812-
numBwcVersion++;
813-
} else {
814-
fail("expected version to be one of [" + currentLuceneVersion + "," + bwcLuceneVersion + "] but was " + line);
793+
String currentLuceneVersion = Version.CURRENT.luceneVersion.toString();
794+
String bwcLuceneVersion = getOldClusterVersion().luceneVersion.toString();
795+
if (shouldHaveTranslog && false == currentLuceneVersion.equals(bwcLuceneVersion)) {
796+
int numCurrentVersion = 0;
797+
int numBwcVersion = 0;
798+
Request segmentsRequest = new Request("GET", "/_cat/segments/" + index);
799+
segmentsRequest.addParameter("h", "prirep,shard,index,version");
800+
segmentsRequest.addParameter("s", "prirep,shard,index");
801+
String segmentsResponse = toStr(client().performRequest(segmentsRequest));
802+
for (String line : segmentsResponse.split("\n")) {
803+
if (false == line.startsWith("p")) {
804+
continue;
805+
}
806+
Matcher m = Pattern.compile("(\\d+\\.\\d+\\.\\d+)$").matcher(line);
807+
assertTrue(line, m.find());
808+
String version = m.group(1);
809+
if (currentLuceneVersion.equals(version)) {
810+
numCurrentVersion++;
811+
} else if (bwcLuceneVersion.equals(version)) {
812+
numBwcVersion++;
813+
} else {
814+
fail("expected version to be one of [" + currentLuceneVersion + "," + bwcLuceneVersion + "] but was " + line);
815+
}
815816
}
817+
assertNotEquals("expected at least 1 current segment after translog recovery. segments:\n" + segmentsResponse,
818+
0, numCurrentVersion);
819+
assertNotEquals("expected at least 1 old segment. segments:\n" + segmentsResponse, 0, numBwcVersion);
816820
}
817-
assertNotEquals("expected at least 1 current segment after translog recovery. segments:\n" + segmentsResponse,
818-
0, numCurrentVersion);
819-
assertNotEquals("expected at least 1 old segment. segments:\n" + segmentsResponse, 0, numBwcVersion);}
820821
}
821822
}
822823

0 commit comments

Comments
 (0)