This is an automated email from the ASF dual-hosted git repository.
blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 453a763 Fix ValidationExecutorTest flakiness
453a763 is described below
commit 453a763b6e3fc04f4d647e6c9a923875411f8007
Author: Bereng <[email protected]>
AuthorDate: Fri Mar 19 09:46:00 2021 +0100
Fix ValidationExecutorTest flakiness
patch by Berenguer Blasi; reviewed by Andrés de la Peña and Benjamin Lerer
for CASSANDRA-16527
---
.../org/apache/cassandra/db/compaction/ValidationExecutorTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/test/unit/org/apache/cassandra/db/compaction/ValidationExecutorTest.java
b/test/unit/org/apache/cassandra/db/compaction/ValidationExecutorTest.java
index a175bdd..aef4bb6 100644
--- a/test/unit/org/apache/cassandra/db/compaction/ValidationExecutorTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/ValidationExecutorTest.java
@@ -26,10 +26,12 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Condition;
import com.google.common.util.concurrent.Uninterruptibles;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.cassandra.Util;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.utils.concurrent.SimpleCondition;
@@ -79,7 +81,8 @@ public class ValidationExecutorTest
while (threadsAvailable.get() > 0)
TimeUnit.MILLISECONDS.sleep(10);
- assertEquals(2, validationExecutor.getActiveTaskCount());
+ // getActiveTaskCount() relies on getActiveCount() which gives an
approx number so we poll it
+ Util.spinAssertEquals(2, () ->
validationExecutor.getActiveTaskCount(), 1);
assertEquals(3, validationExecutor.getPendingTaskCount());
taskBlocked.signalAll();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
