This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new a4af55f Flaky AlibabaCloudSnitchTest
new 1af4c42 Merge branch 'cassandra-4.0.0' into cassandra-4.0
a4af55f is described below
commit a4af55fe2af836904004c4db1aa6a87cea18ee92
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Fri Jun 18 10:25:33 2021 +0200
Flaky AlibabaCloudSnitchTest
patch by Berenguer Blasi; reviewed by Ekaterina Dimitrova for
CASSANDRA-16750
---
.../apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java | 3 ++-
test/unit/org/apache/cassandra/locator/AlibabaCloudSnitchTest.java | 1 +
test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java | 1 +
test/unit/org/apache/cassandra/locator/EC2SnitchTest.java | 1 +
test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java | 1 +
5 files changed, 6 insertions(+), 1 deletion(-)
diff --git
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
index 848c6e0..28462ff 100755
---
a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
+++
b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
@@ -443,7 +443,8 @@ public abstract class AbstractCommitLogSegmentManager
/**
* To be used by tests only. Not safe if mutation slots are being
allocated concurrently.
*/
- void awaitManagementTasksCompletion()
+ @VisibleForTesting
+ public void awaitManagementTasksCompletion()
{
if (availableSegment == null && !atSegmentBufferLimit())
{
diff --git a/test/unit/org/apache/cassandra/locator/AlibabaCloudSnitchTest.java
b/test/unit/org/apache/cassandra/locator/AlibabaCloudSnitchTest.java
index fb85a23..04540cf 100644
--- a/test/unit/org/apache/cassandra/locator/AlibabaCloudSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/AlibabaCloudSnitchTest.java
@@ -48,6 +48,7 @@ public class AlibabaCloudSnitchTest
System.setProperty(Gossiper.Props.DISABLE_THREAD_VALIDATION, "true");
DatabaseDescriptor.daemonInitialization();
CommitLog.instance.start();
+ CommitLog.instance.segmentManager.awaitManagementTasksCompletion();
mkdirs();
cleanup();
Keyspace.setInitialized();
diff --git a/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java
b/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java
index 9e39c48..51e8371 100644
--- a/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java
@@ -49,6 +49,7 @@ public class CloudstackSnitchTest
System.setProperty(Gossiper.Props.DISABLE_THREAD_VALIDATION, "true");
DatabaseDescriptor.daemonInitialization();
CommitLog.instance.start();
+ CommitLog.instance.segmentManager.awaitManagementTasksCompletion();
mkdirs();
cleanup();
Keyspace.setInitialized();
diff --git a/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java
b/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java
index f05f4a2..69c1287 100644
--- a/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/EC2SnitchTest.java
@@ -63,6 +63,7 @@ public class EC2SnitchTest
System.setProperty(Gossiper.Props.DISABLE_THREAD_VALIDATION, "true");
DatabaseDescriptor.daemonInitialization();
CommitLog.instance.start();
+ CommitLog.instance.segmentManager.awaitManagementTasksCompletion();
mkdirs();
cleanup();
Keyspace.setInitialized();
diff --git a/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java
b/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java
index e524f3a..67192bd 100644
--- a/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java
+++ b/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java
@@ -50,6 +50,7 @@ public class GoogleCloudSnitchTest
System.setProperty(Gossiper.Props.DISABLE_THREAD_VALIDATION, "true");
DatabaseDescriptor.daemonInitialization();
CommitLog.instance.start();
+ CommitLog.instance.segmentManager.awaitManagementTasksCompletion();
mkdirs();
cleanup();
Keyspace.setInitialized();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
