Skip to content

Commit 137a5e9

Browse files
ebadyanoebadyano
committed
Fixing line length for EnvironmentTests and RecoveryTests (#36657)
Relates #34884
1 parent fd81633 commit 137a5e9

File tree

7 files changed

+113
-53
lines changed

7 files changed

+113
-53
lines changed

‎buildSrc/src/main/resources/checkstyle_suppressions.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,7 @@
9595
<suppress files="server[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]suggest[/\\]phrase[/\\]WordScorer.java" checks="LineLength" />
9696
<suppress files="modules[/\\]tribe[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]tribe[/\\]TribeService.java" checks="LineLength" />
9797
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]aliases[/\\]IndexAliasesIT.java" checks="LineLength" />
98-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]env[/\\]EnvironmentTests.java" checks="LineLength" />
99-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]env[/\\]NodeEnvironmentTests.java" checks="LineLength" />
10098
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]monitor[/\\]jvm[/\\]JvmGcMonitorServiceSettingsTests.java" checks="LineLength" />
101-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]recovery[/\\]FullRollingRestartIT.java" checks="LineLength" />
102-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]recovery[/\\]RecoveryWhileUnderLoadIT.java" checks="LineLength" />
103-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]recovery[/\\]RelocationIT.java" checks="LineLength" />
104-
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]recovery[/\\]TruncatedRecoveryIT.java" checks="LineLength" />
10599
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]indexing[/\\]IndexActionIT.java" checks="LineLength" />
106100
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]monitor[/\\]jvm[/\\]JvmGcMonitorServiceSettingsTests.java" checks="LineLength" />
107101
<suppress files="server[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]MultiValueModeTests.java" checks="LineLength" />

‎server/src/test/java/org/elasticsearch/env/EnvironmentTests.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public void testRepositoryResolution() throws IOException {
5555
Environment environment = newEnvironment();
5656
assertThat(environment.resolveRepoFile("/test/repos/repo1"), nullValue());
5757
assertThat(environment.resolveRepoFile("test/repos/repo1"), nullValue());
58-
environment = newEnvironment(Settings.builder().putList(Environment.PATH_REPO_SETTING.getKey(), "/test/repos", "/another/repos", "/test/repos/../other").build());
58+
environment = newEnvironment(Settings.builder()
59+
.putList(Environment.PATH_REPO_SETTING.getKey(), "/test/repos", "/another/repos", "/test/repos/../other").build());
5960
assertThat(environment.resolveRepoFile("/test/repos/repo1"), notNullValue());
6061
assertThat(environment.resolveRepoFile("test/repos/repo1"), notNullValue());
6162
assertThat(environment.resolveRepoFile("/another/repos/repo1"), notNullValue());

‎server/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,8 @@ public void run() {
352352
for (int i = 0; i < iters; i++) {
353353
int shard = randomIntBetween(0, counts.length - 1);
354354
try {
355-
try (ShardLock autoCloses = env.shardLock(new ShardId("foo", "fooUUID", shard), scaledRandomIntBetween(0, 10))) {
355+
try (ShardLock autoCloses = env.shardLock(new ShardId("foo", "fooUUID", shard),
356+
scaledRandomIntBetween(0, 10))) {
356357
counts[shard].value++;
357358
countsAtomic[shard].incrementAndGet();
358359
assertEquals(flipFlop[shard].incrementAndGet(), 1);
@@ -386,7 +387,9 @@ public void testCustomDataPaths() throws Exception {
386387

387388
final Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_INDEX_UUID, "myindexUUID").build();
388389
IndexSettings s1 = IndexSettingsModule.newIndexSettings("myindex", indexSettings);
389-
IndexSettings s2 = IndexSettingsModule.newIndexSettings("myindex", Settings.builder().put(indexSettings).put(IndexMetaData.SETTING_DATA_PATH, "/tmp/foo").build());
390+
IndexSettings s2 = IndexSettingsModule.newIndexSettings("myindex", Settings.builder()
391+
.put(indexSettings)
392+
.put(IndexMetaData.SETTING_DATA_PATH, "/tmp/foo").build());
390393
Index index = new Index("myindex", "myindexUUID");
391394
ShardId sid = new ShardId(index, 0);
392395

‎server/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,16 @@ public void testFullRollingRestart() throws Exception {
7676
internalCluster().startNode(settings);
7777

7878
// make sure the cluster state is green, and all has been recovered
79-
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout).setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("3"));
79+
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout)
80+
.setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("3"));
8081

8182
logger.info("--> add two more nodes");
8283
internalCluster().startNode(settings);
8384
internalCluster().startNode(settings);
8485

8586
// make sure the cluster state is green, and all has been recovered
86-
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout).setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("5"));
87+
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout)
88+
.setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("5"));
8789

8890
logger.info("--> refreshing and checking data");
8991
refresh();
@@ -94,11 +96,13 @@ public void testFullRollingRestart() throws Exception {
9496
// now start shutting nodes down
9597
internalCluster().stopRandomDataNode();
9698
// make sure the cluster state is green, and all has been recovered
97-
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout).setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("4"));
99+
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout)
100+
.setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("4"));
98101

99102
internalCluster().stopRandomDataNode();
100103
// make sure the cluster state is green, and all has been recovered
101-
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout).setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("3"));
104+
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout)
105+
.setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("3"));
102106

103107
logger.info("--> stopped two nodes, verifying data");
104108
refresh();
@@ -109,12 +113,14 @@ public void testFullRollingRestart() throws Exception {
109113
// closing the 3rd node
110114
internalCluster().stopRandomDataNode();
111115
// make sure the cluster state is green, and all has been recovered
112-
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout).setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("2"));
116+
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout)
117+
.setWaitForGreenStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("2"));
113118

114119
internalCluster().stopRandomDataNode();
115120

116121
// make sure the cluster state is yellow, and all has been recovered
117-
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout).setWaitForYellowStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("1"));
122+
assertTimeout(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setTimeout(healthTimeout)
123+
.setWaitForYellowStatus().setWaitForNoRelocatingShards(true).setWaitForNodes("1"));
118124

119125
logger.info("--> one node left, verifying data");
120126
refresh();
@@ -133,7 +139,9 @@ public void testNoRebalanceOnRollingRestart() throws Exception {
133139
* to relocating to the restarting node since all had 2 shards and now one node has nothing allocated.
134140
* We have a fix for this to wait until we have allocated unallocated shards now so this shouldn't happen.
135141
*/
136-
prepareCreate("test").setSettings(Settings.builder().put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, "6").put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, "0").put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMinutes(1))).get();
142+
prepareCreate("test").setSettings(Settings.builder().put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, "6")
143+
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, "0")
144+
.put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMinutes(1))).get();
137145

138146
for (int i = 0; i < 100; i++) {
139147
client().prepareIndex("test", "type1", Long.toString(i))
@@ -152,7 +160,8 @@ public void testNoRebalanceOnRollingRestart() throws Exception {
152160

153161
recoveryResponse = client().admin().indices().prepareRecoveries("test").get();
154162
for (RecoveryState recoveryState : recoveryResponse.shardRecoveryStates().get("test")) {
155-
assertTrue("relocated from: " + recoveryState.getSourceNode() + " to: " + recoveryState.getTargetNode()+ "-- \nbefore: \n" + state,
163+
assertTrue("relocated from: " + recoveryState.getSourceNode() + " to: " +
164+
recoveryState.getTargetNode()+ "-- \nbefore: \n" + state,
156165
recoveryState.getRecoverySource().getType() != RecoverySource.Type.PEER || recoveryState.getPrimary() == false);
157166
}
158167
}

0 commit comments

Comments
 (0)