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
The following commit(s) were added to refs/heads/trunk by this push:
new 1ca5769 Fix MixedModeReadTest.mixedModeReadColumnSubsetDigestCheck
after CASSANDRA-16525
1ca5769 is described below
commit 1ca5769c9adfd2e8bad3b7eea83112ad14cb05b2
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sat Mar 20 21:58:42 2021 +0100
Fix MixedModeReadTest.mixedModeReadColumnSubsetDigestCheck after
CASSANDRA-16525
patch by Mick Semb Wever; reviewed by Yifan Cai for CASSANDRA-16525
---
.../org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
index f9a3542..4591894 100644
---
a/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/upgrade/MixedModeReadTest.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.distributed.upgrade;
import org.junit.Test;
+import org.apache.cassandra.distributed.api.Feature;
import org.apache.cassandra.distributed.api.IInvokableInstance;
import org.apache.cassandra.distributed.shared.Versions;
import org.apache.cassandra.gms.Gossiper;
@@ -35,6 +36,7 @@ public class MixedModeReadTest extends UpgradeTestBase
public void mixedModeReadColumnSubsetDigestCheck() throws Throwable
{
new TestCase()
+ .withConfig(c -> c.with(Feature.GOSSIP, Feature.NETWORK))
.nodes(2)
.nodesToUpgrade(1)
.upgrade(Versions.Major.v30, Versions.Major.v4)
@@ -52,7 +54,7 @@ public class MixedModeReadTest extends UpgradeTestBase
while (!((IInvokableInstance) (cluster.get(1))).callOnInstance(()
->
Gossiper.instance.isUpgradingFromVersionLowerThan(CassandraVersion.CASSANDRA_4_0.familyLowerBound.get())
&&
!Gossiper.instance.isUpgradingFromVersionLowerThan(new
CassandraVersion(("3.0")).familyLowerBound.get())))
{
- if (attempts++ > 30)
+ if (attempts++ > 90)
throw new
RuntimeException("Gossiper.instance.haveMajorVersion3Nodes() continually
returns false despite expecting to be true");
Thread.sleep(1000);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
