Skip to content

Commit c3b6969

Browse files
authored
Remove systemPropertiesOverrideTest from 8.19 (#137611)
These tests relate to system properties set only in serverless Elasticsearch so there's no need for them in the `8.19` branch. Moreover, as with #137492, this extra Gradle task forces every developer to make an extra choice when running tests in `:server`. This commit removes the unnecessary tests, the corresponding Gradle task, and the now-untested code.
1 parent f7136f2 commit c3b6969

File tree

5 files changed

+11
-128
lines changed

5 files changed

+11
-128
lines changed

server/build.gradle

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -147,30 +147,6 @@ if (buildParams.snapshotBuild == false) {
147147

148148
tasks.named("test").configure {
149149
systemProperty 'es.insecure_network_trace_enabled', 'true'
150-
filter {
151-
excludeTestsMatching("*.TransportServiceHandshakeTests.testAcceptsMismatchedServerlessBuildHash")
152-
}
153-
excludes << '**/IndexSettingsOverrideTests.class'
154-
}
155-
156-
// There are tests rely on system properties to be configured differently. They must run in a separate test job
157-
// since the default does not work for them and configuring the system properties inside the test class/method
158-
// is too late because fields based on the system properties are often initialized statically.
159-
TaskProvider<Test> systemPropertiesOverrideTest = tasks.register("systemPropertiesOverrideTest", Test) {
160-
include '**/IndexSettingsOverrideTests.class'
161-
include '**/TransportServiceHandshakeTests.class'
162-
filter {
163-
includeTestsMatching("*.TransportServiceHandshakeTests.testAcceptsMismatchedServerlessBuildHash")
164-
includeTestsMatching("*.IndexSettingsOverrideTests.*")
165-
}
166-
systemProperty 'es.stateless.allow.index.refresh_interval.override', 'true'
167-
systemProperty 'es.serverless_transport', 'true'
168-
classpath = sourceSets.test.runtimeClasspath
169-
testClassesDirs = sourceSets.test.output.classesDirs
170-
}
171-
172-
tasks.named("check").configure {
173-
dependsOn(systemPropertiesOverrideTest)
174150
}
175151

176152
tasks.named("thirdPartyAudit").configure {

server/src/main/java/org/elasticsearch/index/IndexSettings.java

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -303,11 +303,6 @@ public final class IndexSettings {
303303

304304
static class RefreshIntervalValidator implements Setting.Validator<TimeValue> {
305305

306-
static final String STATELESS_ALLOW_INDEX_REFRESH_INTERVAL_OVERRIDE = "es.stateless.allow.index.refresh_interval.override";
307-
private static final boolean IS_OVERRIDE_ALLOWED = Boolean.parseBoolean(
308-
System.getProperty(STATELESS_ALLOW_INDEX_REFRESH_INTERVAL_OVERRIDE, "false")
309-
);
310-
311306
@Override
312307
public void validate(TimeValue value) {}
313308

@@ -323,18 +318,16 @@ public void validate(final TimeValue value, final Map<Setting<?>, Object> settin
323318
&& value.compareTo(STATELESS_MIN_NON_FAST_REFRESH_INTERVAL) < 0
324319
&& indexVersion.after(IndexVersions.V_8_10_0)) {
325320

326-
if (IS_OVERRIDE_ALLOWED == false) {
327-
throw new IllegalArgumentException(
328-
"index setting ["
329-
+ IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey()
330-
+ "="
331-
+ value
332-
+ "] should be either "
333-
+ TimeValue.MINUS_ONE
334-
+ " or equal to or greater than "
335-
+ STATELESS_MIN_NON_FAST_REFRESH_INTERVAL
336-
);
337-
}
321+
throw new IllegalArgumentException(
322+
"index setting ["
323+
+ IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey()
324+
+ "="
325+
+ value
326+
+ "] should be either "
327+
+ TimeValue.MINUS_ONE
328+
+ " or equal to or greater than "
329+
+ STATELESS_MIN_NON_FAST_REFRESH_INTERVAL
330+
);
338331
}
339332
}
340333

server/src/main/java/org/elasticsearch/transport/TransportService.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
3838
import org.elasticsearch.common.util.concurrent.ThreadContext;
3939
import org.elasticsearch.core.AbstractRefCounted;
40-
import org.elasticsearch.core.Booleans;
4140
import org.elasticsearch.core.IOUtils;
4241
import org.elasticsearch.core.Nullable;
4342
import org.elasticsearch.core.Predicates;
@@ -79,15 +78,6 @@ public class TransportService extends AbstractLifecycleComponent
7978

8079
private static final Logger logger = LogManager.getLogger(TransportService.class);
8180

82-
/**
83-
* A feature flag enabling transport upgrades for serverless.
84-
*/
85-
static final String SERVERLESS_TRANSPORT_SYSTEM_PROPERTY = "es.serverless_transport";
86-
private static final boolean SERVERLESS_TRANSPORT_FEATURE_FLAG = Booleans.parseBoolean(
87-
System.getProperty(SERVERLESS_TRANSPORT_SYSTEM_PROPERTY),
88-
false
89-
);
90-
9181
public static final String DIRECT_RESPONSE_PROFILE = ".direct";
9282
public static final String HANDSHAKE_ACTION_NAME = "internal:transport/handshake";
9383

@@ -672,7 +662,7 @@ public HandshakeResponse(StreamInput in) throws IOException {
672662
}
673663

674664
private void maybeThrowOnIncompatibleBuild(@Nullable DiscoveryNode node, @Nullable Exception e) {
675-
if (SERVERLESS_TRANSPORT_FEATURE_FLAG == false && isIncompatibleBuild(version, buildHash)) {
665+
if (isIncompatibleBuild(version, buildHash)) {
676666
throwOnIncompatibleBuild(node, e);
677667
}
678668
}

server/src/test/java/org/elasticsearch/index/IndexSettingsOverrideTests.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

server/src/test/java/org/elasticsearch/transport/TransportServiceHandshakeTests.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
package org.elasticsearch.transport;
1111

12-
import org.elasticsearch.Build;
1312
import org.elasticsearch.ExceptionsHelper;
1413
import org.elasticsearch.TransportVersion;
1514
import org.elasticsearch.Version;
@@ -371,34 +370,6 @@ public void testRejectsMismatchedBuildHash() {
371370
assertFalse(transportServiceA.nodeConnected(discoveryNode));
372371
}
373372

374-
public void testAcceptsMismatchedServerlessBuildHash() {
375-
assumeTrue("Current build needs to be a snapshot", Build.current().isSnapshot());
376-
final DisruptingTransportInterceptor transportInterceptorA = new DisruptingTransportInterceptor();
377-
final DisruptingTransportInterceptor transportInterceptorB = new DisruptingTransportInterceptor();
378-
transportInterceptorA.setModifyBuildHash(true);
379-
transportInterceptorB.setModifyBuildHash(true);
380-
final Settings settings = Settings.builder()
381-
.put("cluster.name", "a")
382-
.put(IGNORE_DESERIALIZATION_ERRORS_SETTING.getKey(), true) // suppress assertions to test production error-handling
383-
.build();
384-
final TransportService transportServiceA = startServices(
385-
"TS_A",
386-
settings,
387-
TransportVersion.current(),
388-
VersionInformation.CURRENT,
389-
transportInterceptorA
390-
);
391-
final TransportService transportServiceB = startServices(
392-
"TS_B",
393-
settings,
394-
TransportVersion.current(),
395-
VersionInformation.CURRENT,
396-
transportInterceptorB
397-
);
398-
AbstractSimpleTransportTestCase.connectToNode(transportServiceA, transportServiceB.getLocalNode(), TestProfiles.LIGHT_PROFILE);
399-
assertTrue(transportServiceA.nodeConnected(transportServiceB.getLocalNode()));
400-
}
401-
402373
public void testAcceptsMismatchedBuildHashFromDifferentVersion() {
403374
final DisruptingTransportInterceptor transportInterceptorA = new DisruptingTransportInterceptor();
404375
final DisruptingTransportInterceptor transportInterceptorB = new DisruptingTransportInterceptor();

0 commit comments

Comments
 (0)