Skip to content

Revert "Adding BWC test for remote publication enabled cluster" #20942

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
andrross merged 1 commit into from
Mar 20, 2026
+33 −347
Merged

Revert "Adding BWC test for remote publication enabled cluster" #20942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions TESTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,6 @@ Backwards compatibility tests exist to test upgrading from each supported versio

The test can be run for any versions which the current version will be compatible with. Tests are run for released versions download the distributions from the artifact repository, see [DistributionDownloadPlugin](./buildSrc/src/main/java/org/opensearch/gradle/DistributionDownloadPlugin.java) for the repository location. Tests are run for versions that are not yet released automatically check out the branch and build from source to get the distributions, see [BwcVersions](./buildSrc/src/main/java/org/opensearch/gradle/BwcVersions.java) and [distribution/bwc/build.gradle](./distribution/bwc/build.gradle) for more information.

**Note:** Rolling upgrade tests run in two modes: with remote publication disabled (default) and with remote publication enabled (using a `-remote` suffix cluster). The remote publication tests verify cluster state persistence to remote storage during upgrades. See [Remote Cluster State documentation](https://docs.opensearch.org/latest/tuning-your-cluster/availability-and-recovery/remote-store/remote-cluster-state/) for more information.

The minimum JDK versions for runtime and compiling need to be installed, and environment variables `JAVAx_HOME`, such as `JAVA8_HOME`, pointing to the JDK installations are required to run the tests against unreleased versions, since the distributions are created by building from source. The required JDK versions for each branch are located at [.ci/java-versions.properties](.ci/java-versions.properties), see [BwcSetupExtension](./buildSrc/src/main/java/org/opensearch/gradle/internal/BwcSetupExtension.java) for more information.

To run all the backwards compatibility tests use:
Expand Down
110 changes: 33 additions & 77 deletions qa/rolling-upgrade/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,6 @@ apply plugin: 'opensearch.standalone-test'
apply from : "$rootDir/gradle/bwc-test.gradle"
apply plugin: 'opensearch.rest-resources'

def configureTestTask(task, clusterName, bwcVersionStr, suite, excludeRemoteTest, extraConfig = {}) {
task.configure {
useCluster project, testClusters."${clusterName}"
systemProperty 'tests.upgrade_from_version', bwcVersionStr
systemProperty 'tests.rest.suite', suite
nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${clusterName}".allHttpSocketURI.join(",")}")
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${clusterName}".getName()}")

if (excludeRemoteTest) {
exclude '**/RemotePublicationClusterStateIT.class'
}

extraConfig.delegate = delegate
extraConfig()
}
}

for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
/*
* The goal here is to:
Expand All @@ -64,7 +47,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
* <li>run tests with systemProperty 'tests.rest.suite', 'mixed_cluster'
* <li>upgrade one more node
* <li>run tests with systemProperty 'tests.rest.suite', 'mixed_cluster' again
* <li>upgrade the last node
* <li>updgrade the last node
* <li>run tests with systemProperty 'tests.rest.suite', 'upgraded_cluster'
* </ul>
*/
Expand All @@ -75,6 +58,7 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
"${baseName}" {
versions = [bwcVersionStr, project.version]
numberOfNodes = 3

setting 'repositories.url.allowed_urls', 'http://snapshot.test*'
setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
setting 'http.content_type.required', 'true'
Expand All @@ -83,85 +67,57 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {

tasks.register("${baseName}#oldClusterTest", StandaloneRestIntegTestTask) {
dependsOn processTestResources
useCluster project, testClusters."${baseName}"
mustRunAfter(precommit)
configureTestTask(it, baseName, bwcVersionStr, 'old_cluster', true) {
doFirst { delete("${buildDir}/cluster/shared/repo/${baseName}") }
doFirst {
delete("${buildDir}/cluster/shared/repo/${baseName}")
}
systemProperty 'tests.upgrade_from_version', bwcVersionStr
systemProperty 'tests.rest.suite', 'old_cluster'
nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}")
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
}

tasks.register("${baseName}#oneThirdUpgradedTest", StandaloneRestIntegTestTask) {
dependsOn "${baseName}#oldClusterTest"
configureTestTask(it, baseName, bwcVersionStr, 'mixed_cluster', true) {
systemProperty 'tests.first_round', 'true'
doFirst { testClusters."${baseName}".nextNodeToNextVersion() }
useCluster project, testClusters."${baseName}"
doFirst {
testClusters."${baseName}".nextNodeToNextVersion()
}
systemProperty 'tests.rest.suite', 'mixed_cluster'
systemProperty 'tests.upgrade_from_version', bwcVersionStr
systemProperty 'tests.first_round', 'true'
nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}")
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
}

tasks.register("${baseName}#twoThirdsUpgradedTest", StandaloneRestIntegTestTask) {
dependsOn "${baseName}#oneThirdUpgradedTest"
configureTestTask(it, baseName, bwcVersionStr, 'mixed_cluster', true) {
systemProperty 'tests.first_round', 'false'
doFirst { testClusters."${baseName}".nextNodeToNextVersion() }
useCluster project, testClusters."${baseName}"
doFirst {
testClusters."${baseName}".nextNodeToNextVersion()
}
systemProperty 'tests.rest.suite', 'mixed_cluster'
systemProperty 'tests.upgrade_from_version', bwcVersionStr
systemProperty 'tests.first_round', 'false'
nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}")
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
}

tasks.register("${baseName}#upgradedClusterTest", StandaloneRestIntegTestTask) {
dependsOn "${baseName}#twoThirdsUpgradedTest"
configureTestTask(it, baseName, bwcVersionStr, 'upgraded_cluster', true) {
doFirst { testClusters."${baseName}".nextNodeToNextVersion() }
}
}

// Remote publication cluster
String remoteBaseName = "${baseName}-remote"

testClusters {
"${remoteBaseName}" {
versions = [bwcVersionStr, project.version]
numberOfNodes = 3
setting 'repositories.url.allowed_urls', 'http://snapshot.test*'
setting 'path.repo', "${buildDir}/cluster/shared/repo/${remoteBaseName}"
setting 'http.content_type.required', 'true'
setting 'node.attr.remote_store.routing_table.repository', 'my-fs-repository'
setting 'node.attr.remote_store.state.repository', 'my-fs-repository'
setting 'node.attr.remote_store.repository.my-fs-repository.type', 'fs'
setting 'node.attr.remote_store.repository.my-fs-repository.settings.location', "${buildDir}/cluster/shared/repo/${remoteBaseName}/remote_state"
setting 'cluster.remote_store.state.enabled', 'true'
setting 'cluster.remote_store.publication.enabled', 'true'
}
}

tasks.register("${remoteBaseName}#oldClusterTest", StandaloneRestIntegTestTask) {
dependsOn "${baseName}#upgradedClusterTest"
configureTestTask(it, remoteBaseName, bwcVersionStr, 'old_cluster', false) {
doFirst { delete("${buildDir}/cluster/shared/repo/${remoteBaseName}") }
}
}

tasks.register("${remoteBaseName}#oneThirdUpgradedTest", StandaloneRestIntegTestTask) {
dependsOn "${remoteBaseName}#oldClusterTest"
configureTestTask(it, remoteBaseName, bwcVersionStr, 'mixed_cluster', false) {
systemProperty 'tests.first_round', 'true'
doFirst { testClusters."${remoteBaseName}".nextNodeToNextVersion() }
}
}

tasks.register("${remoteBaseName}#twoThirdsUpgradedTest", StandaloneRestIntegTestTask) {
dependsOn "${remoteBaseName}#oneThirdUpgradedTest"
configureTestTask(it, remoteBaseName, bwcVersionStr, 'mixed_cluster', false) {
systemProperty 'tests.first_round', 'false'
doFirst { testClusters."${remoteBaseName}".nextNodeToNextVersion() }
doFirst {
testClusters."${baseName}".nextNodeToNextVersion()
}
}
useCluster project, testClusters."${baseName}"
systemProperty 'tests.rest.suite', 'upgraded_cluster'
systemProperty 'tests.upgrade_from_version', bwcVersionStr

tasks.register("${remoteBaseName}#upgradedClusterTest", StandaloneRestIntegTestTask) {
dependsOn "${remoteBaseName}#twoThirdsUpgradedTest"
configureTestTask(it, remoteBaseName, bwcVersionStr, 'upgraded_cluster', false) {
doFirst { testClusters."${remoteBaseName}".nextNodeToNextVersion() }
}
nonInputProperties.systemProperty('tests.rest.cluster', "${-> testClusters."${baseName}".allHttpSocketURI.join(",")}")
nonInputProperties.systemProperty('tests.clustername', "${-> testClusters."${baseName}".getName()}")
}

tasks.register(bwcTaskName(bwcVersion)) {
dependsOn tasks.named("${remoteBaseName}#upgradedClusterTest")
dependsOn tasks.named("${baseName}#upgradedClusterTest")
}
}
Loading
Loading