Skip to content

Add deprecation warning for removed strict_duplicate_detection setting #63500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
williamrandolph merged 9 commits into from
Dec 18, 2020
Merged

Add deprecation warning for removed strict_duplicate_detection setting #63500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e88e5ae
Add deprecation warning for removed setting
williamrandolph Oct 8, 2020
bffeb3d
Spotless formatting
williamrandolph Oct 8, 2020
7f07729
Avoid forbidden API
williamrandolph Oct 8, 2020
7b85113
Reset between custom config tests
williamrandolph Oct 8, 2020
263dc7c
Spotless apply
williamrandolph Oct 8, 2020
4eb31d9
Access system properties consistently
williamrandolph Oct 13, 2020
e582ba3
Revert changes to ConfigurationTests setup
williamrandolph Oct 13, 2020
a5919e8
Merge branch '7.x' into duplicate-detection-deprecation
williamrandolph Oct 14, 2020
28ef7c9
Merge branch '7.x' into duplicate-detection-deprecation
elasticmachine Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions qa/os/src/test/java/org/elasticsearch/packaging/test/ConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,14 @@
import org.elasticsearch.packaging.util.Platforms;
import org.junit.Before;

import java.nio.file.Files;
import java.util.List;

import static java.nio.file.StandardOpenOption.APPEND;
import static java.nio.file.StandardOpenOption.CREATE;
import static org.elasticsearch.packaging.util.FileUtils.append;
import static org.elasticsearch.packaging.util.ServerUtils.makeRequest;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assume.assumeFalse;

Expand All @@ -40,6 +46,19 @@ public void test10Install() throws Exception {
install();
}

public void test50StrictDuplicateDetectionDeprecationWarning() throws Exception {
withCustomConfig(tempConf -> {
final List<String> jvmOptions = org.elasticsearch.common.collect.List.of("-Des.xcontent.strict_duplicate_detection=false");
Files.write(tempConf.resolve("jvm.options"), jvmOptions, CREATE, APPEND);
startElasticsearch();
stopElasticsearch();
});
assertThat(
FileUtils.slurp(installation.logs.resolve("elasticsearch_deprecation.log")),
containsString("The Java option es.xcontent.strict_duplicate_detection is set")
);
}

public void test60HostnameSubstitution() throws Exception {
String hostnameKey = Platforms.WINDOWS ? "COMPUTERNAME" : "HOSTNAME";
sh.getEnv().put(hostnameKey, "mytesthost");
Expand Down
8 changes: 8 additions & 0 deletions server/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,14 @@ static void init(
System.getProperty("java.home"));
DeprecationLogger.getLogger(Bootstrap.class).deprecate("java_version_11_required", message);
}
if (BootstrapInfo.getSystemProperties().get("es.xcontent.strict_duplicate_detection") != null) {
final String message = String.format(
Locale.ROOT,
"The Java option es.xcontent.strict_duplicate_detection is set to [%s]; " +
"this option is deprecated and non-functional and should be removed from Java configuration.",
BootstrapInfo.getSystemProperties().get("es.xcontent.strict_duplicate_detection"));
DeprecationLogger.getLogger(Bootstrap.class).deprecate("strict_duplicate_detection_setting_removed", message);
}
if (environment.pidFile() != null) {
try {
PidFile.create(environment.pidFile(), true);
Expand Down