Skip to content

Commit 69cae2c

Browse files
committed
skip mixed cluster in older versions
1 parent 56c99e1 commit 69cae2c

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/TransformSurvivesUpgradeIT.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.apache.http.entity.ContentType;
1111
import org.apache.http.entity.StringEntity;
1212
import org.elasticsearch.Build;
13+
import org.elasticsearch.Version;
1314
import org.elasticsearch.client.Request;
1415
import org.elasticsearch.client.Response;
1516
import org.elasticsearch.client.RestClient;
@@ -235,13 +236,14 @@ private void verifyContinuousTransformHandlesData(long expectedLastCheckpoint) t
235236
private void verifyUpgradeFailsIfMixedCluster() {
236237
// upgrade tests by design are also executed with the same version, this check must be skipped in this case, see gh#39102.
237238
if (isOriginalClusterCurrent()) {
238-
Build.current().v
239239
return;
240240
}
241-
final Request upgradeTransformRequest = new Request("POST", getTransformEndpoint() + "_upgrade");
242-
243-
Exception ex = expectThrows(Exception.class, () -> client().performRequest(upgradeTransformRequest));
244-
assertThat(ex.getMessage(), containsString("Cannot upgrade transforms while cluster upgrade is in progress"));
241+
var oldestVersion = Version.fromString(UPGRADE_FROM_VERSION);
242+
if (oldestVersion.onOrAfter(Version.V_9_2_0)) {
243+
final Request upgradeTransformRequest = new Request("POST", getTransformEndpoint() + "_upgrade");
244+
Exception ex = expectThrows(Exception.class, () -> client().performRequest(upgradeTransformRequest));
245+
assertThat(ex.getMessage(), containsString("Cannot upgrade transforms while cluster upgrade is in progress"));
246+
}
245247
}
246248

247249
private void verifyUpgrade() throws IOException {

0 commit comments

Comments
 (0)