You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ed...@apache.org on 2021/09/20 21:17:09 UTC
[cassandra] branch trunk updated (bc348c9 -> e9645cc)
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from bc348c9 Merge branch 'cassandra-4.0' into trunk
add 876f7b0 Fix flaky test DatabaseDescriptorRefTest. Patch by Aleksei Zotov; reviewed by Ekaterina Dimitrova and John Meredith for CASSANDRA-16862
add 4018084 Merge branch 'cassandra-3.11' into cassandra-4.0
new e9645cc Merge branch 'cassandra-4.0' 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:
.../config/DatabaseDescriptorRefTest.java | 38 ++++++++++++++++------
1 file changed, 28 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-4.0' into trunk
Posted by ed...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e9645cc7a4e189b58eb0ba20269dfaec9b46da29
Merge: bc348c9 4018084
Author: Ekaterina Dimitrova <ek...@datastax.com>
AuthorDate: Mon Sep 20 17:10:17 2021 -0400
Merge branch 'cassandra-4.0' into trunk
.../config/DatabaseDescriptorRefTest.java | 38 ++++++++++++++++------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --cc test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java
index f87b046,a832679..2d6132e
--- a/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java
+++ b/test/unit/org/apache/cassandra/config/DatabaseDescriptorRefTest.java
@@@ -35,8 -35,8 +35,9 @@@ import java.util.HashSet
import java.util.List;
import java.util.Map;
import java.util.Set;
+ import java.util.stream.Collectors;
+import com.google.common.base.Throwables;
import org.junit.Test;
import org.apache.cassandra.utils.Pair;
@@@ -272,16 -293,9 +297,9 @@@ public class DatabaseDescriptorRefTes
// starts "REQUEST-SCHEDULER" thread via RoundRobinScheduler
})
{
- Method method = cDatabaseDescriptor.getDeclaredMethod(methodName);
+ Method method = databaseDescriptorClass.getDeclaredMethod(methodName);
method.invoke(null);
-
+
- if ("clientInitialization".equals(methodName) &&
- threadCount + 2 == threads.getThreadCount())
- {
- // ignore the "AsyncAppender-Worker-ASYNC" and "logback-1" threads
- threadCount = threadCount + 2;
- }
-
if (threadCount != threads.getThreadCount())
{
for (ThreadInfo threadInfo : threads.getThreadInfo(threads.getAllThreadIds()))
@@@ -297,15 -311,15 +315,15 @@@
{
if (!violations.isEmpty())
{
+ StringBuilder sb = new StringBuilder();
for (Pair<String, Exception> violation : new ArrayList<>(violations))
- {
- err.println();
- err.println();
- err.println("VIOLATION: " + violation.left);
- violation.right.printStackTrace(err);
- }
+ sb.append("\n\n")
- .append("VIOLATION: ").append(violation.left).append("\n")
++ .append("VIOLATION: ").append(violation.left).append('\n')
+ .append(Throwables.getStackTraceAsString(violation.right));
+ String msg = sb.toString();
+ err.println(msg);
- fail();
+ fail(msg);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org