You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2021/01/28 14:37:34 UTC
[cassandra] branch trunk updated (91cb934 -> b55d830)
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 91cb934 In cqlshlib tests, don't overwrite the environment and improve hostname matching
add 2762499 Fix schema agreement race conditions in in-JVM dtests
add 88e7430 Merge branch 'cassandra-2.2' into cassandra-3.0
add 24d133e Merge branch 'cassandra-3.0' into cassandra-3.11
new b55d830 Merge branch 'cassandra-3.11' into trunk
The 1 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:
.../distributed/impl/AbstractCluster.java | 24 +++++++++++++---------
.../cassandra/distributed/impl/Instance.java | 6 ++++++
2 files changed, 20 insertions(+), 10 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 if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b55d830b093016cf364a6e8999175e1e3665348d
Merge: 91cb934 24d133e
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Thu Jan 28 15:34:02 2021 +0100
Merge branch 'cassandra-3.11' into trunk
.../distributed/impl/AbstractCluster.java | 24 +++++++++++++---------
.../cassandra/distributed/impl/Instance.java | 6 ++++++
2 files changed, 20 insertions(+), 10 deletions(-)
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 7c94a21,c28493d..b0a6c3f
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -139,7 -128,7 +139,8 @@@ import static org.apache.cassandra.dist
public class Instance extends IsolatedExecutor implements IInvokableInstance
{
public final IInstanceConfig config;
+ private volatile boolean initialized = false;
+ private final long startedAt = System.nanoTime();
// should never be invoked directly, so that it is instantiated on other class loader;
// only visible for inheritance
@@@ -533,9 -585,10 +534,11 @@@
throw new RuntimeException(t);
}
}).run();
+
+ initialized = true;
}
+
private void mkdirs()
{
new File(config.getString("saved_caches_directory")).mkdirs();
@@@ -694,9 -748,11 +697,12 @@@
.thenRun(super::shutdown);
}
+ @Override
public int liveMemberCount()
{
+ if (!initialized || isShutdown())
+ return 0;
+
return sync(() -> {
if (!DatabaseDescriptor.isDaemonInitialized() || !Gossiper.instance.isEnabled())
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org