Skip to content

Commit 100a18b

Browse files
authored
TEST: Fix indentation in FullClusterRestartIT (#34420)
1 parent 080ddd5 commit 100a18b

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
@@ -777,33 +777,34 @@ public void testRecovery() throws Exception {
777777
assertTrue("expected to find a primary but didn't\n" + recoveryResponse, foundPrimary);
778778
assertEquals("mismatch while checking for translog recovery\n" + recoveryResponse, shouldHaveTranslog, restoredFromTranslog);
779779

780-
String currentLuceneVersion = Version.CURRENT.luceneVersion.toString();
781-
String bwcLuceneVersion = getOldClusterVersion().luceneVersion.toString();
782-
if (shouldHaveTranslog && false == currentLuceneVersion.equals(bwcLuceneVersion)) {
783-
int numCurrentVersion = 0;
784-
int numBwcVersion = 0;
785-
Request segmentsRequest = new Request("GET", "/_cat/segments/" + index);
786-
segmentsRequest.addParameter("h", "prirep,shard,index,version");
787-
segmentsRequest.addParameter("s", "prirep,shard,index");
788-
String segmentsResponse = toStr(client().performRequest(segmentsRequest));
789-
for (String line : segmentsResponse.split("\n")) {
790-
if (false == line.startsWith("p")) {
791-
continue;
792-
}
793-
Matcher m = Pattern.compile("(\\d+\\.\\d+\\.\\d+)$").matcher(line);
794-
assertTrue(line, m.find());
795-
String version = m.group(1);
796-
if (currentLuceneVersion.equals(version)) {
797-
numCurrentVersion++;
798-
} else if (bwcLuceneVersion.equals(version)) {
799-
numBwcVersion++;
800-
} else {
801-
fail("expected version to be one of [" + currentLuceneVersion + "," + bwcLuceneVersion + "] but was " + line);
780+
String currentLuceneVersion = Version.CURRENT.luceneVersion.toString();
781+
String bwcLuceneVersion = getOldClusterVersion().luceneVersion.toString();
782+
if (shouldHaveTranslog && false == currentLuceneVersion.equals(bwcLuceneVersion)) {
783+
int numCurrentVersion = 0;
784+
int numBwcVersion = 0;
785+
Request segmentsRequest = new Request("GET", "/_cat/segments/" + index);
786+
segmentsRequest.addParameter("h", "prirep,shard,index,version");
787+
segmentsRequest.addParameter("s", "prirep,shard,index");
788+
String segmentsResponse = toStr(client().performRequest(segmentsRequest));
789+
for (String line : segmentsResponse.split("\n")) {
790+
if (false == line.startsWith("p")) {
791+
continue;
792+
}
793+
Matcher m = Pattern.compile("(\\d+\\.\\d+\\.\\d+)$").matcher(line);
794+
assertTrue(line, m.find());
795+
String version = m.group(1);
796+
if (currentLuceneVersion.equals(version)) {
797+
numCurrentVersion++;
798+
} else if (bwcLuceneVersion.equals(version)) {
799+
numBwcVersion++;
800+
} else {
801+
fail("expected version to be one of [" + currentLuceneVersion + "," + bwcLuceneVersion + "] but was " + line);
802+
}
802803
}
804+
assertNotEquals("expected at least 1 current segment after translog recovery. segments:\n" + segmentsResponse,
805+
0, numCurrentVersion);
806+
assertNotEquals("expected at least 1 old segment. segments:\n" + segmentsResponse, 0, numBwcVersion);
803807
}
804-
assertNotEquals("expected at least 1 current segment after translog recovery. segments:\n" + segmentsResponse,
805-
0, numCurrentVersion);
806-
assertNotEquals("expected at least 1 old segment. segments:\n" + segmentsResponse, 0, numBwcVersion);}
807808
}
808809
}
809810

0 commit comments

Comments
 (0)