Skip to content

Commit 072203c

Browse files
dnhatndnhatn
authored
Clean soft-deletes setting in ccr tests (#51113) (#51372)
We no longer need to explicitly enable soft-deletes in CCR tests. Relates #50775 Backport of #51113
1 parent 93f60f4 commit 072203c

File tree

20 files changed

+63
-204
lines changed

20 files changed

+63
-204
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ public void testIndexFollowing() throws Exception {
7676
CcrClient ccrClient = highLevelClient().ccr();
7777

7878
CreateIndexRequest createIndexRequest = new CreateIndexRequest("leader");
79-
createIndexRequest.settings(Collections.singletonMap("index.soft_deletes.enabled", true));
8079
CreateIndexResponse response = highLevelClient().indices().create(createIndexRequest, RequestOptions.DEFAULT);
8180
assertThat(response.isAcknowledged(), is(true));
8281

@@ -193,7 +192,6 @@ public void testForgetFollower() throws IOException {
193192
final int numberOfShards = randomIntBetween(1, 2);
194193
settings.put("index.number_of_replicas", "0");
195194
settings.put("index.number_of_shards", Integer.toString(numberOfShards));
196-
settings.put("index.soft_deletes.enabled", Boolean.TRUE.toString());
197195
createIndexRequest.settings(settings);
198196
final CreateIndexResponse response = highLevelClient().indices().create(createIndexRequest, RequestOptions.DEFAULT);
199197
assertThat(response.isAcknowledged(), is(true));
@@ -252,7 +250,6 @@ public void testAutoFollowing() throws Exception {
252250
assertThat(putAutoFollowPatternResponse.isAcknowledged(), is(true));
253251

254252
CreateIndexRequest createIndexRequest = new CreateIndexRequest("logs-20200101");
255-
createIndexRequest.settings(Collections.singletonMap("index.soft_deletes.enabled", true));
256253
CreateIndexResponse response = highLevelClient().indices().create(createIndexRequest, RequestOptions.DEFAULT);
257254
assertThat(response.isAcknowledged(), is(true));
258255

‎client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/CCRDocumentationIT.java

-7
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public void testPutFollow() throws Exception {
8080
{
8181
// Create leader index:
8282
CreateIndexRequest createIndexRequest = new CreateIndexRequest("leader");
83-
createIndexRequest.settings(Collections.singletonMap("index.soft_deletes.enabled", true));
8483
CreateIndexResponse response = client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
8584
assertThat(response.isAcknowledged(), is(true));
8685
}
@@ -161,7 +160,6 @@ public void testPauseFollow() throws Exception {
161160
{
162161
// Create leader index:
163162
CreateIndexRequest createIndexRequest = new CreateIndexRequest("leader");
164-
createIndexRequest.settings(Collections.singletonMap("index.soft_deletes.enabled", true));
165163
CreateIndexResponse response = client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
166164
assertThat(response.isAcknowledged(), is(true));
167165
}
@@ -227,7 +225,6 @@ public void testResumeFollow() throws Exception {
227225
{
228226
// Create leader index:
229227
CreateIndexRequest createIndexRequest = new CreateIndexRequest("leader");
230-
createIndexRequest.settings(Collections.singletonMap("index.soft_deletes.enabled", true));
231228
CreateIndexResponse response = client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
232229
assertThat(response.isAcknowledged(), is(true));
233230
}
@@ -303,7 +300,6 @@ public void testUnfollow() throws Exception {
303300
{
304301
// Create leader index:
305302
CreateIndexRequest createIndexRequest = new CreateIndexRequest("leader");
306-
createIndexRequest.settings(Collections.singletonMap("index.soft_deletes.enabled", true));
307303
CreateIndexResponse response = client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
308304
assertThat(response.isAcknowledged(), is(true));
309305
}
@@ -392,7 +388,6 @@ public void testForgetFollower() throws InterruptedException, IOException {
392388
final Map<String, String> settings = new HashMap<>(2);
393389
final int numberOfShards = randomIntBetween(1, 2);
394390
settings.put("index.number_of_shards", Integer.toString(numberOfShards));
395-
settings.put("index.soft_deletes.enabled", Boolean.TRUE.toString());
396391
createIndexRequest.settings(settings);
397392
final CreateIndexResponse response = client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
398393
assertThat(response.isAcknowledged(), is(true));
@@ -839,7 +834,6 @@ public void testGetFollowStats() throws Exception {
839834
{
840835
// Create leader index:
841836
CreateIndexRequest createIndexRequest = new CreateIndexRequest("leader");
842-
createIndexRequest.settings(Collections.singletonMap("index.soft_deletes.enabled", true));
843837
CreateIndexResponse response = client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
844838
assertThat(response.isAcknowledged(), is(true));
845839
}
@@ -907,7 +901,6 @@ public void testGetFollowInfos() throws Exception {
907901
{
908902
// Create leader index:
909903
CreateIndexRequest createIndexRequest = new CreateIndexRequest("leader");
910-
createIndexRequest.settings(Collections.singletonMap("index.soft_deletes.enabled", true));
911904
CreateIndexResponse response = client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
912905
assertThat(response.isAcknowledged(), is(true));
913906
}

‎x-pack/plugin/ccr/qa/downgrade-to-basic-license/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexIT.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
import org.elasticsearch.client.Request;
1010
import org.elasticsearch.client.ResponseException;
1111
import org.elasticsearch.client.RestClient;
12-
import org.elasticsearch.common.Strings;
1312
import org.elasticsearch.common.io.PathUtils;
1413
import org.elasticsearch.common.logging.JsonLogLine;
1514
import org.elasticsearch.common.logging.JsonLogsStream;
16-
import org.elasticsearch.common.settings.Settings;
1715
import org.hamcrest.FeatureMatcher;
1816
import org.hamcrest.Matcher;
1917
import org.hamcrest.Matchers;
@@ -114,12 +112,8 @@ protected Boolean featureValueOf(JsonLogLine actual) {
114112
}
115113

116114
private void createNewIndexAndIndexDocs(RestClient client, String index) throws IOException {
117-
Settings settings = Settings.builder()
118-
.put("index.soft_deletes.enabled", true)
119-
.build();
120115
Request request = new Request("PUT", "/" + index);
121-
request.setJsonEntity("{\"settings\": " + Strings.toString(settings) +
122-
", \"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}");
116+
request.setJsonEntity("{\"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}");
123117
assertOK(client.performRequest(request));
124118

125119
for (int i = 0; i < 5; i++) {

‎x-pack/plugin/ccr/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java

+3-17
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
import org.elasticsearch.client.Request;
1010
import org.elasticsearch.client.RestClient;
11-
import org.elasticsearch.common.Strings;
12-
import org.elasticsearch.common.settings.Settings;
1311

1412
import java.io.IOException;
1513
import java.util.Map;
@@ -33,25 +31,17 @@ public void testMultipleAutoFollowPatternsDifferentClusters() throws Exception {
3331
putPatternRequest.setJsonEntity("{\"leader_index_patterns\": [\"logs-*\"], \"remote_cluster\": \"middle_cluster\"}");
3432
assertOK(client().performRequest(putPatternRequest));
3533
try (RestClient leaderClient = buildLeaderClient()) {
36-
Settings settings = Settings.builder()
37-
.put("index.soft_deletes.enabled", true)
38-
.build();
3934
Request request = new Request("PUT", "/logs-20190101");
40-
request.setJsonEntity("{\"settings\": " + Strings.toString(settings) +
41-
", \"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}");
35+
request.setJsonEntity("{\"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}");
4236
assertOK(leaderClient.performRequest(request));
4337
for (int i = 0; i < 5; i++) {
4438
String id = Integer.toString(i);
4539
index(leaderClient, "logs-20190101", id, "field", i, "filtered_field", "true");
4640
}
4741
}
4842
try (RestClient middleClient = buildMiddleClient()) {
49-
Settings settings = Settings.builder()
50-
.put("index.soft_deletes.enabled", true)
51-
.build();
5243
Request request = new Request("PUT", "/logs-20200101");
53-
request.setJsonEntity("{\"settings\": " + Strings.toString(settings) +
54-
", \"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}");
44+
request.setJsonEntity("{\"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}");
5545
assertOK(middleClient.performRequest(request));
5646
for (int i = 0; i < 5; i++) {
5747
String id = Integer.toString(i);
@@ -80,12 +70,8 @@ public void testAutoFollowPatterns() throws Exception {
8070
assertOK(client().performRequest(request));
8171

8272
try (RestClient leaderClient = buildLeaderClient()) {
83-
Settings settings = Settings.builder()
84-
.put("index.soft_deletes.enabled", true)
85-
.build();
8673
request = new Request("PUT", "/metrics-20210101");
87-
request.setJsonEntity("{\"settings\": " + Strings.toString(settings) +
88-
", \"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}");
74+
request.setJsonEntity("{\"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}");
8975
assertOK(leaderClient.performRequest(request));
9076

9177
for (int i = 0; i < 5; i++) {

‎x-pack/plugin/ccr/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ccr/ChainIT.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ public void testFollowIndex() throws Exception {
2525
" \"excludes\": [\"filtered_field\"]" +
2626
"}";
2727
}
28-
Settings indexSettings = Settings.builder()
29-
.put("index.soft_deletes.enabled", true)
30-
.build();
31-
createIndex(leaderIndexName, indexSettings, mapping);
28+
createIndex(leaderIndexName, Settings.EMPTY, mapping);
3229
for (int i = 0; i < numDocs; i++) {
3330
logger.info("Indexing doc [{}]", i);
3431
index(client(), leaderIndexName, Integer.toString(i), "field", i, "filtered_field", "true");

‎x-pack/plugin/ccr/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexIT.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ public void testFollowIndex() throws Exception {
3030
" \"excludes\": [\"filtered_field\"]" +
3131
"}";
3232
}
33-
Settings indexSettings = Settings.builder()
34-
.put("index.soft_deletes.enabled", true)
35-
.build();
36-
createIndex(leaderIndexName, indexSettings, mapping);
33+
createIndex(leaderIndexName, Settings.EMPTY, mapping);
3734
for (int i = 0; i < numDocs; i++) {
3835
logger.info("Indexing doc [{}]", i);
3936
index(client(), leaderIndexName, Integer.toString(i), "field", i, "filtered_field", "true");

‎x-pack/plugin/ccr/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ccr/XPackUsageIT.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
import org.elasticsearch.client.Request;
99
import org.elasticsearch.client.RestClient;
10-
import org.elasticsearch.common.Strings;
11-
import org.elasticsearch.common.settings.Settings;
1210
import org.elasticsearch.common.xcontent.ObjectPath;
1311

1412
import java.io.IOException;
@@ -70,11 +68,8 @@ public void testXPackCcrUsage() throws Exception {
7068

7169
private void createLeaderIndex(String indexName) throws IOException {
7270
try (RestClient leaderClient = buildLeaderClient()) {
73-
Settings settings = Settings.builder()
74-
.put("index.soft_deletes.enabled", true)
75-
.build();
7671
Request request = new Request("PUT", "/" + indexName);
77-
request.setJsonEntity("{\"settings\": " + Strings.toString(settings) + "}");
72+
request.setJsonEntity("{}");
7873
assertOK(leaderClient.performRequest(request));
7974
}
8075
}

‎x-pack/plugin/ccr/qa/restart/src/test/java/org/elasticsearch/xpack/ccr/RestartIT.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.elasticsearch.client.RestClient;
1111
import org.elasticsearch.common.Strings;
1212
import org.elasticsearch.common.settings.Settings;
13-
import org.elasticsearch.index.IndexSettings;
1413

1514
import java.io.IOException;
1615

@@ -71,9 +70,8 @@ public void testRestart() throws Exception {
7170
}
7271

7372
private void createIndexAndIndexDocuments(final String index, final int numberOfDocuments, final RestClient client) throws IOException {
74-
final Settings settings = Settings.builder().put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build();
7573
final Request createIndexRequest = new Request("PUT", "/" + index);
76-
createIndexRequest.setJsonEntity("{\"settings\":" + Strings.toString(settings) + "}");
74+
createIndexRequest.setJsonEntity("{\"settings\":" + Strings.toString(Settings.EMPTY) + "}");
7775
assertOK(client.performRequest(createIndexRequest));
7876
indexDocuments(index, numberOfDocuments, 0, client);
7977
}

‎x-pack/plugin/ccr/qa/security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java

+4-14
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.elasticsearch.client.Response;
1010
import org.elasticsearch.client.ResponseException;
1111
import org.elasticsearch.client.RestClient;
12-
import org.elasticsearch.common.Strings;
1312
import org.elasticsearch.common.settings.SecureString;
1413
import org.elasticsearch.common.settings.Settings;
1514
import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -53,9 +52,8 @@ public void testFollowIndex() throws Exception {
5352
final String unallowedIndex = "unallowed-index";
5453
if ("leader".equals(targetCluster)) {
5554
logger.info("Running against leader cluster");
56-
Settings indexSettings = Settings.builder().put("index.soft_deletes.enabled", true).build();
57-
createIndex(allowedIndex, indexSettings);
58-
createIndex(unallowedIndex, indexSettings);
55+
createIndex(allowedIndex, Settings.EMPTY);
56+
createIndex(unallowedIndex, Settings.EMPTY);
5957
for (int i = 0; i < numDocs; i++) {
6058
logger.info("Indexing doc [{}]", i);
6159
index(allowedIndex, Integer.toString(i), "field", i);
@@ -150,11 +148,7 @@ public void testAutoFollowPatterns() throws Exception {
150148

151149
try (RestClient leaderClient = buildLeaderClient()) {
152150
for (String index : new String[]{allowedIndex, disallowedIndex}) {
153-
Settings settings = Settings.builder()
154-
.put("index.soft_deletes.enabled", true)
155-
.build();
156-
String requestBody = "{\"settings\": " + Strings.toString(settings) +
157-
", \"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}";
151+
String requestBody = "{\"mappings\": {\"properties\": {\"field\": {\"type\": \"keyword\"}}}}";
158152
request = new Request("PUT", "/" + index);
159153
request.setJsonEntity(requestBody);
160154
assertOK(leaderClient.performRequest(request));
@@ -187,11 +181,7 @@ public void testForgetFollower() throws IOException {
187181
final String forgetFollower = "forget-follower";
188182
if ("leader".equals(targetCluster)) {
189183
logger.info("running against leader cluster");
190-
final Settings indexSettings = Settings.builder()
191-
.put("index.number_of_replicas", 0)
192-
.put("index.number_of_shards", 1)
193-
.put("index.soft_deletes.enabled", true)
194-
.build();
184+
final Settings indexSettings = Settings.builder().put("index.number_of_replicas", 0).put("index.number_of_shards", 1).build();
195185
createIndex(forgetLeader, indexSettings);
196186
} else {
197187
logger.info("running against follower cluster");

‎x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/CcrIntegTestCase.java

+4
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,10 @@ public void setupSourceEnabledOrDisabled() {
423423

424424
protected boolean sourceEnabled;
425425

426+
protected String getIndexSettings(final int numberOfShards, final int numberOfReplicas) throws IOException {
427+
return getIndexSettings(numberOfShards, numberOfReplicas, Collections.emptyMap());
428+
}
429+
426430
protected String getIndexSettings(final int numberOfShards, final int numberOfReplicas,
427431
final Map<String, String> additionalIndexSettings) throws IOException {
428432
final String settings;

0 commit comments

Comments
 (0)