Skip to content

CASSANDRA-21324 - remove 4.0 upgrade paths and similar #4765

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

Open
smiklosovic wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

CASSANDRA-21324 - remove 4.0 upgrade paths and similar #4765

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: 1 addition & 1 deletion .build/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ _build_all_dtest_jars() {
[ "${java_version}" -eq 11 ] && export CASSANDRA_USE_JDK11=true

pushd ${TMP_DIR}/cassandra-dtest-jars >/dev/null
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk ; do
for branch in cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk ; do
git clean -qxdff && git reset --hard HEAD || echo "failed to reset/clean ${TMP_DIR}/cassandra-dtest-jars… continuing…"
git checkout --quiet $branch
dtest_jar_version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5045,7 +5045,7 @@ jobs:
cd ~/cassandra
mkdir ~/dtest_jars
git remote add apache https://github.com/apache/cassandra.git
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
for branch in cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
# check out the correct cassandra version:
git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml.FREE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5045,7 +5045,7 @@ jobs:
cd ~/cassandra
mkdir ~/dtest_jars
git remote add apache https://github.com/apache/cassandra.git
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
for branch in cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
# check out the correct cassandra version:
git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml.PAID
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5045,7 +5045,7 @@ jobs:
cd ~/cassandra
mkdir ~/dtest_jars
git remote add apache https://github.com/apache/cassandra.git
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
for branch in cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
# check out the correct cassandra version:
git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config_template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2824,7 +2824,7 @@ commands:
cd ~/cassandra
mkdir ~/dtest_jars
git remote add apache https://github.com/apache/cassandra.git
for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
for branch in cassandra-4.1 cassandra-5.0 cassandra-6.0 trunk; do
# check out the correct cassandra version:
git remote set-branches --add apache '$branch'
git fetch --depth 1 apache $branch
Expand Down
321 changes: 0 additions & 321 deletions test/data/config/version=4.0-alpha1.yml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,12 +373,6 @@ public InstanceConfig forVersion(Semver version)
config.remove("node_proximity");
config.set("endpoint_snitch", "org.apache.cassandra.distributed.impl.DistributedTestSnitch");

// 4.0+ has seed_provider without port
if (version.compareTo(UpgradeTestBase.v40) >= 0)
return config;

config.set("seed_provider", new ParameterizedClass(SimpleSeedProvider.class.getName(),
Collections.singletonMap("seeds", "127.0.0.1")));
return config;
}

Expand Down
2 changes: 1 addition & 1 deletion test/distributed/org/apache/cassandra/distributed/upgrade/BatchUpgradeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void batchTest() throws Throwable
.nodes(2)
.nodesToUpgrade(2)
.withConfig(c -> c.with(Feature.GOSSIP))
.upgradesToCurrentFrom(v40).setup((cluster) -> {
.upgradesToCurrentFrom(v41).setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".users (" +
"userid uuid PRIMARY KEY," +
"firstname ascii," +
Expand Down
2 changes: 1 addition & 1 deletion .../distributed/org/apache/cassandra/distributed/upgrade/CompactStorageColumnDeleteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void testColumnDeleteWithCompactStorage() throws Throwable
.nodes(2)
.nodesToUpgrade(2)
.withConfig(c -> c.with(Feature.GOSSIP))
.upgradesToCurrentFrom(v40)
.upgradesToCurrentFrom(v41)
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int, ck int, v int, PRIMARY KEY (pk, ck)) WITH COMPACT STORAGE");
})
Expand Down
Loading