You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by dc...@apache.org on 2020/10/06 02:07:36 UTC
[cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0
This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5a2b5a4e5eb768b459e3795b6f814baefad9c0f1
Merge: 31b9078 4d173e0
Author: David Capwell <dc...@apache.org>
AuthorDate: Mon Oct 5 19:03:32 2020 -0700
Merge branch 'cassandra-2.2' into cassandra-3.0
build.xml | 2 +-
.../distributed/impl/AbstractCluster.java | 36 +++++++++++++++++++++-
.../impl/DelegatingInvokableInstance.java | 1 +
.../cassandra/distributed/impl/Instance.java | 2 +-
.../cassandra/distributed/impl/InstanceConfig.java | 13 ++++++--
.../distributed/shared/ShutdownException.java | 30 ++++++++++++++++++
.../distributed/test/NetworkTopologyTest.java | 15 +++++----
7 files changed, 88 insertions(+), 11 deletions(-)
diff --cc test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
index 3cb8dac,9793add..4b880e4
--- a/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/AbstractCluster.java
@@@ -610,10 -619,22 +619,22 @@@ public abstract class AbstractCluster<
handler.uncaughtException(thread, error);
return;
}
+
InstanceClassLoader cl = (InstanceClassLoader) thread.getContextClassLoader();
get(cl.getInstanceId()).uncaughtException(thread, error);
+
+ BiPredicate<Integer, Throwable> ignore = ignoreUncaughtThrowable;
+ I instance = get(cl.getInstanceId());
+ if ((ignore == null || !ignore.test(cl.getInstanceId(), error)) && instance != null && !instance.isShutdown())
+ uncaughtExceptions.add(error);
+ }
+
+ @Override
+ public void setUncaughtExceptionsFilter(BiPredicate<Integer, Throwable> ignoreUncaughtThrowable)
+ {
+ this.ignoreUncaughtThrowable = ignoreUncaughtThrowable;
}
-
+
@Override
public void close()
{
diff --cc test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
index cfdcc80,4e8a782..ea8d0f8
--- a/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
@@@ -271,9 -271,9 +271,9 @@@ public class InstanceConfig implements
ipAddress,
seedIp,
String.format("%s/node%d/saved_caches", root, nodeNum),
- new String[] { String.format("%s/node%d/data", root, nodeNum) },
+ datadirs(datadirCount, root, nodeNum),
String.format("%s/node%d/commitlog", root, nodeNum),
-// String.format("%s/node%d/hints", root, nodeNum),
+ String.format("%s/node%d/hints", root, nodeNum),
// String.format("%s/node%d/cdc", root, nodeNum),
token);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org