Skip to content

Commit 81e610e

Browse files
centic9martijnvg
authored andcommitted
Add description to force-merge tasks (#41365)
This is static information that is part of the force merge request. Relates to #15975
1 parent 6f65d9c commit 81e610e

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,6 +1045,8 @@ public void testForceMerge() throws IOException {
10451045
assertThat(forceMergeResponse.getSuccessfulShards(), equalTo(1));
10461046
assertThat(forceMergeResponse.getFailedShards(), equalTo(0));
10471047
assertThat(forceMergeResponse.getShardFailures(), equalTo(BroadcastResponse.EMPTY));
1048+
1049+
assertThat(forceMergeRequest.getDescription(), containsString(index));
10481050
}
10491051
{
10501052
String nonExistentIndex = "non_existent_index";
@@ -1053,6 +1055,8 @@ public void testForceMerge() throws IOException {
10531055
ElasticsearchException exception = expectThrows(ElasticsearchException.class,
10541056
() -> execute(forceMergeRequest, highLevelClient().indices()::forcemerge, highLevelClient().indices()::forcemergeAsync));
10551057
assertEquals(RestStatus.NOT_FOUND, exception.status());
1058+
1059+
assertThat(forceMergeRequest.getDescription(), containsString(nonExistentIndex));
10561060
}
10571061
}
10581062

server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.elasticsearch.common.io.stream.StreamOutput;
2626

2727
import java.io.IOException;
28+
import java.util.Arrays;
2829

2930
import static org.elasticsearch.action.ValidateActions.addValidationError;
3031

@@ -117,6 +118,14 @@ public ForceMergeRequest flush(boolean flush) {
117118
return this;
118119
}
119120

121+
@Override
122+
public String getDescription() {
123+
return "Force-merge indices " + Arrays.toString(indices()) +
124+
", maxSegments[" + maxNumSegments +
125+
"], onlyExpungeDeletes[" + onlyExpungeDeletes +
126+
"], flush[" + flush + "]";
127+
}
128+
120129
@Override
121130
public void writeTo(StreamOutput out) throws IOException {
122131
super.writeTo(out);

server/src/test/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeRequestTests.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,18 @@ public void testValidate() {
5151
assertThat(validation, nullValue());
5252
}
5353
}
54+
55+
public void testDescription() {
56+
ForceMergeRequest request = new ForceMergeRequest();
57+
assertEquals("Force-merge indices [], maxSegments[-1], onlyExpungeDeletes[false], flush[true]", request.getDescription());
58+
59+
request = new ForceMergeRequest("shop", "blog");
60+
assertEquals("Force-merge indices [shop, blog], maxSegments[-1], onlyExpungeDeletes[false], flush[true]", request.getDescription());
61+
62+
request = new ForceMergeRequest();
63+
request.maxNumSegments(12);
64+
request.onlyExpungeDeletes(true);
65+
request.flush(false);
66+
assertEquals("Force-merge indices [], maxSegments[12], onlyExpungeDeletes[true], flush[false]", request.getDescription());
67+
}
5468
}

0 commit comments

Comments
 (0)