This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f9a220c1100d9f6deaca0ec20e7481576deb5b36
Merge: 25b75df 4dcf7d9
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Mon Jul 12 22:39:19 2021 +0200
Merge branch 'cassandra-4.0' into trunk
build.xml | 2 +-
.../distributed/impl/AbstractCluster.java | 2 +-
.../cassandra/distributed/impl/InstanceConfig.java | 18 ++---
.../upgrade/CompactStorage3to4UpgradeTest.java | 2 +-
.../upgrade/CompactStorageUpgradeTest.java | 10 +--
.../cassandra/distributed/upgrade/GroupByTest.java | 2 +-
.../upgrade/MixedModeAvailabilityTestBase.java | 17 +++--
.../upgrade/MixedModeAvailabilityV22Test.java | 4 +-
.../upgrade/MixedModeAvailabilityV30Test.java | 10 +--
.../upgrade/MixedModeAvailabilityV3XTest.java | 4 +-
.../upgrade/MixedModeBatchTestBase.java | 12 ++-
.../upgrade/MixedModeConsistencyTestBase.java | 12 ++-
.../upgrade/MixedModeConsistencyV22Test.java | 4 +-
.../upgrade/MixedModeConsistencyV30Test.java | 10 +--
.../upgrade/MixedModeConsistencyV3XTest.java | 4 +-
.../upgrade/MixedModeFrom2LoggedBatchTest.java | 4 +-
.../upgrade/MixedModeFrom2ReplicationTest.java | 4 +-
.../upgrade/MixedModeFrom2UnloggedBatchTest.java | 4 +-
.../upgrade/MixedModeFrom3LoggedBatchTest.java | 12 +--
.../upgrade/MixedModeFrom3ReplicationTest.java | 12 +--
.../upgrade/MixedModeFrom3UnloggedBatchTest.java | 12 +--
.../distributed/upgrade/MixedModeGossipTest.java | 10 ++-
.../distributed/upgrade/MixedModeReadTest.java | 5 +-
.../distributed/upgrade/MixedModeRepairTest.java | 4 +-
.../upgrade/MixedModeReplicationTestBase.java | 12 ++-
.../cassandra/distributed/upgrade/PagingTest.java | 2 +-
.../upgrade/Pre40MessageFilterTest.java | 5 +-
.../ReadRepairCompactStorageUpgradeTest.java | 4 +-
.../cassandra/distributed/upgrade/UpgradeTest.java | 2 +-
.../distributed/upgrade/UpgradeTestBase.java | 86 ++++++++++++++--------
30 files changed, 154 insertions(+), 137 deletions(-)
diff --cc
test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeGossipTest.java
index 83e911d,e706bda..f62936c
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeGossipTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeGossipTest.java
@@@ -50,8 -50,9 +50,9 @@@ public class MixedModeGossipTest extend
.withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK))
.nodes(3)
.nodesToUpgradeOrdered(1, 2, 3)
- .upgrade(Versions.Major.v30, Versions.Major.v4)
- .upgrade(Versions.Major.v3X, Versions.Major.v4)
- // all upgrades from v30 up, excluding v30->v3X
++ // all upgrades from v30 up, excluding v30->v3X and from v40
+ .singleUpgrade(v30, v40)
- .upgradesFrom(v3X)
++ .singleUpgrade(v3X, v40)
.setup(c -> {})
.runAfterNodeUpgrade((cluster, node) -> {
if (node == 1) {
@@@ -85,8 -86,9 +86,9 @@@
.withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK))
.nodes(3)
.nodesToUpgradeOrdered(1, 2, 3)
- .upgrade(Versions.Major.v30, Versions.Major.v4)
- .upgrade(Versions.Major.v3X, Versions.Major.v4)
- // all upgrades from v30 up, excluding v30->v3X
++ // all upgrades from v30 up, excluding v30->v3X and from v40
+ .singleUpgrade(v30, v40)
- .upgradesFrom(v3X)
++ .singleUpgrade(v3X, v40)
.setup(cluster -> {
// node2 and node3 gossiper cannot talk with each other
cluster.filters().verbs(Verb.GOSSIP_DIGEST_SYN.id).from(2).to(3).drop();
diff --cc
test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
index f1883b0,c95aede..631f65a
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
@@@ -39,8 -39,9 +39,9 @@@ public class MixedModeReadTest extends
.withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK))
.nodes(2)
.nodesToUpgrade(1)
- .upgrade(Versions.Major.v30, Versions.Major.v4)
- .upgrade(Versions.Major.v3X, Versions.Major.v4)
- // all upgrades from v30 up, excluding v30->v3X
++ // all upgrades from v30 up, excluding v30->v3X and from v40
+ .singleUpgrade(v30, v40)
- .upgradesFrom(v3X)
++ .singleUpgrade(v3X, v40)
.setup(cluster -> {
cluster.schemaChange(CREATE_TABLE);
insertData(cluster.coordinator(1));
diff --cc
test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeRepairTest.java
index 39f6c95,adcfd1f..478a1b7
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeRepairTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeRepairTest.java
@@@ -55,8 -54,7 +54,7 @@@ public class MixedModeRepairTest extend
new UpgradeTestBase.TestCase()
.nodes(2)
.nodesToUpgrade(UPGRADED_NODE)
- .upgrade(Major.v30, Major.v4)
- .upgrade(Major.v3X, Major.v4)
- .upgradesFrom(v3X)
++ .singleUpgrade(v3X, v40)
.withConfig(config -> config.with(NETWORK, GOSSIP))
.setup(cluster -> {
cluster.schemaChange(CREATE_TABLE);
diff --cc
test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
index 90254d1,c2afc2d..f981b5d
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/UpgradeTestBase.java
@@@ -76,6 -79,21 +79,23 @@@ public class UpgradeTestBase extends Di
public void run(UpgradeableCluster cluster, int node) throws
Throwable;
}
+ public static final Semver v22 = new Semver("2.2.0-beta1",
SemverType.LOOSE);
+ public static final Semver v30 = new Semver("3.0.0-alpha1",
SemverType.LOOSE);
+ public static final Semver v3X = new Semver("3.11.0", SemverType.LOOSE);
+ public static final Semver v40 = new Semver("4.0-alpha1",
SemverType.LOOSE);
++ public static final Semver v41 = new Semver("4.1-alpha1",
SemverType.LOOSE);
+
+ protected static final List<Pair<Semver,Semver>> SUPPORTED_UPGRADE_PATHS
= ImmutableList.of(
+ Pair.create(v22, v30),
+ Pair.create(v22, v3X),
+ Pair.create(v30, v3X),
+ Pair.create(v30, v40),
- Pair.create(v3X, v40));
++ Pair.create(v3X, v40),
++ Pair.create(v40, v41));
+
+ // the last is always the current
+ public static final Semver CURRENT =
SUPPORTED_UPGRADE_PATHS.get(SUPPORTED_UPGRADE_PATHS.size() - 1).right;
+
public static class TestVersions
{
final Version initial;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
