You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jo...@apache.org on 2022/06/30 19:44:53 UTC
[cassandra] branch trunk updated (21591cf830 -> 9c411d3f1a)
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 21591cf830 Merge branch 'cassandra-4.1' into trunk
new 008bf8607c Disable mock internode messaging during startup/shutdown
new 5e4eeb2d0c Merge branch 'cassandra-4.0' into cassandra-4.1
new 9c411d3f1a Merge branch 'cassandra-4.1' 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:
.../cassandra/distributed/action/GossipHelper.java | 12 ++++-
.../distributed/impl/AbstractCluster.java | 2 +
.../cassandra/distributed/impl/Instance.java | 62 +++++++++++++++++++++-
3 files changed, 72 insertions(+), 4 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-4.1' into trunk
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jonmeredith pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9c411d3f1ae6617380786cd5423151ee645ec209
Merge: 21591cf830 5e4eeb2d0c
Author: Jon Meredith <jo...@apache.org>
AuthorDate: Thu Jun 30 13:37:07 2022 -0600
Merge branch 'cassandra-4.1' into trunk
.../cassandra/distributed/action/GossipHelper.java | 12 ++++-
.../distributed/impl/AbstractCluster.java | 2 +
.../cassandra/distributed/impl/Instance.java | 62 +++++++++++++++++++++-
3 files changed, 72 insertions(+), 4 deletions(-)
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 20935907ea,a9cede1fb8..6c0c314e0d
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -634,7 -659,11 +659,12 @@@ public class Instance extends IsolatedE
}
registerInboundFilter(cluster);
registerOutboundFilter(cluster);
+ if (!config.has(NETWORK))
+ {
+ propagateMessagingVersions(cluster); // fake messaging needs to know messaging version for filters
+ }
+ internodeMessagingStarted = true;
+
JVMStabilityInspector.replaceKiller(new InstanceKiller(Instance.this::shutdown));
// TODO: this is more than just gossip
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org