Skip to content

Commit 6ccaa83

Browse files
authored
Fixing line lengths in murmur3 and hdfs plugins (#34603)
1 parent f11a23b commit 6ccaa83

File tree

2 files changed

+38
-8
lines changed

2 files changed

+38
-8
lines changed

plugins/repository-hdfs/src/main/java/org/elasticsearch/repositories/hdfs/HdfsRepository.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ public HdfsRepository(RepositoryMetaData metadata, Environment environment,
8282
uri = URI.create(uriSetting);
8383
if ("hdfs".equalsIgnoreCase(uri.getScheme()) == false) {
8484
throw new IllegalArgumentException(String.format(Locale.ROOT,
85-
"Invalid scheme [%s] specified in uri [%s]; only 'hdfs' uri allowed for hdfs snapshot/restore", uri.getScheme(), uriSetting));
85+
"Invalid scheme [%s] specified in uri [%s]; only 'hdfs' uri allowed for hdfs snapshot/restore",
86+
uri.getScheme(),
87+
uriSetting));
8688
}
8789
if (Strings.hasLength(uri.getPath()) && uri.getPath().equals("/") == false) {
8890
throw new IllegalArgumentException(String.format(Locale.ROOT,
@@ -134,7 +136,10 @@ private HdfsBlobStore createBlobstore(URI uri, String path, Settings repositoryS
134136
}
135137
});
136138

137-
logger.debug("Using file-system [{}] for URI [{}], path [{}]", fileContext.getDefaultFileSystem(), fileContext.getDefaultFileSystem().getUri(), path);
139+
logger.debug("Using file-system [{}] for URI [{}], path [{}]",
140+
fileContext.getDefaultFileSystem(),
141+
fileContext.getDefaultFileSystem().getUri(),
142+
path);
138143

139144
try {
140145
return new HdfsBlobStore(fileContext, path, bufferSize, isReadOnly(), haEnabled);

plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,25 @@ public void testSimpleWorkflow() {
7676
assertThat(count(client, "test-idx-3"), equalTo(100L));
7777

7878
logger.info("--> snapshot");
79-
CreateSnapshotResponse createSnapshotResponse = client.admin().cluster().prepareCreateSnapshot("test-repo", "test-snap").setWaitForCompletion(true).setIndices("test-idx-*", "-test-idx-3").get();
79+
CreateSnapshotResponse createSnapshotResponse = client.admin()
80+
.cluster()
81+
.prepareCreateSnapshot("test-repo", "test-snap")
82+
.setWaitForCompletion(true)
83+
.setIndices("test-idx-*", "-test-idx-3")
84+
.get();
8085
assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), greaterThan(0));
81-
assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), equalTo(createSnapshotResponse.getSnapshotInfo().totalShards()));
82-
83-
assertThat(client.admin().cluster().prepareGetSnapshots("test-repo").setSnapshots("test-snap").get().getSnapshots().get(0).state(), equalTo(SnapshotState.SUCCESS));
86+
assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(),
87+
equalTo(createSnapshotResponse.getSnapshotInfo().totalShards()));
88+
89+
assertThat(client.admin()
90+
.cluster()
91+
.prepareGetSnapshots("test-repo")
92+
.setSnapshots("test-snap")
93+
.get()
94+
.getSnapshots()
95+
.get(0)
96+
.state(),
97+
equalTo(SnapshotState.SUCCESS));
8498

8599
logger.info("--> delete some data");
86100
for (int i = 0; i < 50; i++) {
@@ -101,7 +115,12 @@ public void testSimpleWorkflow() {
101115
client.admin().indices().prepareClose("test-idx-1", "test-idx-2").get();
102116

103117
logger.info("--> restore all indices from the snapshot");
104-
RestoreSnapshotResponse restoreSnapshotResponse = client.admin().cluster().prepareRestoreSnapshot("test-repo", "test-snap").setWaitForCompletion(true).execute().actionGet();
118+
RestoreSnapshotResponse restoreSnapshotResponse = client.admin()
119+
.cluster()
120+
.prepareRestoreSnapshot("test-repo", "test-snap")
121+
.setWaitForCompletion(true)
122+
.execute()
123+
.actionGet();
105124
assertThat(restoreSnapshotResponse.getRestoreInfo().totalShards(), greaterThan(0));
106125

107126
ensureGreen();
@@ -113,7 +132,13 @@ public void testSimpleWorkflow() {
113132
logger.info("--> delete indices");
114133
client().admin().indices().prepareDelete("test-idx-1", "test-idx-2").get();
115134
logger.info("--> restore one index after deletion");
116-
restoreSnapshotResponse = client.admin().cluster().prepareRestoreSnapshot("test-repo", "test-snap").setWaitForCompletion(true).setIndices("test-idx-*", "-test-idx-2").execute().actionGet();
135+
restoreSnapshotResponse = client.admin()
136+
.cluster()
137+
.prepareRestoreSnapshot("test-repo", "test-snap")
138+
.setWaitForCompletion(true)
139+
.setIndices("test-idx-*", "-test-idx-2")
140+
.execute()
141+
.actionGet();
117142
assertThat(restoreSnapshotResponse.getRestoreInfo().totalShards(), greaterThan(0));
118143
ensureGreen();
119144
assertThat(count(client, "test-idx-1"), equalTo(100L));

0 commit comments

Comments
 (0)