You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ed...@apache.org on 2022/02/13 18:05:41 UTC
[cassandra] branch trunk updated: Set the config in In-JVM upgrade tests to the old format on trunk because In-JVM upgrade tests do no support per-version config. patch by Ekaterina Dimitrova; reviewed by David Capwell for CASSANDRA-17369
This is an automated email from the ASF dual-hosted git repository.
edimitrova 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 0c87f26 Set the config in In-JVM upgrade tests to the old format on trunk because In-JVM upgrade tests do no support per-version config. patch by Ekaterina Dimitrova; reviewed by David Capwell for CASSANDRA-17369
0c87f26 is described below
commit 0c87f2668d902caef51a8f281c3eb3ca57bb2924
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Wed Feb 9 16:22:46 2022 -0500
Set the config in In-JVM upgrade tests to the old format on trunk because In-JVM upgrade tests do no support per-version config.
patch by Ekaterina Dimitrova; reviewed by David Capwell for CASSANDRA-17369
---
.../cassandra/distributed/upgrade/CompactStorageUpgradeTest.java | 2 +-
.../cassandra/distributed/upgrade/MixedModeAvailabilityTestBase.java | 5 +++--
.../cassandra/distributed/upgrade/MixedModeConsistencyTestBase.java | 5 +++--
.../cassandra/distributed/upgrade/MixedModeMessageForwardTest.java | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageUpgradeTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageUpgradeTest.java
index 657e25e..9e68934 100644
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageUpgradeTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/CompactStorageUpgradeTest.java
@@ -146,7 +146,7 @@ public class CompactStorageUpgradeTest extends UpgradeTestBase
.nodes(2)
.nodesToUpgrade(1, 2)
.upgradesFrom(v30)
- .withConfig(config -> config.with(GOSSIP, NETWORK).set("drop_compact_storage_enabled", true))
+ .withConfig(config -> config.with(GOSSIP, NETWORK).set("enable_drop_compact_storage", true))
.setup((cluster) -> {
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int, ck int, PRIMARY KEY (pk, ck)) WITH COMPACT STORAGE");
cluster.coordinator(1).execute("INSERT INTO " + KEYSPACE + ".tbl (pk, ck) VALUES (1,1)", ConsistencyLevel.ALL);
diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityTestBase.java b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityTestBase.java
index e801f76..c1ae153 100644
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityTestBase.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityTestBase.java
@@ -30,6 +30,7 @@ import org.apache.cassandra.exceptions.ReadTimeoutException;
import org.apache.cassandra.exceptions.WriteTimeoutException;
import org.apache.cassandra.net.Verb;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL;
import static org.apache.cassandra.distributed.api.ConsistencyLevel.ONE;
import static org.apache.cassandra.distributed.api.ConsistencyLevel.QUORUM;
@@ -69,8 +70,8 @@ public class MixedModeAvailabilityTestBase extends UpgradeTestBase
.nodes(NUM_NODES)
.nodesToUpgrade(upgradedCoordinator ? 1 : 2)
.upgrades(initial, upgrade)
- .withConfig(config -> config.set("read_request_timeout", "2s")
- .set("write_request_timeout", "2s"))
+ .withConfig(config -> config.set("read_request_timeout_in_ms", SECONDS.toMillis(2))
+ .set("write_request_timeout_in_ms", SECONDS.toMillis(2)))
.setup(c -> c.schemaChange(withKeyspace("CREATE TABLE %s.t (k uuid, c int, v int, PRIMARY KEY (k, c))")))
.runAfterNodeUpgrade((cluster, n) -> {
diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeConsistencyTestBase.java b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeConsistencyTestBase.java
index 70b83e2..f98fc8a 100644
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeConsistencyTestBase.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeConsistencyTestBase.java
@@ -31,6 +31,7 @@ import org.apache.cassandra.distributed.api.ConsistencyLevel;
import org.apache.cassandra.distributed.api.IUpgradeableInstance;
import static java.lang.String.format;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.cassandra.distributed.api.ConsistencyLevel.ALL;
import static org.apache.cassandra.distributed.api.ConsistencyLevel.ONE;
import static org.apache.cassandra.distributed.api.ConsistencyLevel.QUORUM;
@@ -55,8 +56,8 @@ public class MixedModeConsistencyTestBase extends UpgradeTestBase
.nodes(3)
.nodesToUpgrade(1)
.upgrades(initial, upgrade)
- .withConfig(config -> config.set("read_request_timeout", "30s")
- .set("write_request_timeout", "30s"))
+ .withConfig(config -> config.set("read_request_timeout_in_ms", SECONDS.toMillis(30))
+ .set("write_request_timeout_in_ms", SECONDS.toMillis(30)))
.setup(cluster -> {
Tester.createTable(cluster);
for (Tester tester : testers)
diff --git a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
index 7da2b79..935cc8e 100644
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeMessageForwardTest.java
@@ -79,7 +79,7 @@ public class MixedModeMessageForwardTest extends UpgradeTestBase
.collect(Collectors.joining(","));
new TestCase()
- .withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK).set("request_timeout", "30000ms"))
+ .withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK).set("request_timeout_in_ms", 30000))
.withBuilder(b -> b.withRacks(numDCs, 1, nodesPerDc))
.nodes(numDCs * nodesPerDc)
.singleUpgrade(v30)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org