github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix testDanglingIndicesCanBeListed (#108599)

Browse source 
The test started failing because of the recent changes to allow closing (and deleting shards) asynchronously. As a result dandling index API now is seeing a directory in partially deleted state, fails to interpret partial data and fails as a result.
The fix retries the failure on the client.
This commit is contained in:
Ievgen Degtiarenko 2024-05-14 11:40:27 +02:00 • committed by GitHub
parent 920290a37b
commit d3a285e1c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
qa/smoke-test-http/src/javaRestTest/java/org/elasticsearch/http/DanglingIndicesRestIT.java
View file

@ -72,7 +72,7 @@ public class DanglingIndicesRestIT extends HttpSmokeTestCase {
internalCluster().startNodes(3, buildSettings(0));
final DanglingIndexDetails danglingIndexDetails = createDanglingIndices(INDEX_NAME);
final String stoppedNodeId = mapNodeNameToId(danglingIndexDetails.stoppedNodeName);
final String stoppedNodeId = getNodeId(danglingIndexDetails.stoppedNodeName);
final RestClient restClient = getRestClient();
@ -163,7 +163,12 @@ public class DanglingIndicesRestIT extends HttpSmokeTestCase {
// tombstone has been pushed out of the graveyard.
createIndex("additional");
deleteIndex("additional");
assertThat(listDanglingIndexIds(), is(empty()));
// reading dangling index metadata happens without the all shard locks
// (as we do not know the index name from the index directory structure).
// As a result the index directory could be updated or deleted in the meanwhile by any concurrent operation
// and result in the node request failure that is going to be propagated to the API call.
// Since dandling index API is a best effort we expect such failures to be retried on the client level.
assertBusy(() -> assertThat(listDanglingIndexIds(), is(empty())));
}
private List<String> listDanglingIndexIds() throws IOException {
@ -171,15 +176,14 @@ public class DanglingIndicesRestIT extends HttpSmokeTestCase {
assertOK(response);
final XContentTestUtils.JsonMapView mapView = createJsonMapView(response.getEntity().getContent());
logger.warn("dangling API response: {}", mapView);
assertThat(mapView.get("_nodes.total"), equalTo(3));
assertThat(mapView.get("_nodes.successful"), equalTo(3));
assertThat(mapView.get("_nodes.failed"), equalTo(0));
List<Object> indices = mapView.get("dangling_indices");
List<String> danglingIndexIds = new ArrayList<>();
for (int i = 0; i < indices.size(); i++) {
danglingIndexIds.add(mapView.get("dangling_indices." + i + ".index_uuid"));
}
@ -187,23 +191,6 @@ public class DanglingIndicesRestIT extends HttpSmokeTestCase {
return danglingIndexIds;
}
/**
* Given a node name, finds the corresponding node ID.
*/
private String mapNodeNameToId(String nodeName) throws IOException {
final Response catResponse = getRestClient().performRequest(new Request("GET", "/_cat/nodes?full_id&h=id,name"));
assertOK(catResponse);
for (String nodeLine : Streams.readAllLines(catResponse.getEntity().getContent())) {
String[] elements = nodeLine.split(" ");
if (elements[1].equals(nodeName)) {
return elements[0];
}
}
throw new AssertionError("Failed to map node name [" + nodeName + "] to node ID");
}
/**
* Helper that creates one or more indices, and importantly,
* checks that they are green before proceeding. This is important

5
test/framework/src/main/java/org/elasticsearch/test/XContentTestUtils.java
View file

@ -354,5 +354,10 @@ public final class XContentTestUtils {
}
return (T) context;
}
@Override
public String toString() {
return "JsonMapView{map=" + map + '}';
}
}
}