Skip to content

Commit 2f81efd

Browse files
authored
Re-enable geoip FullClusterRestartIT (elastic#120966)
1 parent 75a0a70 commit 2f81efd

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

modules/ingest-geoip/qa/full-cluster-restart/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ dependencies {
2020
javaRestTestImplementation(testArtifact(project(":qa:full-cluster-restart"), "javaRestTest"))
2121
}
2222

23-
24-
// once we are ready to test migrations from 8.x to 9.x, we can set the compatible version to 8.0.0
25-
// see https://github.com/elastic/elasticsearch/pull/93666
2623
buildParams.bwcVersions.withWireCompatible(v -> v.before("9.0.0")) { bwcVersion, baseName ->
2724
tasks.register(bwcTaskName(bwcVersion), StandaloneRestIntegTestTask) {
2825
usesBwcDistribution(bwcVersion)

modules/ingest-geoip/qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/ingest/geoip/FullClusterRestartIT.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
import com.carrotsearch.randomizedtesting.annotations.Name;
1414

1515
import org.apache.http.util.EntityUtils;
16-
import org.apache.lucene.tests.util.LuceneTestCase;
1716
import org.elasticsearch.client.Request;
18-
import org.elasticsearch.core.UpdateForV9;
1917
import org.elasticsearch.test.cluster.ElasticsearchCluster;
2018
import org.elasticsearch.test.cluster.FeatureFlag;
2119
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
@@ -34,8 +32,6 @@
3432

3533
import static org.hamcrest.Matchers.contains;
3634

37-
@UpdateForV9(owner = UpdateForV9.Owner.DATA_MANAGEMENT)
38-
@LuceneTestCase.AwaitsFix(bugUrl = "we need to figure out the index migrations here for 9.0")
3935
public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCase {
4036

4137
private static final boolean useFixture = Boolean.getBoolean("geoip_use_service") == false;
@@ -46,9 +42,8 @@ public class FullClusterRestartIT extends ParameterizedFullClusterRestartTestCas
4642
.distribution(DistributionType.DEFAULT)
4743
.version(getOldClusterTestVersion())
4844
.nodes(2)
49-
.setting("indices.memory.shard_inactive_time", "60m")
50-
.setting("xpack.security.enabled", "false")
5145
.setting("ingest.geoip.downloader.endpoint", () -> fixture.getAddress(), s -> useFixture)
46+
.setting("xpack.security.enabled", "false")
5247
.feature(FeatureFlag.TIME_SERIES_MODE)
5348
.build();
5449

@@ -97,7 +92,7 @@ public void testGeoIpSystemFeaturesMigration() throws Exception {
9792
Request migrateSystemFeatures = new Request("POST", "/_migration/system_features");
9893
assertOK(client().performRequest(migrateSystemFeatures));
9994

100-
assertBusy(() -> testCatIndices(".geoip_databases-reindexed-for-8", "my-index-00001"));
95+
assertBusy(() -> testCatIndices(".geoip_databases-reindexed-for-10", "my-index-00001"));
10196
assertBusy(() -> testIndexGeoDoc());
10297

10398
Request disableDownloader = new Request("PUT", "/_cluster/settings");

0 commit comments

Comments
 (0)