You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2020/05/04 15:00:48 UTC
[cassandra] branch trunk updated: Fix flakiness of
org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoirTest#testStriping
and apply the same "fix" to other tests
This is an automated email from the ASF dual-hosted git repository.
snazy 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 df8e736 Fix flakiness of org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoirTest#testStriping and apply the same "fix" to other tests
df8e736 is described below
commit df8e736700ae2a06675ff50381788d708bc22b96
Author: Robert Stupp <sn...@snazy.de>
AuthorDate: Sun May 3 18:22:46 2020 +0200
Fix flakiness of org.apache.cassandra.metrics.DecayingEstimatedHistogramReservoirTest#testStriping and apply the same "fix" to other tests
Patch by Robert Stupp; reviewed by Eduard Tudenhöfner for CASSANDRA-15781
---
test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java | 2 +-
.../org/apache/cassandra/db/commitlog/CommitLogUpgradeTestMaker.java | 3 ++-
.../org/apache/cassandra/db/compaction/CompactionExecutorTest.java | 3 ++-
test/unit/org/apache/cassandra/db/monitoring/MonitoringTaskTest.java | 2 +-
test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java | 2 +-
test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java | 3 ++-
.../cassandra/metrics/DecayingEstimatedHistogramReservoirTest.java | 3 ++-
test/unit/org/apache/cassandra/net/ConnectionTest.java | 2 +-
test/unit/org/apache/cassandra/utils/StatusLoggerTest.java | 3 ++-
test/unit/org/apache/cassandra/utils/UUIDTests.java | 3 ++-
10 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
index 7f8bcba..71c1d62 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
@@ -1364,7 +1364,7 @@ public class JsonTest extends CQLTester
future.get(30, TimeUnit.SECONDS);
executor.shutdown();
- Assert.assertTrue(executor.awaitTermination(30, TimeUnit.SECONDS));
+ Assert.assertTrue(executor.awaitTermination(1, TimeUnit.MINUTES));
}
@Test
diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTestMaker.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTestMaker.java
index d2ad42f..680a0e7 100644
--- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTestMaker.java
+++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTestMaker.java
@@ -33,6 +33,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import com.google.common.util.concurrent.RateLimiter;
+import org.junit.Assert;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
@@ -110,7 +111,7 @@ public class CommitLogUpgradeTestMaker
Thread.sleep(runTimeMs);
stop = true;
scheduled.shutdown();
- scheduled.awaitTermination(2, TimeUnit.SECONDS);
+ Assert.assertTrue(scheduled.awaitTermination(1, TimeUnit.MINUTES));
int hash = 0;
int cells = 0;
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
index 2f8b5b2..ab3d9e5 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionExecutorTest.java
@@ -22,6 +22,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor;
@@ -62,7 +63,7 @@ public class CompactionExecutorTest
public void destroy() throws Exception
{
executor.shutdown();
- executor.awaitTermination(1, TimeUnit.MINUTES);
+ Assert.assertTrue(executor.awaitTermination(1, TimeUnit.MINUTES));
}
@Test
diff --git a/test/unit/org/apache/cassandra/db/monitoring/MonitoringTaskTest.java b/test/unit/org/apache/cassandra/db/monitoring/MonitoringTaskTest.java
index 454d0b4..dc8c317 100644
--- a/test/unit/org/apache/cassandra/db/monitoring/MonitoringTaskTest.java
+++ b/test/unit/org/apache/cassandra/db/monitoring/MonitoringTaskTest.java
@@ -276,7 +276,7 @@ public class MonitoringTaskTest
}
executorService.shutdown();
- assertTrue(executorService.awaitTermination(30, TimeUnit.SECONDS));
+ assertTrue(executorService.awaitTermination(1, TimeUnit.MINUTES));
assertEquals(opCount, operations.size());
waitForOperationsToComplete(operations);
diff --git a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
index c64bec9..3508d76 100644
--- a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
+++ b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java
@@ -1121,7 +1121,7 @@ public class SASIIndexTest
Assert.assertEquals(writeCount, rows.size());
} finally {
scheduler.shutdownNow();
- scheduler.awaitTermination(30, TimeUnit.SECONDS);
+ Assert.assertTrue(scheduler.awaitTermination(1, TimeUnit.MINUTES));
}
}
diff --git a/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java
index d1dc35d..74a4e8d 100644
--- a/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java
@@ -36,6 +36,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -494,7 +495,7 @@ public class RandomAccessReaderTest
executor.submit(worker);
executor.shutdown();
- executor.awaitTermination(1, TimeUnit.MINUTES);
+ Assert.assertTrue(executor.awaitTermination(1, TimeUnit.MINUTES));
}
}
}
diff --git a/test/unit/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoirTest.java b/test/unit/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoirTest.java
index e4289f7..b62078c 100644
--- a/test/unit/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoirTest.java
+++ b/test/unit/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoirTest.java
@@ -26,6 +26,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.LockSupport;
+import org.assertj.core.api.Assertions;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -157,7 +158,7 @@ public class DecayingEstimatedHistogramReservoirTest
}
executors.shutdown();
- executors.awaitTermination(10, TimeUnit.SECONDS);
+ Assert.assertTrue(executors.awaitTermination(1, TimeUnit.MINUTES));
Snapshot modelSnapshot = model.getSnapshot();
Snapshot testSnapshot = test.getSnapshot();
diff --git a/test/unit/org/apache/cassandra/net/ConnectionTest.java b/test/unit/org/apache/cassandra/net/ConnectionTest.java
index c507a80..e92f196 100644
--- a/test/unit/org/apache/cassandra/net/ConnectionTest.java
+++ b/test/unit/org/apache/cassandra/net/ConnectionTest.java
@@ -817,7 +817,7 @@ public class ConnectionTest
submitOrder.forEach(executor::submit);
executor.shutdown();
- executor.awaitTermination(10, TimeUnit.SECONDS);
+ Assert.assertTrue(executor.awaitTermination(1, TimeUnit.MINUTES));
Assert.assertEquals(acquireCount * acquireStep - (acquisitionFailures.get() * acquireStep), outbound.pendingBytes());
Assert.assertEquals(acquireCount - acquisitionFailures.get(), outbound.pendingCount());
diff --git a/test/unit/org/apache/cassandra/utils/StatusLoggerTest.java b/test/unit/org/apache/cassandra/utils/StatusLoggerTest.java
index 878e6e8..683d2ed 100644
--- a/test/unit/org/apache/cassandra/utils/StatusLoggerTest.java
+++ b/test/unit/org/apache/cassandra/utils/StatusLoggerTest.java
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import com.google.common.collect.Range;
+import org.junit.Assert;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +71,7 @@ public class StatusLoggerTest extends CQLTester
executorService.submit(StatusLogger::log);
executorService.submit(StatusLogger::log);
executorService.shutdown();
- executorService.awaitTermination(1, TimeUnit.SECONDS);
+ Assert.assertTrue(executorService.awaitTermination(1, TimeUnit.MINUTES));
}
private void verifyOnlySingleStatusWasAppendedConcurrently(List<ILoggingEvent> events)
diff --git a/test/unit/org/apache/cassandra/utils/UUIDTests.java b/test/unit/org/apache/cassandra/utils/UUIDTests.java
index 0d57c47..a0f55ad 100644
--- a/test/unit/org/apache/cassandra/utils/UUIDTests.java
+++ b/test/unit/org/apache/cassandra/utils/UUIDTests.java
@@ -29,6 +29,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Assert;
import org.junit.Test;
import com.google.common.collect.Sets;
@@ -135,7 +136,7 @@ public class UUIDTests
es.execute(task);
}
es.shutdown();
- es.awaitTermination(10, TimeUnit.MINUTES);
+ Assert.assertTrue(es.awaitTermination(1, TimeUnit.MINUTES));
assert !failedOrdering.get();
assert !failedDuplicate.get();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org