This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 04064783bf fix cluster metadata upgrade tests - these only make sense
when upgrading from a gossip cluster to a cluster metadata one
04064783bf is described below
commit 04064783bf83b3754cd4410355a55e3def41a0b6
Author: Marcus Eriksson <[email protected]>
AuthorDate: Thu May 28 09:06:02 2026 +0200
fix cluster metadata upgrade tests - these only make sense when upgrading
from a gossip cluster to a cluster metadata one
patch by Marcus Eriksson; reviewed by Francisco Guerrero for CASSANDRA-21326
---
.../upgrade/ClusterMetadataSingleNodeUpgradeTest.java | 2 +-
.../upgrade/ClusterMetadataUpgradeAbortMigrationTest.java | 2 +-
.../upgrade/ClusterMetadataUpgradeAssassinateTest.java | 2 +-
.../upgrade/ClusterMetadataUpgradeChangeIPTest.java | 2 +-
.../ClusterMetadataUpgradeCleanupPreInitializeTest.java | 2 +-
.../distributed/upgrade/ClusterMetadataUpgradeHarryTest.java | 2 +-
.../upgrade/ClusterMetadataUpgradeHibernateTest.java | 4 ++--
.../distributed/upgrade/ClusterMetadataUpgradeHostIdTest.java | 2 +-
.../upgrade/ClusterMetadataUpgradeIgnoreHostsTest.java | 4 ++--
.../upgrade/ClusterMetadataUpgradeJoinRingTest.java | 2 +-
.../distributed/upgrade/ClusterMetadataUpgradeTest.java | 4 ++--
.../upgrade/ClusterMetadataUpgradeUnexpectedFailureTest.java | 2 +-
.../cassandra/distributed/upgrade/DropCompactStorageTest.java | 11 ++++++++++-
13 files changed, 25 insertions(+), 16 deletions(-)
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataSingleNodeUpgradeTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataSingleNodeUpgradeTest.java
index 24cf020a73..9d108f41d0 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataSingleNodeUpgradeTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataSingleNodeUpgradeTest.java
@@ -40,7 +40,7 @@ public class ClusterMetadataSingleNodeUpgradeTest extends
UpgradeTestBase
.nodesToUpgrade(1)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP, true))
- .upgradesToCurrentFrom(v50)
+ .singleUpgradeToCurrentFrom(v50)
.setup((cluster) -> {
cluster.schemaChange(withKeyspace("ALTER KEYSPACE %s WITH
replication = {'class': 'SimpleStrategy', 'replication_factor':1}"));
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAbortMigrationTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAbortMigrationTest.java
index bab722346d..4e588ab8d3 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAbortMigrationTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAbortMigrationTest.java
@@ -34,7 +34,7 @@ public class ClusterMetadataUpgradeAbortMigrationTest extends
UpgradeTestBase
.nodesToUpgrade(1, 2, 3)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP, true))
- .upgradesToCurrentFrom(v50)
+ .singleUpgradeToCurrentFrom(v50)
.setup((cluster) -> {
cluster.schemaChange(withKeyspace("ALTER KEYSPACE %s WITH
replication = {'class': 'SimpleStrategy', 'replication_factor':2}"));
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAssassinateTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAssassinateTest.java
index c020fdcc66..15f7b1aba4 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAssassinateTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeAssassinateTest.java
@@ -37,7 +37,7 @@ public class ClusterMetadataUpgradeAssassinateTest extends
UpgradeTestBase
.nodes(3)
.nodesToUpgrade(1, 2)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP))
- .upgradesToCurrentFrom(v50)
+ .singleUpgradeToCurrentFrom(v50)
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
cluster.get(3).shutdown().get();
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeChangeIPTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeChangeIPTest.java
index c363ba5cf1..815234195e 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeChangeIPTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeChangeIPTest.java
@@ -54,7 +54,7 @@ public class ClusterMetadataUpgradeChangeIPTest extends
UpgradeTestBase
.withBuilder(builder ->
builder.withNodeIdTopology(NetworkTopology.singleDcNetworkTopology(4, "dc0",
"rack0"))
.withTokenSupplier((TokenSupplier) i ->
i == 4 ? ts.tokens(3) : ts.tokens(i)))
.nodes(3)
- .upgradesToCurrentFrom(v50)
+ .singleUpgradeToCurrentFrom(v50)
.setup((cluster) -> {})
.runAfterClusterUpgrade((cluster) -> {
cluster.get(3).shutdown().get();
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeCleanupPreInitializeTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeCleanupPreInitializeTest.java
index 3117abaed9..e6be825578 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeCleanupPreInitializeTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeCleanupPreInitializeTest.java
@@ -38,7 +38,7 @@ public class ClusterMetadataUpgradeCleanupPreInitializeTest
extends UpgradeTestB
.nodesToUpgrade(1, 2, 3)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP, true))
- .upgradesToCurrentFrom(v41)
+ .singleUpgradeToCurrentFrom(v41)
.setup((cluster) -> {
cluster.schemaChange(withKeyspace("ALTER KEYSPACE %s WITH
replication = {'class': 'SimpleStrategy', 'replication_factor':2}"));
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHarryTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHarryTest.java
index 64810654d5..71a5aeff8f 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHarryTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHarryTest.java
@@ -86,7 +86,7 @@ public class ClusterMetadataUpgradeHarryTest extends
UpgradeTestBase
.nodesToUpgrade(1, 2, 3)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP,
true))
- .upgradesToCurrentFrom(v41)
+ .singleUpgradeToCurrentFrom(v41)
.withUpgradeListener(listener)
.setup((cluster) -> {
SchemaSpec schema = new SchemaSpec(rng.next(),
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHibernateTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHibernateTest.java
index a19978dd52..445c3749c2 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHibernateTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHibernateTest.java
@@ -43,7 +43,7 @@ public class ClusterMetadataUpgradeHibernateTest extends
UpgradeTestBase
.nodes(3)
.nodesToUpgrade(1, 2) // not node3 - we manually upgrade that below
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP))
- .upgradesToCurrentFrom(v50)
+ .singleUpgradeToCurrentFrom(v50)
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
cluster.get(3).shutdown().get();
@@ -79,7 +79,7 @@ public class ClusterMetadataUpgradeHibernateTest extends
UpgradeTestBase
.nodes(3)
.nodesToUpgrade(1, 2)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP))
- .upgradesToCurrentFrom(v50)
+ .singleUpgradeToCurrentFrom(v50)
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
cluster.get(3).shutdown().get();
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHostIdTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHostIdTest.java
index 3965555e8d..adbd8f9c7b 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHostIdTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeHostIdTest.java
@@ -48,7 +48,7 @@ public class ClusterMetadataUpgradeHostIdTest extends
UpgradeTestBase
.nodesToUpgrade(1, 2, 3)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP, true))
- .upgradesToCurrentFrom(v41)
+ .singleUpgradeToCurrentFrom(v41)
.setup((cluster) -> {
cluster.schemaChange(withKeyspace("ALTER KEYSPACE %s WITH
replication = {'class': 'SimpleStrategy', 'replication_factor':2}"));
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeIgnoreHostsTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeIgnoreHostsTest.java
index e5cbcb7555..09c4881b83 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeIgnoreHostsTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeIgnoreHostsTest.java
@@ -46,7 +46,7 @@ public class ClusterMetadataUpgradeIgnoreHostsTest extends
UpgradeTestBase
.nodesToUpgrade(1, 2, 3)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP, true))
- .upgradesToCurrentFrom(v41)
+ .singleUpgradeToCurrentFrom(v41)
.setup((cluster) -> {
cluster.schemaChange(withKeyspace("ALTER KEYSPACE %s WITH
replication = {'class': 'SimpleStrategy', 'replication_factor':2}"));
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
@@ -70,7 +70,7 @@ public class ClusterMetadataUpgradeIgnoreHostsTest extends
UpgradeTestBase
.nodesToUpgrade(1, 2)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP, true))
- .upgradesToCurrentFrom(v41)
+ .singleUpgradeToCurrentFrom(v41)
.setup((cluster) -> {
cluster.schemaChange(withKeyspace("ALTER KEYSPACE %s WITH
replication = {'class': 'SimpleStrategy', 'replication_factor':2}"));
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl
(pk int, ck int, v int, PRIMARY KEY (pk, ck))");
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeJoinRingTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeJoinRingTest.java
index 33e5132888..73260501e1 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeJoinRingTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeJoinRingTest.java
@@ -54,7 +54,7 @@ public class ClusterMetadataUpgradeJoinRingTest extends
UpgradeTestBase
.withTokenSupplier(ts::tokens)
.withNodeIdTopology(NetworkTopology.singleDcNetworkTopology(4, "dc0",
"rack0"))
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP))
- .upgradesToCurrentFrom(v50)
+ .singleUpgradeToCurrentFrom(v50)
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
IInstanceConfig nodeConfig = cluster.newInstanceConfig();
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeTest.java
index c7e33b8228..8e05ec67bf 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeTest.java
@@ -49,7 +49,7 @@ public class ClusterMetadataUpgradeTest extends
UpgradeTestBase
.nodesToUpgrade(1, 2, 3)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP, true))
- .upgradesToCurrentFrom(v41)
+ .singleUpgradeToCurrentFrom(v50)
.setup((cluster) -> {
cluster.schemaChange(withKeyspace("ALTER KEYSPACE %s WITH
replication = {'class': 'SimpleStrategy', 'replication_factor':2}"));
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
@@ -101,7 +101,7 @@ public class ClusterMetadataUpgradeTest extends
UpgradeTestBase
.nodesToUpgrade(1, 2, 3)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP, true))
- .upgradesToCurrentFrom(v50)
+ .singleUpgradeToCurrentFrom(v50)
.setup((cluster) -> {
cluster.schemaChange(withKeyspace("ALTER KEYSPACE %s WITH
replication = {'class': 'SimpleStrategy', 'replication_factor':2}"));
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int,
ck int, v int, PRIMARY KEY (pk, ck))");
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeUnexpectedFailureTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeUnexpectedFailureTest.java
index 646d4b8222..746f561523 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeUnexpectedFailureTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/ClusterMetadataUpgradeUnexpectedFailureTest.java
@@ -49,7 +49,7 @@ public class ClusterMetadataUpgradeUnexpectedFailureTest
extends UpgradeTestBase
.nodesToUpgrade(1, 2, 3)
.withConfig((cfg) -> cfg.with(Feature.NETWORK, Feature.GOSSIP)
.set(Constants.KEY_DTEST_FULL_STARTUP, true))
- .upgradesToCurrentFrom(v41)
+ .singleUpgradeToCurrentFrom(v41)
.withBuilder(builderUpdater)
.setup((cluster) -> {
cluster.schemaChange(withKeyspace("ALTER KEYSPACE %s WITH
replication = {'class': 'SimpleStrategy', 'replication_factor':2}"));
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/DropCompactStorageTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/DropCompactStorageTest.java
index e2499b9123..65f9cbf58f 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/DropCompactStorageTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/DropCompactStorageTest.java
@@ -20,7 +20,10 @@ package org.apache.cassandra.distributed.upgrade;
import org.junit.Test;
+import org.apache.cassandra.distributed.UpgradeableCluster;
import org.apache.cassandra.distributed.api.ConsistencyLevel;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.tcm.ClusterMetadataService;
import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
import static org.apache.cassandra.distributed.api.Feature.NETWORK;
@@ -42,11 +45,17 @@ public class DropCompactStorageTest extends UpgradeTestBase
cluster.coordinator(1).execute("INSERT INTO " + KEYSPACE + ".tbl
(pk, ck) VALUES (1,1)", ConsistencyLevel.ALL);
})
.runAfterClusterUpgrade((cluster) -> {
- cluster.get(1).nodetoolResult("cms",
"initialize").asserts().success();
+ if (needsCMSInitialization(cluster))
+ cluster.get(1).nodetoolResult("cms",
"initialize").asserts().success();
cluster.schemaChange("ALTER TABLE " + KEYSPACE + ".tbl DROP
COMPACT STORAGE");
assertRows(cluster.coordinator(1).execute("SELECT * FROM " +
KEYSPACE + ".tbl WHERE pk = 1",
ConsistencyLevel.ALL),
row(1, 1, null));
}).run();
}
+
+ private static boolean needsCMSInitialization(UpgradeableCluster cluster)
+ {
+ return ((IInvokableInstance) cluster.get(1)).callOnInstance(() ->
ClusterMetadataService.state() == ClusterMetadataService.State.GOSSIP);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
