Skip to content

Commit 3c2d8f2

Browse files
joegallojoegallo
authored
Remove HLRC from repository-old-versions test (#101696)
1 parent 8e6e0e5 commit 3c2d8f2

File tree

3 files changed

+46
-195
lines changed

3 files changed

+46
-195
lines changed

‎client/rest-high-level/src/main/java/org/elasticsearch/client/core/AcknowledgedResponse.java

-73
This file was deleted.

‎client/rest-high-level/src/main/java/org/elasticsearch/client/core/ShardsAcknowledgedResponse.java

-50
This file was deleted.

‎x-pack/qa/repository-old-versions/src/test/java/org/elasticsearch/oldrepos/OldRepositoryAccessIT.java

+46-72
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@
1111
import org.elasticsearch.Version;
1212
import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryRequest;
1313
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
14-
import org.elasticsearch.action.search.SearchRequest;
1514
import org.elasticsearch.action.search.SearchResponse;
1615
import org.elasticsearch.client.Request;
1716
import org.elasticsearch.client.RequestOptions;
1817
import org.elasticsearch.client.Response;
1918
import org.elasticsearch.client.ResponseException;
2019
import org.elasticsearch.client.RestClient;
21-
import org.elasticsearch.client.RestHighLevelClient;
22-
import org.elasticsearch.client.core.ShardsAcknowledgedResponse;
2320
import org.elasticsearch.cluster.routing.Murmur3HashFunction;
2421
import org.elasticsearch.common.Strings;
2522
import org.elasticsearch.common.document.DocumentField;
2623
import org.elasticsearch.common.settings.SecureString;
2724
import org.elasticsearch.common.settings.Settings;
2825
import org.elasticsearch.common.util.concurrent.ThreadContext;
2926
import org.elasticsearch.core.Booleans;
27+
import org.elasticsearch.core.Nullable;
3028
import org.elasticsearch.core.PathUtils;
3129
import org.elasticsearch.index.IndexVersion;
3230
import org.elasticsearch.index.query.QueryBuilders;
@@ -43,7 +41,6 @@
4341

4442
import java.io.IOException;
4543
import java.util.Arrays;
46-
import java.util.Collections;
4744
import java.util.Comparator;
4845
import java.util.HashSet;
4946
import java.util.List;
@@ -75,12 +72,6 @@ protected Settings restClientSettings() {
7572
return Settings.builder().put(ThreadContext.PREFIX + ".Authorization", token).build();
7673
}
7774

78-
@SuppressWarnings("removal")
79-
protected static RestHighLevelClient highLevelClient(RestClient client) {
80-
return new RestHighLevelClient(client, ignore -> {}, Collections.emptyList()) {
81-
};
82-
}
83-
8475
public void testOldRepoAccess() throws IOException {
8576
runTest(false);
8677
}
@@ -113,10 +104,7 @@ public void runTest(boolean sourceOnlyRepository) throws IOException {
113104
int numDocs = 10;
114105
int extraDocs = 1;
115106
final Set<String> expectedIds = new HashSet<>();
116-
try (
117-
RestHighLevelClient client = highLevelClient(adminClient());
118-
RestClient oldEs = RestClient.builder(new HttpHost("127.0.0.1", oldEsPort)).build()
119-
) {
107+
try (RestClient oldEs = RestClient.builder(new HttpHost("127.0.0.1", oldEsPort)).build()) {
120108
if (afterRestart == false) {
121109
beforeRestart(
122110
sourceOnlyRepository,
@@ -126,7 +114,6 @@ public void runTest(boolean sourceOnlyRepository) throws IOException {
126114
numDocs,
127115
extraDocs,
128116
expectedIds,
129-
client,
130117
oldEs,
131118
indexName
132119
);
@@ -151,7 +138,6 @@ private void beforeRestart(
151138
int numDocs,
152139
int extraDocs,
153140
Set<String> expectedIds,
154-
RestHighLevelClient client,
155141
RestClient oldEs,
156142
String indexName
157143
) throws IOException {
@@ -262,35 +248,15 @@ private void beforeRestart(
262248
assertThat(getResp.evaluate("snapshots.0.stats.total.file_count"), greaterThan(0));
263249

264250
// restore / mount and check whether searches work
265-
restoreMountAndVerify(
266-
numDocs,
267-
expectedIds,
268-
client,
269-
numberOfShards,
270-
sourceOnlyRepository,
271-
oldVersion,
272-
indexName,
273-
repoName,
274-
snapshotName
275-
);
251+
restoreMountAndVerify(numDocs, expectedIds, numberOfShards, sourceOnlyRepository, oldVersion, indexName, repoName, snapshotName);
276252

277253
// close indices
278-
assertTrue(closeIndex(client(), "restored_" + indexName).isShardsAcknowledged());
279-
assertTrue(closeIndex(client(), "mounted_full_copy_" + indexName).isShardsAcknowledged());
280-
assertTrue(closeIndex(client(), "mounted_shared_cache_" + indexName).isShardsAcknowledged());
254+
closeIndex(client(), "restored_" + indexName);
255+
closeIndex(client(), "mounted_full_copy_" + indexName);
256+
closeIndex(client(), "mounted_shared_cache_" + indexName);
281257

282258
// restore / mount again
283-
restoreMountAndVerify(
284-
numDocs,
285-
expectedIds,
286-
client,
287-
numberOfShards,
288-
sourceOnlyRepository,
289-
oldVersion,
290-
indexName,
291-
repoName,
292-
snapshotName
293-
);
259+
restoreMountAndVerify(numDocs, expectedIds, numberOfShards, sourceOnlyRepository, oldVersion, indexName, repoName, snapshotName);
294260
}
295261

296262
private String getType(Version oldVersion, String id) {
@@ -305,7 +271,6 @@ private static String sourceForDoc(int i) {
305271
private void restoreMountAndVerify(
306272
int numDocs,
307273
Set<String> expectedIds,
308-
RestHighLevelClient client,
309274
int numberOfShards,
310275
boolean sourceOnlyRepository,
311276
Version oldVersion,
@@ -358,7 +323,7 @@ private void restoreMountAndVerify(
358323
}
359324

360325
// run a search against the index
361-
assertDocs("restored_" + indexName, numDocs, expectedIds, client, sourceOnlyRepository, oldVersion, numberOfShards);
326+
assertDocs("restored_" + indexName, numDocs, expectedIds, sourceOnlyRepository, oldVersion, numberOfShards);
362327

363328
// mount as full copy searchable snapshot
364329
Request mountRequest = new Request("POST", "/_snapshot/" + repoName + "/" + snapshotName + "/_mount");
@@ -378,7 +343,7 @@ private void restoreMountAndVerify(
378343
ensureGreen("mounted_full_copy_" + indexName);
379344

380345
// run a search against the index
381-
assertDocs("mounted_full_copy_" + indexName, numDocs, expectedIds, client, sourceOnlyRepository, oldVersion, numberOfShards);
346+
assertDocs("mounted_full_copy_" + indexName, numDocs, expectedIds, sourceOnlyRepository, oldVersion, numberOfShards);
382347

383348
// mount as shared cache searchable snapshot
384349
mountRequest = new Request("POST", "/_snapshot/" + repoName + "/" + snapshotName + "/_mount");
@@ -391,15 +356,14 @@ private void restoreMountAndVerify(
391356
assertEquals(numberOfShards, (int) mountResponse.evaluate("snapshot.shards.successful"));
392357

393358
// run a search against the index
394-
assertDocs("mounted_shared_cache_" + indexName, numDocs, expectedIds, client, sourceOnlyRepository, oldVersion, numberOfShards);
359+
assertDocs("mounted_shared_cache_" + indexName, numDocs, expectedIds, sourceOnlyRepository, oldVersion, numberOfShards);
395360
}
396361

397362
@SuppressWarnings("removal")
398363
private void assertDocs(
399364
String index,
400365
int numDocs,
401366
Set<String> expectedIds,
402-
RestHighLevelClient client,
403367
boolean sourceOnlyRepository,
404368
Version oldVersion,
405369
int numberOfShards
@@ -410,8 +374,10 @@ private void assertDocs(
410374
.build();
411375
RequestOptions randomRequestOptions = randomBoolean() ? RequestOptions.DEFAULT : v7RequestOptions;
412376

377+
SearchResponse searchResponse;
378+
413379
// run a search against the index
414-
SearchResponse searchResponse = client.search(new SearchRequest(index), randomRequestOptions);
380+
searchResponse = search(index, null, randomRequestOptions);
415381
logger.info(searchResponse);
416382
// check hit count
417383
assertEquals(numDocs, searchResponse.getHits().getTotalHits().value);
@@ -429,12 +395,11 @@ private void assertDocs(
429395
String id = randomFrom(expectedIds);
430396
int num = getIdAsNumeric(id);
431397
// run a search using runtime fields against the index
432-
searchResponse = client.search(
433-
new SearchRequest(index).source(
434-
SearchSourceBuilder.searchSource()
435-
.query(QueryBuilders.matchQuery("val", num))
436-
.runtimeMappings(Map.of("val", Map.of("type", "long")))
437-
),
398+
searchResponse = search(
399+
index,
400+
SearchSourceBuilder.searchSource()
401+
.query(QueryBuilders.matchQuery("val", num))
402+
.runtimeMappings(Map.of("val", Map.of("type", "long"))),
438403
randomRequestOptions
439404
);
440405
logger.info(searchResponse);
@@ -444,24 +409,24 @@ private void assertDocs(
444409

445410
if (sourceOnlyRepository == false) {
446411
// search using reverse sort on val
447-
searchResponse = client.search(
448-
new SearchRequest(index).source(
449-
SearchSourceBuilder.searchSource()
450-
.query(QueryBuilders.matchAllQuery())
451-
.sort(SortBuilders.fieldSort("val").order(SortOrder.DESC))
452-
),
412+
searchResponse = search(
413+
index,
414+
SearchSourceBuilder.searchSource()
415+
.query(QueryBuilders.matchAllQuery())
416+
.sort(SortBuilders.fieldSort("val").order(SortOrder.DESC)),
453417
randomRequestOptions
454418
);
455419
logger.info(searchResponse);
456420
// check sort order
457421
assertEquals(
458-
expectedIds.stream().sorted(Comparator.comparingInt(this::getIdAsNumeric).reversed()).collect(Collectors.toList()),
459-
Arrays.stream(searchResponse.getHits().getHits()).map(SearchHit::getId).collect(Collectors.toList())
422+
expectedIds.stream().sorted(Comparator.comparingInt(this::getIdAsNumeric).reversed()).toList(),
423+
Arrays.stream(searchResponse.getHits().getHits()).map(SearchHit::getId).toList()
460424
);
461425

462426
// look up postings
463-
searchResponse = client.search(
464-
new SearchRequest(index).source(SearchSourceBuilder.searchSource().query(QueryBuilders.matchQuery("test", "test" + num))),
427+
searchResponse = search(
428+
index,
429+
SearchSourceBuilder.searchSource().query(QueryBuilders.matchQuery("test", "test" + num)),
465430
randomRequestOptions
466431
);
467432
logger.info(searchResponse);
@@ -472,8 +437,9 @@ private void assertDocs(
472437
// search on _type and check that results contain _type information
473438
String randomType = getType(oldVersion, randomFrom(expectedIds));
474439
long typeCount = expectedIds.stream().filter(idd -> getType(oldVersion, idd).equals(randomType)).count();
475-
searchResponse = client.search(
476-
new SearchRequest(index).source(SearchSourceBuilder.searchSource().query(QueryBuilders.termQuery("_type", randomType))),
440+
searchResponse = search(
441+
index,
442+
SearchSourceBuilder.searchSource().query(QueryBuilders.termQuery("_type", randomType)),
477443
randomRequestOptions
478444
);
479445
logger.info(searchResponse);
@@ -493,10 +459,9 @@ private void assertDocs(
493459
);
494460

495461
// check that shards are skipped based on non-matching date
496-
searchResponse = client.search(
497-
new SearchRequest(index).source(
498-
SearchSourceBuilder.searchSource().query(QueryBuilders.rangeQuery("create_date").from("2020-02-01"))
499-
),
462+
searchResponse = search(
463+
index,
464+
SearchSourceBuilder.searchSource().query(QueryBuilders.rangeQuery("create_date").from("2020-02-01")),
500465
randomRequestOptions
501466
);
502467
logger.info(searchResponse);
@@ -507,13 +472,22 @@ private void assertDocs(
507472
}
508473
}
509474

475+
private static SearchResponse search(String index, @Nullable SearchSourceBuilder builder, RequestOptions options) throws IOException {
476+
Request request = new Request("POST", "/" + index + "/_search");
477+
if (builder != null) {
478+
request.setJsonEntity(builder.toString());
479+
}
480+
request.setOptions(options);
481+
return SearchResponse.fromXContent(responseAsParser(client().performRequest(request)));
482+
}
483+
510484
private int getIdAsNumeric(String id) {
511485
return Integer.parseInt(id.substring("testdoc".length()));
512486
}
513487

514-
static ShardsAcknowledgedResponse closeIndex(RestClient client, String index) throws IOException {
488+
private static void closeIndex(RestClient client, String index) throws IOException {
515489
Request request = new Request("POST", "/" + index + "/_close");
516-
Response response = client.performRequest(request);
517-
return ShardsAcknowledgedResponse.fromXContent(responseAsParser(response));
490+
ObjectPath doc = ObjectPath.createFromResponse(client.performRequest(request));
491+
assertTrue(doc.evaluate("shards_acknowledged"));
518492
}
519493
}

0 commit comments

Comments
 (0)