This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-5.0 by this push:
new c9b934df67 Fix MixedModeAvailabilityTest
c9b934df67 is described below
commit c9b934df67ed4ea0779e1f07cf762b67ba6362c5
Author: Andrés de la Peña <[email protected]>
AuthorDate: Fri Aug 25 16:08:45 2023 +0100
Fix MixedModeAvailabilityTest
patch by Andrés de la Peña; reviewed by Berenguer Blasi for CASSANDRA-18564
---
.../upgrade/MixedModeAvailabilityTestBase.java | 181 ++++++++-------------
...edModeAvailabilityUpgradedCoordinatorTest.java} | 11 +-
... MixedModeAvailabilityUpgradedReplicaTest.java} | 11 +-
.../MixedModeAvailabilityV30OneAllTest.java | 32 ----
4 files changed, 74 insertions(+), 161 deletions(-)
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityTestBase.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityTestBase.java
index 49f327b026..d26f6761d5 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityTestBase.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityTestBase.java
@@ -18,6 +18,8 @@
package org.apache.cassandra.distributed.upgrade;
+import java.util.EnumMap;
+import java.util.Map;
import java.util.UUID;
import java.util.concurrent.RejectedExecutionException;
@@ -25,22 +27,17 @@ import org.junit.Test;
import org.apache.cassandra.distributed.api.ConsistencyLevel;
import org.apache.cassandra.distributed.api.ICoordinator;
-import org.apache.cassandra.exceptions.ReadFailureException;
-import org.apache.cassandra.exceptions.ReadTimeoutException;
-import org.apache.cassandra.exceptions.WriteFailureException;
-import org.apache.cassandra.exceptions.WriteTimeoutException;
-import org.apache.cassandra.net.Verb;
-import org.assertj.core.api.Assertions;
import static java.lang.String.format;
-import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
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;
+import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
+import static org.apache.cassandra.distributed.api.Feature.NATIVE_PROTOCOL;
+import static org.apache.cassandra.distributed.api.Feature.NETWORK;
import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows;
import static org.apache.cassandra.distributed.shared.AssertUtils.row;
-import static org.apache.cassandra.net.Verb.READ_REQ;
-import static org.junit.Assert.assertFalse;
public abstract class MixedModeAvailabilityTestBase extends UpgradeTestBase
@@ -49,54 +46,32 @@ public abstract class MixedModeAvailabilityTestBase extends
UpgradeTestBase
private static final int COORDINATOR = 1;
private static final String INSERT = withKeyspace("INSERT INTO %s.t (k, c,
v) VALUES (?, ?, ?)");
private static final String SELECT = withKeyspace("SELECT * FROM %s.t
WHERE k = ?");
+ private static final Map<ConsistencyLevel, ConsistencyLevel>
CONSISTENCY_LEVELS = new EnumMap<>(ConsistencyLevel.class)
+ {{
+ put(ALL, ONE);
+ put(ONE, ALL);
+ put(QUORUM, QUORUM);
+ }};
- private final ConsistencyLevel writeConsistencyLevel;
- private final ConsistencyLevel readConsistencyLevel;
-
- public MixedModeAvailabilityTestBase(ConsistencyLevel
writeConsistencyLevel, ConsistencyLevel readConsistencyLevel)
- {
- this.writeConsistencyLevel = writeConsistencyLevel;
- this.readConsistencyLevel = readConsistencyLevel;
- }
-
- @Test
- public void testAvailabilityCoordinatorNotUpgraded() throws Throwable
- {
- testAvailability(false, writeConsistencyLevel, readConsistencyLevel);
- }
+ protected abstract boolean upgradedCoordinator();
@Test
- public void testAvailabilityCoordinatorUpgraded() throws Throwable
- {
- testAvailability(true, writeConsistencyLevel, readConsistencyLevel);
- }
-
- protected static void testAvailability(ConsistencyLevel
writeConsistencyLevel,
- ConsistencyLevel
readConsistencyLevel) throws Throwable
- {
- testAvailability(true, writeConsistencyLevel, readConsistencyLevel);
- testAvailability(false, writeConsistencyLevel, readConsistencyLevel);
- }
-
- private static void testAvailability(boolean upgradedCoordinator,
- ConsistencyLevel
writeConsistencyLevel,
- ConsistencyLevel
readConsistencyLevel) throws Throwable
+ public void testAvailability() throws Throwable
{
new TestCase()
.nodes(NUM_NODES)
- .nodesToUpgrade(upgradedCoordinator ? 1 : 2)
+ .nodesToUpgrade(upgradedCoordinator() ? 1 : 2)
.upgradesToCurrentFrom(v30)
- .withConfig(config -> config.set("read_request_timeout_in_ms",
SECONDS.toMillis(5))
- .set("write_request_timeout_in_ms",
SECONDS.toMillis(5)))
- // use retry of 10ms so that each check is consistent
- // At the start of the world cfs.sampleLatencyNanos == 0, which means
speculation acts as if ALWAYS is done,
- // but after the first refresh this gets set high enough that we don't
trigger speculation for the rest of the test!
- // To be consistent set retry to 10ms so cfs.sampleLatencyNanos stays
consistent for the duration of the test.
+ .withConfig(config -> config.with(GOSSIP, NETWORK, NATIVE_PROTOCOL)
+ .set("request_timeout_in_ms",
MINUTES.toMillis(10))
+ .set("read_request_timeout_in_ms",
MINUTES.toMillis(10))
+ .set("write_request_timeout_in_ms",
MINUTES.toMillis(10)))
.setup(cluster -> {
- cluster.schemaChange(withKeyspace("CREATE TABLE %s.t (k uuid, c
int, v int, PRIMARY KEY (k, c)) WITH speculative_retry = '10ms'"));
+ // always use rapid read protection to speed up queries with down
nodes
+ cluster.schemaChange(withKeyspace("CREATE TABLE %s.t (k uuid, c
int, v int, PRIMARY KEY (k, c)) " +
+ "WITH speculative_retry =
'ALWAYS'"));
cluster.setUncaughtExceptionsFilter(throwable -> throwable
instanceof RejectedExecutionException);
})
- .runBeforeClusterUpgrade(cluster -> cluster.filters().reset())
.runAfterNodeUpgrade((cluster, n) -> {
ICoordinator coordinator = cluster.coordinator(COORDINATOR);
@@ -104,48 +79,52 @@ public abstract class MixedModeAvailabilityTestBase
extends UpgradeTestBase
// using 0 to 2 down nodes...
for (int i = 0; i < NUM_NODES; i++)
{
+ // stop the replica node that we want to be down during queries
final int numNodesDown = i;
-
- // disable communications to the down nodes
if (numNodesDown > 0)
- {
-
cluster.filters().outbound().verbs(READ_REQ.id).to(replica(COORDINATOR,
numNodesDown)).drop();
-
cluster.filters().outbound().verbs(Verb.MUTATION_REQ.id).to(replica(COORDINATOR,
numNodesDown)).drop();
- }
-
- UUID key = UUID.randomUUID();
- Object[] row1 = row(key, 1, 10);
- Object[] row2 = row(key, 2, 20);
-
- boolean wrote = false;
- try
- {
- // test write
- maybeFail(false, numNodesDown >
maxNodesDown(writeConsistencyLevel), () -> {
- coordinator.execute(INSERT, writeConsistencyLevel,
row1);
- coordinator.execute(INSERT, writeConsistencyLevel,
row2);
- });
-
- wrote = true;
-
- // test read
- maybeFail(true, numNodesDown >
maxNodesDown(readConsistencyLevel), () -> {
- Object[][] rows = coordinator.execute(SELECT,
readConsistencyLevel, key);
+ cluster.get(replica(COORDINATOR,
numNodesDown)).shutdown().get();
+
+ // for each write-read consistency level combination...
+ CONSISTENCY_LEVELS.forEach((writeConsistencyLevel,
readConsistencyLevel) -> {
+
+ UUID key = UUID.randomUUID();
+ Object[] row1 = row(key, 1, 10);
+ Object[] row2 = row(key, 2, 20);
+
+ boolean reading = false;
+ try
+ {
+ // test writes if the write consistency level is
compatible with the number of down nodes
if (numNodesDown <=
maxNodesDown(writeConsistencyLevel))
- assertRows(rows, row1, row2);
- });
- }
- catch (Throwable t)
- {
- throw new AssertionError(format("Unexpected error while %s
in case write-read consistency %s-%s with %s coordinator and %d nodes down: %s",
- wrote ? "reading" :
"writing",
- writeConsistencyLevel,
- readConsistencyLevel,
- upgradedCoordinator ?
"upgraded" : "not upgraded",
- numNodesDown,
- t), t);
- }
+ {
+ coordinator.execute(INSERT, writeConsistencyLevel,
row1);
+ coordinator.execute(INSERT, writeConsistencyLevel,
row2);
+ }
+
+ reading = true;
+
+ // test reads if the read consistency level is
compatible with the number of down nodes
+ if (numNodesDown <= maxNodesDown(readConsistencyLevel))
+ {
+ Object[][] rows = coordinator.execute(SELECT,
readConsistencyLevel, key);
+ if (numNodesDown <=
maxNodesDown(writeConsistencyLevel))
+ assertRows(rows, row1, row2);
+ }
+ }
+ catch (Throwable t)
+ {
+ throw new AssertionError(format("Unexpected error
while %s in case write-read consistency " +
+ "%s-%s with %s
coordinator and %d nodes down: %s",
+ reading ? "reading" :
"writing",
+ writeConsistencyLevel,
+ readConsistencyLevel,
+ upgradedCoordinator()
? "upgraded" : "not upgraded",
+ numNodesDown,
+ t), t);
+ }
+ });
}
+
}).run();
}
@@ -155,38 +134,6 @@ public abstract class MixedModeAvailabilityTestBase
extends UpgradeTestBase
return depth == 0 ? node : replica(node == NUM_NODES ? 1 : node + 1,
depth - 1);
}
- private static void maybeFail(boolean isRead, boolean shouldFail, Runnable
test)
- {
- try
- {
- test.run();
- assertFalse("Should have failed", shouldFail);
- }
- catch (Exception e)
- {
- if (!shouldFail)
- throw e;
-
- // we should use exception class names due to the different
classpaths
- String className = (e instanceof RuntimeException && e.getCause()
!= null)
- ? e.getCause().getClass().getCanonicalName()
- : e.getClass().getCanonicalName();
-
- if (isRead)
- {
- Assertions.assertThat(className)
- .isIn(ReadTimeoutException.class.getCanonicalName(),
- ReadFailureException.class.getCanonicalName());
- }
- else
- {
- Assertions.assertThat(className)
- .isIn(WriteTimeoutException.class.getCanonicalName(),
-
WriteFailureException.class.getCanonicalName());
- }
- }
- }
-
private static int maxNodesDown(ConsistencyLevel cl)
{
if (cl == ONE)
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityV30AllOneTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityUpgradedCoordinatorTest.java
similarity index 71%
rename from
test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityV30AllOneTest.java
rename to
test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityUpgradedCoordinatorTest.java
index 47ef8da9f1..9b70434e7d 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityV30AllOneTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityUpgradedCoordinatorTest.java
@@ -18,15 +18,14 @@
package org.apache.cassandra.distributed.upgrade;
-import org.apache.cassandra.distributed.api.ConsistencyLevel;
-
/**
- * {@link MixedModeAvailabilityTestBase} for upgrades from v30 with ALL-ONE
write-read consistency.
+ * {@link MixedModeAvailabilityTestBase} with upgraded coordinator.
*/
-public class MixedModeAvailabilityV30AllOneTest extends
MixedModeAvailabilityTestBase
+public class MixedModeAvailabilityUpgradedCoordinatorTest extends
MixedModeAvailabilityTestBase
{
- public MixedModeAvailabilityV30AllOneTest()
+ @Override
+ protected boolean upgradedCoordinator()
{
- super(ConsistencyLevel.ALL, ConsistencyLevel.ONE);
+ return true;
}
}
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityV30QuorumQuorumTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityUpgradedReplicaTest.java
similarity index 72%
rename from
test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityV30QuorumQuorumTest.java
rename to
test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityUpgradedReplicaTest.java
index 5e71a34fbb..98ff4396a6 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityV30QuorumQuorumTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityUpgradedReplicaTest.java
@@ -18,15 +18,14 @@
package org.apache.cassandra.distributed.upgrade;
-import org.apache.cassandra.distributed.api.ConsistencyLevel;
-
/**
- * {@link MixedModeAvailabilityTestBase} for upgrades from v30 with
QUORUM-QUORUM write-read consistency.
+ * {@link MixedModeAvailabilityTestBase} with not upgraded coordinator.
*/
-public class MixedModeAvailabilityV30QuorumQuorumTest extends
MixedModeAvailabilityTestBase
+public class MixedModeAvailabilityUpgradedReplicaTest extends
MixedModeAvailabilityTestBase
{
- public MixedModeAvailabilityV30QuorumQuorumTest()
+ @Override
+ protected boolean upgradedCoordinator()
{
- super(ConsistencyLevel.QUORUM, ConsistencyLevel.QUORUM);
+ return false;
}
}
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityV30OneAllTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityV30OneAllTest.java
deleted file mode 100644
index fec9230e12..0000000000
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeAvailabilityV30OneAllTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.cassandra.distributed.upgrade;
-
-import org.apache.cassandra.distributed.api.ConsistencyLevel;
-
-/**
- * {@link MixedModeAvailabilityTestBase} for upgrades from v30 with ONE-ALL
write-read consistency.
- */
-public class MixedModeAvailabilityV30OneAllTest extends
MixedModeAvailabilityTestBase
-{
- public MixedModeAvailabilityV30OneAllTest()
- {
- super(ConsistencyLevel.ONE, ConsistencyLevel.ALL);
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
