Skip to content

Commit

Permalink
Rework OldRepositoryAccessIT
Browse files Browse the repository at this point in the history
  • Loading branch information
@breskeby
breskeby committed Jan 10, 2025
1 parent ccdc80a commit 0566c57
Show file tree
Hide file tree
Showing 5 changed files with 210 additions and 481 deletions.
12 changes: 2 additions & 10 deletions ...nternal/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestBasePlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import org.gradle.api.tasks.util.PatternFilterable;

import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
Expand Down Expand Up @@ -215,19 +214,15 @@ public Void call(Object... args) {
}
});

var processedVersions = new HashSet<Version>();
// Add `usesBwcDistribution(version)` extension method to test tasks to indicate they require a BWC distribution
task.getExtensions().getExtraProperties().set("usesBwcDistribution", new Closure<Void>(task) {
@Override
public Void call(Object... args) {
if (args.length != 1 || args[0] instanceof Version == false) {
throw new IllegalArgumentException("Expected exactly one argument of type org.elasticsearch.gradle.Version");
}
if (processedVersions.contains(args[0])) {
return null;
}

Version version = (Version) args[0];
processedVersions.add(version);
boolean isReleased = bwcVersions.unreleasedInfo(version) == null;
String versionString = version.toString();
ElasticsearchDistribution bwcDistro = createDistribution(project, "bwc_" + versionString, versionString);
Expand Down Expand Up @@ -268,10 +263,7 @@ private ElasticsearchDistribution createDistribution(Project project, String nam
if (maybeDistro == null) {
return distributions.create(name, distro -> {
distro.setVersion(version);
// distro.setArchitecture(Architecture.current());
// distro.setArchitecture(Architecture.current());
distro.setArchitecture(Architecture.X64);
// distro.setPlatform(ElasticsearchDistribution.Platform.LINUX);
distro.setArchitecture(Architecture.current());
if (type != null) {
distro.setType(type);
}
Expand Down
16 changes: 12 additions & 4 deletions x-pack/qa/repository-old-versions/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,20 @@ if (OS.current() == OS.WINDOWS) {
// }
// }


tasks.named("javaRestTest").configure {
usesDefaultDistribution()
// dependsOn jdks.legacy
// usesBwcDistribution(Version.fromString("7.17.20"))
// usesBwcDistribution(Version.fromString("6.0.0"))
// environment 'JAVA_HOME', jdks.legacy.javaHomePath
maxParallelForks = 1
}

//
// tasks.register("javaRestTestAfterRestart", RestIntegTestTask).configure {
// dependsOn('javaRestTest')
// usesDefaultDistribution()
//// dependsOn jdks.legacy
//// usesBwcDistribution(Version.fromString("7.17.20"))
//// usesBwcDistribution(Version.fromString("6.0.0"))
//// environment 'JAVA_HOME', jdks.legacy.javaHomePath
// }
}

97 changes: 55 additions & 42 deletions ...pository-old-versions/src/javaRestTest/java/org/elasticsearch/oldrepos/OldMappingsIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

package org.elasticsearch.oldrepos;

import com.carrotsearch.randomizedtesting.annotations.TestCaseOrdering;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;

import org.apache.http.HttpHost;
Expand All @@ -23,7 +22,6 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.support.XContentMapValues;
import org.elasticsearch.test.AnnotationTestOrdering;
import org.elasticsearch.test.cluster.ElasticsearchCluster;
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
import org.elasticsearch.test.fixtures.elasticsearch.OldElasticsearchTestContainer;
Expand All @@ -34,11 +32,16 @@
import org.elasticsearch.xcontent.XContentType;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.rules.ExternalResource;
import org.junit.rules.RuleChain;
import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.MultipleFailureException;
import org.junit.runners.model.Statement;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand All @@ -49,13 +52,48 @@
import static org.hamcrest.Matchers.hasSize;

@ThreadLeakFilters(filters = { TestContainersThreadFilter.class })
@TestCaseOrdering(AnnotationTestOrdering.class)
public class OldMappingsIT extends ESRestTestCase {

static boolean restarted = false;

static final Version oldVersion = Version.fromString("6.8.20");
static boolean setupDone;
private static TemporaryFolder repoDirectory = new TemporaryFolder();

@ClassRule
public static ExternalResource resource = new ExternalResource() {
@Override
public Statement apply(Statement base, Description description) {
try {
return new Statement() {
@Override
public void evaluate() throws Throwable {
before();
List<Throwable> errors = new ArrayList<Throwable>();
try {
base.evaluate();
closeClients();
cluster.restart(false);
restarted = true;
base.evaluate();
} catch (Throwable t) {
errors.add(t);
} finally {
try {
after();
} catch (Throwable t) {
errors.add(t);
}
}
MultipleFailureException.assertEmpty(errors);
}
};
} catch (Throwable e) {
throw new RuntimeException(e);
}
}
};

public static OldElasticsearchTestContainer oldElasticsearch = new OldElasticsearchTestContainer().withRepoPath(
() -> repoDirectory.getRoot()
);
Expand All @@ -72,14 +110,15 @@ public class OldMappingsIT extends ESRestTestCase {
.setting("xpack.searchable.snapshot.shared_cache.region_size", "256KB")
.build();

@Override
protected String getTestRestCluster() {
return cluster.getHttpAddresses();
}


@ClassRule
public static TestRule ruleChain = RuleChain.outerRule(repoDirectory).around(cluster).around(oldElasticsearch);

@Override
protected String getTestRestCluster() {
return cluster.getHttpAddresses();
}
@Override
protected boolean preserveClusterUponCompletion() {
return true;
Expand Down Expand Up @@ -217,12 +256,18 @@ private Request createIndex(String indexName, String file) throws IOException {
return createIndex;
}

@AnnotationTestOrdering.Order(11)
public void testMappingOk() throws IOException {
doTestMappingOk();
Request mappingRequest = new Request("GET", "/" + "filebeat" + "/_mapping");
Map<String, Object> mapping = entityAsMap(client().performRequest(mappingRequest));
assertNotNull(XContentMapValues.extractValue(mapping, "filebeat", "mappings", "properties", "apache2"));

if (oldVersion.before(Version.fromString("6.0.0"))) {
mappingRequest = new Request("GET", "/" + "winlogbeat" + "/_mapping");
mapping = entityAsMap(client().performRequest(mappingRequest));
assertNotNull(XContentMapValues.extractValue(mapping, "winlogbeat", "mappings", "properties", "message"));
}
}

@AnnotationTestOrdering.Order(12)
public void testSearchKeyword() throws IOException {
Request search = new Request("POST", "/" + "custom" + "/_search");
XContentBuilder query = XContentBuilder.builder(XContentType.JSON.xContent())
Expand All @@ -241,7 +286,6 @@ public void testSearchKeyword() throws IOException {
assertThat(hits, hasSize(1));
}

@AnnotationTestOrdering.Order(13)
public void testSearchOnPlaceHolderField() throws IOException {
Request search = new Request("POST", "/" + "custom" + "/_search");
XContentBuilder query = XContentBuilder.builder(XContentType.JSON.xContent())
Expand All @@ -262,7 +306,6 @@ public void testSearchOnPlaceHolderField() throws IOException {
);
}

@AnnotationTestOrdering.Order(14)
public void testAggregationOnPlaceholderField() throws IOException {
Request search = new Request("POST", "/" + "custom" + "/_search");
XContentBuilder query = XContentBuilder.builder(XContentType.JSON.xContent())
Expand All @@ -280,7 +323,6 @@ public void testAggregationOnPlaceholderField() throws IOException {
assertThat(re.getMessage(), containsString("can't run aggregation or sorts on field type completion of legacy index"));
}

@AnnotationTestOrdering.Order(15)
public void testConstantScoringOnTextField() throws IOException {
Request search = new Request("POST", "/" + "custom" + "/_search");
XContentBuilder query = XContentBuilder.builder(XContentType.JSON.xContent())
Expand All @@ -303,7 +345,6 @@ public void testConstantScoringOnTextField() throws IOException {
assertEquals(1.0d, (double) hit.get("_score"), 0.01d);
}

@AnnotationTestOrdering.Order(16)
public void testFieldsExistQueryOnTextField() throws IOException {
Request search = new Request("POST", "/" + "custom" + "/_search");
XContentBuilder query = XContentBuilder.builder(XContentType.JSON.xContent())
Expand All @@ -320,7 +361,6 @@ public void testFieldsExistQueryOnTextField() throws IOException {
assertThat(hits, hasSize(2));
}

@AnnotationTestOrdering.Order(16)
public void testSearchFieldsOnPlaceholderField() throws IOException {
Request search = new Request("POST", "/" + "custom" + "/_search");
XContentBuilder query = XContentBuilder.builder(XContentType.JSON.xContent())
Expand All @@ -345,7 +385,6 @@ public void testSearchFieldsOnPlaceholderField() throws IOException {
assertEquals(List.of("some_value"), fields.get("completion"));
}

@AnnotationTestOrdering.Order(17)
public void testNestedDocuments() throws IOException {
Request search = new Request("POST", "/" + "nested" + "/_search");
Map<String, Object> response = entityAsMap(client().performRequest(search));
Expand Down Expand Up @@ -388,30 +427,4 @@ public void testNestedDocuments() throws IOException {
source = (Map<?, ?>) (XContentMapValues.extractValue("_source", (Map<?, ?>) hits.get(0)));
assertEquals("fans", source.get("group"));
}

@AnnotationTestOrdering.Order(20)
public void testRestartCluster() throws Exception {
closeClients();
cluster.upgradeNodeToVersion(0, org.elasticsearch.test.cluster.util.Version.CURRENT);
cluster.upgradeNodeToVersion(1, org.elasticsearch.test.cluster.util.Version.CURRENT);
initClient();
}

@AnnotationTestOrdering.Order(21)
public void testMappingOkAfterRestart() throws IOException {
doTestMappingOk();
}

private void doTestMappingOk() throws IOException {
Request mappingRequest = new Request("GET", "/" + "filebeat" + "/_mapping");
Map<String, Object> mapping = entityAsMap(client().performRequest(mappingRequest));
assertNotNull(XContentMapValues.extractValue(mapping, "filebeat", "mappings", "properties", "apache2"));

if (oldVersion.before(Version.fromString("6.0.0"))) {
mappingRequest = new Request("GET", "/" + "winlogbeat" + "/_mapping");
mapping = entityAsMap(client().performRequest(mappingRequest));
assertNotNull(XContentMapValues.extractValue(mapping, "winlogbeat", "mappings", "properties", "message"));
}
}

}
Loading

0 comments on commit 0566c57

Please sign in to comment.