You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2020/11/06 17:45:18 UTC
[cassandra] branch trunk updated (0700d79 -> 9ac9a93)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 0700d79 Circleci should run cqlshlib tests as well
new e5ab8c1 Fix tests broken by CASSANDRA-16146
new 94f940c Merge branch 'cassandra-3.0' into cassandra-3.11
new 9ac9a93 Merge branch 'cassandra-3.11' into trunk
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/java/org/apache/cassandra/service/StorageService.java | 13 ++++++++++++-
.../org/apache/cassandra/distributed/impl/Instance.java | 1 +
.../org/apache/cassandra/distributed/test/GossipTest.java | 12 ++----------
3 files changed, 15 insertions(+), 11 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9ac9a9343540e67f4609f75dd5199b2a66624488
Merge: 0700d79 94f940c
Author: Brandon Williams <br...@apache.org>
AuthorDate: Fri Nov 6 11:43:23 2020 -0600
Merge branch 'cassandra-3.11' into trunk
src/java/org/apache/cassandra/service/StorageService.java | 13 ++++++++++++-
.../org/apache/cassandra/distributed/impl/Instance.java | 1 +
.../org/apache/cassandra/distributed/test/GossipTest.java | 12 ++----------
3 files changed, 15 insertions(+), 11 deletions(-)
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index d7d3ebe,7dea7a0..47f82b8
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1464,6 -1488,16 +1465,16 @@@ public class StorageService extends Not
setMode(Mode.MOVING, true);
}
+ /**
+ * Only used in jvm dtest when not using GOSSIP.
- * See org.apache.cassandra.distributed.impl.Instance#initializeRing(org.apache.cassandra.distributed.api.ICluster)
++ * See org.apache.cassandra.distributed.impl.Instance#startup(org.apache.cassandra.distributed.api.ICluster)
+ */
+ @VisibleForTesting
+ public void setNormalModeUnsafe()
+ {
+ setMode(Mode.NORMAL, true);
+ }
+
private void setMode(Mode m, boolean log)
{
setMode(m, null, log);
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 4c778f1,50aea0b..2fc7044
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -481,13 -554,7 +481,14 @@@ public class Instance extends IsolatedE
}
else
{
- initializeRing(cluster);
+ cluster.stream().forEach(peer -> {
+ if (cluster instanceof Cluster)
+ GossipHelper.statusToNormal((IInvokableInstance) peer).accept(this);
+ else
+ GossipHelper.unsafeStatusToNormal(this, (IInstance) peer);
+ });
+
++ StorageService.instance.setNormalModeUnsafe();
}
StorageService.instance.ensureTraceKeyspace();
diff --cc test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
index a162ebf,32ecb95..1b6a004
--- a/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
@@@ -19,17 -19,17 +19,13 @@@
package org.apache.cassandra.distributed.test;
import java.io.Closeable;
--import java.net.InetAddress;
import java.util.Collection;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
--import java.util.concurrent.locks.LockSupport;
--import java.util.stream.Collectors;
--import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.Uninterruptibles;
import org.junit.Assert;
import org.junit.Test;
@@@ -39,11 -39,11 +35,7 @@@ import net.bytebuddy.dynamic.loading.Cl
import net.bytebuddy.implementation.MethodDelegation;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.distributed.Cluster;
--import org.apache.cassandra.gms.ApplicationState;
--import org.apache.cassandra.gms.EndpointState;
--import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.service.StorageService;
--import org.apache.cassandra.utils.FBUtilities;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@@ -61,13 -132,13 +53,13 @@@ public class GossipTest extends TestBas
if (nodeNumber != 2)
return;
new ByteBuddy().rebase(StorageService.class)
-- .method(named("bootstrap").and(takesArguments(1)))
++ .method(named("bootstrap").and(takesArguments(2)))
.intercept(MethodDelegation.to(BBBootstrapInterceptor.class))
.make()
.load(cl, ClassLoadingStrategy.Default.INJECTION);
}
-- public static boolean bootstrap(Collection<Token> tokens) throws Exception
++ public static boolean bootstrap(Collection<Token> tokens, long bootstrapTimeoutMillis)
{
bootstrapStart.countDown();
Uninterruptibles.awaitUninterruptibly(bootstrapReady);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org