This is an automated email from the ASF dual-hosted git repository. jihoonson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push: new 948e73d Extend various test timeouts. (#5978) 948e73d is described below commit 948e73da7713409fbf8b3fd8fc8b497ec5bef05f Author: Gian Merlino <gianmerl...@gmail.com> AuthorDate: Tue Jul 10 13:02:15 2018 -0700 Extend various test timeouts. (#5978) False failures on Travis due to spurious timeout (in turn due to noisy neighbors) is a bigger problem than legitimate failures taking too long to time out. So it makes sense to extend timeouts. --- .../java/io/druid/collections/BlockingPoolTest.java | 18 +++++++++--------- .../ReferenceCountingResourceHolderTest.java | 4 ++-- .../test/java/io/druid/collections/StupidPoolTest.java | 2 +- .../materializedview/DatasourceOptimizerTest.java | 2 +- .../io/druid/indexing/kafka/KafkaIndexTaskTest.java | 4 ++-- .../namespace/NamespacedExtractorModuleTest.java | 2 +- .../server/lookup/namespace/UriCacheGeneratorTest.java | 2 +- .../lookup/namespace/cache/CacheSchedulerTest.java | 14 +++++++------- .../namespace/cache/JdbcExtractionNamespaceTest.java | 6 +++--- .../cache/NamespaceExtractionCacheManagersTest.java | 4 ++-- .../indexing/common/actions/LockAcquireActionTest.java | 4 ++-- .../common/actions/LockTryAcquireActionTest.java | 4 ++-- .../indexing/overlord/OverlordBlinkLeadershipTest.java | 2 +- ...RemoteTaskRunnerRunPendingTasksConcurrencyTest.java | 2 +- .../indexing/overlord/TaskLockBoxConcurrencyTest.java | 4 ++-- .../io/druid/indexing/overlord/TaskLockboxTest.java | 2 +- .../overlord/hrtr/HttpRemoteTaskRunnerTest.java | 12 ++++++------ .../io/druid/indexing/overlord/http/OverlordTest.java | 2 +- .../druid/indexing/worker/WorkerTaskManagerTest.java | 2 +- .../druid/indexing/worker/WorkerTaskMonitorTest.java | 8 ++++---- .../concurrent/ConcurrentAwaitableCounterTest.java | 2 +- .../io/druid/java/util/emitter/core/EmitterTest.java | 2 +- .../io/druid/java/util/metrics/JvmMonitorTest.java | 2 +- .../druid/query/ChainedExecutionQueryRunnerTest.java | 4 ++-- .../query/groupby/GroupByQueryRunnerFailureTest.java | 6 +++--- .../epinephelinae/StreamingMergeSortedGrouperTest.java | 6 +++--- .../io/druid/segment/data/CompressionStrategyTest.java | 2 +- .../io/druid/client/HttpServerInventoryViewTest.java | 2 +- .../test/java/io/druid/curator/CuratorUtilsTest.java | 8 ++++---- .../discovery/CuratorDruidLeaderSelectorTest.java | 2 +- .../CuratorDruidNodeAnnouncerAndDiscoveryTest.java | 2 +- .../metadata/SQLMetadataStorageActionHandlerTest.java | 2 +- .../query/lookup/LookupReferencesManagerTest.java | 2 +- .../io/druid/segment/realtime/RealtimeManagerTest.java | 10 +++++----- .../realtime/appenderator/AppenderatorTest.java | 2 +- .../appenderator/StreamAppenderatorDriverTest.java | 4 ++-- .../realtime/firehose/EventReceiverFirehoseTest.java | 4 ++-- .../realtime/plumber/RealtimePlumberSchoolTest.java | 10 +++++----- .../druid/server/AsyncQueryForwardingServletTest.java | 2 +- .../io/druid/server/audit/SQLAuditManagerTest.java | 10 +++++----- .../coordination/ChangeRequestHttpSyncerTest.java | 2 +- .../coordination/SegmentLoadDropHandlerTest.java | 2 +- .../druid/server/coordination/ZkCoordinatorTest.java | 2 +- .../coordinator/CuratorDruidCoordinatorTest.java | 2 +- .../server/coordinator/HttpLoadQueuePeonTest.java | 4 ++-- .../initialization/jetty/LimitRequestsFilterTest.java | 2 +- .../lookup/cache/LookupCoordinatorManagerTest.java | 2 +- .../io/druid/sql/avatica/DruidAvaticaHandlerTest.java | 2 +- 48 files changed, 101 insertions(+), 101 deletions(-) diff --git a/common/src/test/java/io/druid/collections/BlockingPoolTest.java b/common/src/test/java/io/druid/collections/BlockingPoolTest.java index a1d673a..409ee47 100644 --- a/common/src/test/java/io/druid/collections/BlockingPoolTest.java +++ b/common/src/test/java/io/druid/collections/BlockingPoolTest.java @@ -79,7 +79,7 @@ public class BlockingPoolTest emptyPool.takeBatch(1, 0); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testTake() { final ReferenceCountingResourceHolder<Integer> holder = pool.take(100); @@ -89,7 +89,7 @@ public class BlockingPoolTest assertEquals(10, pool.getPoolSize()); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testTakeTimeout() { final List<ReferenceCountingResourceHolder<Integer>> batchHolder = pool.takeBatch(10, 100L); @@ -98,7 +98,7 @@ public class BlockingPoolTest batchHolder.forEach(ReferenceCountingResourceHolder::close); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testTakeBatch() { final List<ReferenceCountingResourceHolder<Integer>> holder = pool.takeBatch(6, 100L); @@ -109,7 +109,7 @@ public class BlockingPoolTest assertEquals(10, pool.getPoolSize()); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testWaitAndTakeBatch() throws InterruptedException, ExecutionException { List<ReferenceCountingResourceHolder<Integer>> batchHolder = pool.takeBatch(10, 10); @@ -132,14 +132,14 @@ public class BlockingPoolTest assertEquals(10, pool.getPoolSize()); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testTakeBatchTooManyObjects() { final List<ReferenceCountingResourceHolder<Integer>> holder = pool.takeBatch(100, 100L); assertTrue(holder.isEmpty()); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testConcurrentTake() throws ExecutionException, InterruptedException { final int limit1 = pool.maxSize() / 2; @@ -225,7 +225,7 @@ public class BlockingPoolTest assertEquals(pool.maxSize(), pool.getPoolSize()); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testConcurrentTakeBatch() throws ExecutionException, InterruptedException { final int batch1 = pool.maxSize() / 2; @@ -255,7 +255,7 @@ public class BlockingPoolTest assertEquals(pool.maxSize(), pool.getPoolSize()); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testConcurrentBatchClose() throws ExecutionException, InterruptedException { final int batch1 = pool.maxSize() / 2; @@ -299,7 +299,7 @@ public class BlockingPoolTest assertEquals(pool.maxSize(), pool.getPoolSize()); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testConcurrentTakeBatchClose() throws ExecutionException, InterruptedException { final List<ReferenceCountingResourceHolder<Integer>> r1 = pool.takeBatch(1, 10); diff --git a/common/src/test/java/io/druid/collections/ReferenceCountingResourceHolderTest.java b/common/src/test/java/io/druid/collections/ReferenceCountingResourceHolderTest.java index 4321e2b..2a36e34 100644 --- a/common/src/test/java/io/druid/collections/ReferenceCountingResourceHolderTest.java +++ b/common/src/test/java/io/druid/collections/ReferenceCountingResourceHolderTest.java @@ -83,7 +83,7 @@ public class ReferenceCountingResourceHolderTest }); } - @Test(timeout = 60_000) + @Test(timeout = 60_000L) public void testResourceHandlerClearedByJVM() throws InterruptedException { long initialLeakedResources = ReferenceCountingResourceHolder.leakedResources(); @@ -92,7 +92,7 @@ public class ReferenceCountingResourceHolderTest verifyCleanerRun(released, initialLeakedResources); } - @Test(timeout = 60_000) + @Test(timeout = 60_000L) public void testResourceHandlerWithReleaserClearedByJVM() throws InterruptedException { long initialLeakedResources = ReferenceCountingResourceHolder.leakedResources(); diff --git a/common/src/test/java/io/druid/collections/StupidPoolTest.java b/common/src/test/java/io/druid/collections/StupidPoolTest.java index 3cfdc3b..2a4d138 100644 --- a/common/src/test/java/io/druid/collections/StupidPoolTest.java +++ b/common/src/test/java/io/druid/collections/StupidPoolTest.java @@ -68,7 +68,7 @@ public class StupidPoolTest resourceHolderObj.get(); } - @Test(timeout = 60_000) + @Test(timeout = 60_000L) public void testResourceHandlerClearedByJVM() throws InterruptedException { String leakedString = createDanglingObjectHandler(); diff --git a/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/DatasourceOptimizerTest.java b/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/DatasourceOptimizerTest.java index 0d34cfe..b8a338f 100644 --- a/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/DatasourceOptimizerTest.java +++ b/extensions-contrib/materialized-view-selection/src/test/java/io/druid/query/materializedview/DatasourceOptimizerTest.java @@ -133,7 +133,7 @@ public class DatasourceOptimizerTest extends CuratorTestBase tearDownServerAndCurator(); } - @Test(timeout = 10 * 1000) + @Test(timeout = 60_000L) public void testOptimize() throws InterruptedException { // insert datasource metadata diff --git a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskTest.java b/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskTest.java index f76788d..965651c 100644 --- a/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskTest.java +++ b/extensions-core/kafka-indexing-service/src/test/java/io/druid/indexing/kafka/KafkaIndexTaskTest.java @@ -1641,7 +1641,7 @@ public class KafkaIndexTaskTest Assert.assertEquals(ImmutableList.of("d", "e"), readSegmentColumn("dim1", desc2)); } - @Test(timeout = 30_000L) + @Test(timeout = 60_000L) public void testRunWithOffsetOutOfRangeExceptionAndPause() throws Exception { final KafkaIndexTask task = createTask( @@ -1671,7 +1671,7 @@ public class KafkaIndexTaskTest } } - @Test(timeout = 30_000L) + @Test(timeout = 60_000L) public void testRunWithOffsetOutOfRangeExceptionAndNextOffsetGreaterThanLeastAvailable() throws Exception { resetOffsetAutomatically = true; diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java index d3e9d84..f2d1a5b 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/NamespacedExtractorModuleTest.java @@ -136,7 +136,7 @@ public class NamespacedExtractorModuleTest } } - @Test//(timeout = 10_000) + @Test//(timeout = 60_000L) public void testDeleteNamespaces() throws Exception { final File tmpFile = temporaryFolder.newFile(); diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/UriCacheGeneratorTest.java b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/UriCacheGeneratorTest.java index f77d2be..b5216d2 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/UriCacheGeneratorTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/UriCacheGeneratorTest.java @@ -507,7 +507,7 @@ public class UriCacheGeneratorTest Assert.assertNotNull(generator.generateCache(extractionNamespace, null, null, scheduler)); } - @Test(timeout = 10_000) + @Test(timeout = 60_000L) public void testDeleteOnScheduleFail() throws Exception { Assert.assertNull(scheduler.scheduleAndWait( diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/CacheSchedulerTest.java b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/CacheSchedulerTest.java index 2bfff06..dd14285 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/CacheSchedulerTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/CacheSchedulerTest.java @@ -180,7 +180,7 @@ public class CacheSchedulerTest lifecycle.stop(); } - @Test(timeout = 10_000) + @Test(timeout = 60_000L) public void testSimpleSubmission() throws InterruptedException { UriExtractionNamespace namespace = new UriExtractionNamespace( @@ -199,7 +199,7 @@ public class CacheSchedulerTest Assert.assertEquals("val", cache.get("key")); } - @Test(timeout = 10_000) + @Test(timeout = 60_000L) public void testPeriodicUpdatesScheduled() throws InterruptedException { final int repeatCount = 5; @@ -233,7 +233,7 @@ public class CacheSchedulerTest } - @Test(timeout = 10_000) // This is very fast when run locally. Speed on Travis completely depends on noisy neighbors. + @Test(timeout = 60_000L) // This is very fast when run locally. Speed on Travis completely depends on noisy neighbors. public void testConcurrentAddDelete() throws InterruptedException { final int threads = 10; @@ -306,7 +306,7 @@ public class CacheSchedulerTest checkNoMoreRunning(); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testSimpleDelete() throws InterruptedException { testDelete(); @@ -355,7 +355,7 @@ public class CacheSchedulerTest ); } - @Test(timeout = 10_000) + @Test(timeout = 60_000L) public void testShutdown() throws InterruptedException { @@ -389,7 +389,7 @@ public class CacheSchedulerTest Assert.assertTrue(cacheManager.scheduledExecutorService().isTerminated()); } - @Test(timeout = 10_000) + @Test(timeout = 60_000L) public void testRunCount() throws InterruptedException { final int numWaits = 5; @@ -415,7 +415,7 @@ public class CacheSchedulerTest * Tests that even if entry.close() wasn't called, the scheduled task is cancelled when the entry becomes * unreachable. */ - @Test(timeout = 60_000) + @Test(timeout = 60_000L) public void testEntryCloseForgotten() throws InterruptedException { scheduleDanglingEntry(); diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java index f44385b..ccc04da 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/JdbcExtractionNamespaceTest.java @@ -362,7 +362,7 @@ public class JdbcExtractionNamespaceTest Thread.sleep(2); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testMappingWithoutFilter() throws InterruptedException { @@ -389,7 +389,7 @@ public class JdbcExtractionNamespaceTest } } - @Test(timeout = 20_000L) + @Test(timeout = 60_000L) public void testMappingWithFilter() throws InterruptedException { @@ -421,7 +421,7 @@ public class JdbcExtractionNamespaceTest } } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testSkipOld() throws InterruptedException { diff --git a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java index 66d94d1..3d2d5ae 100644 --- a/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java +++ b/extensions-core/lookups-cached-global/src/test/java/io/druid/server/lookup/namespace/cache/NamespaceExtractionCacheManagersTest.java @@ -70,7 +70,7 @@ public class NamespaceExtractionCacheManagersTest manager = createCacheManager.apply(lifecycle); } - @Test(timeout = 30000L) + @Test(timeout = 60_000L) public void testRacyCreation() throws Exception { final int concurrentThreads = 10; @@ -116,7 +116,7 @@ public class NamespaceExtractionCacheManagersTest /** * Tests that even if CacheHandler.close() wasn't called, the cache is cleaned up when it becomes unreachable. */ - @Test(timeout = 60_000) + @Test(timeout = 60_000L) public void testCacheCloseForgotten() throws InterruptedException { Assert.assertEquals(0, manager.cacheCount()); diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/LockAcquireActionTest.java b/indexing-service/src/test/java/io/druid/indexing/common/actions/LockAcquireActionTest.java index 1663871..4fd0f85 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/LockAcquireActionTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/common/actions/LockAcquireActionTest.java @@ -71,7 +71,7 @@ public class LockAcquireActionTest Assert.assertEquals(expected.getTimeoutMs(), actual.getTimeoutMs()); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testWithLockType() { final Task task = NoopTask.create(); @@ -86,7 +86,7 @@ public class LockAcquireActionTest Assert.assertNotNull(lock); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testWithoutLockType() { final Task task = NoopTask.create(); diff --git a/indexing-service/src/test/java/io/druid/indexing/common/actions/LockTryAcquireActionTest.java b/indexing-service/src/test/java/io/druid/indexing/common/actions/LockTryAcquireActionTest.java index 29f06f5..8ee0c0e 100644 --- a/indexing-service/src/test/java/io/druid/indexing/common/actions/LockTryAcquireActionTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/common/actions/LockTryAcquireActionTest.java @@ -67,7 +67,7 @@ public class LockTryAcquireActionTest Assert.assertEquals(expected.getInterval(), actual.getInterval()); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testWithLockType() { final Task task = NoopTask.create(); @@ -81,7 +81,7 @@ public class LockTryAcquireActionTest Assert.assertNotNull(lock); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testWithoutLockType() { final Task task = NoopTask.create(); diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/OverlordBlinkLeadershipTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/OverlordBlinkLeadershipTest.java index 2b54f18..fb79e1f 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/OverlordBlinkLeadershipTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/overlord/OverlordBlinkLeadershipTest.java @@ -69,7 +69,7 @@ public class OverlordBlinkLeadershipTest * org.apache.curator.framework.recipes.leader.LeaderSelectorListener#takeLeadership} implementation in * {@link TaskMaster} and start it again. */ - @Test(timeout = 10_000) + @Test(timeout = 60_000L) public void testOverlordBlinkLeadership() { try { diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java index 9d89034..21f549a 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/overlord/RemoteTaskRunnerRunPendingTasksConcurrencyTest.java @@ -57,7 +57,7 @@ public class RemoteTaskRunnerRunPendingTasksConcurrencyTest } // This task reproduces the races described in https://github.com/druid-io/druid/issues/2842 - @Test(timeout = 60_000) + @Test(timeout = 60_000L) public void testConcurrency() throws Exception { rtrTestUtils.makeWorker("worker0", 3); diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java index 7c73e08..a9bbc17 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockBoxConcurrencyTest.java @@ -82,7 +82,7 @@ public class TaskLockBoxConcurrencyTest service.shutdownNow(); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testDoInCriticalSectionWithDifferentTasks() throws ExecutionException, InterruptedException, EntryExistsException { @@ -163,7 +163,7 @@ public class TaskLockBoxConcurrencyTest Assert.assertTrue(result.isRevoked()); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testDoInCriticalSectionWithOverlappedIntervals() throws Exception { final List<Interval> intervals = ImmutableList.of( diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockboxTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockboxTest.java index 4238459..5318708 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockboxTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/overlord/TaskLockboxTest.java @@ -408,7 +408,7 @@ public class TaskLockboxTest ); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testAcquireLockAfterRevoked() throws EntryExistsException, InterruptedException { final Interval interval = Intervals.of("2017-01-01/2017-01-02"); diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java index c46c120..d696940 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/overlord/hrtr/HttpRemoteTaskRunnerTest.java @@ -79,7 +79,7 @@ public class HttpRemoteTaskRunnerTest Simulates startup of Overlord and Workers being discovered with no previously known tasks. Fresh tasks are given and expected to be completed. */ - @Test(timeout = 30000L) + @Test(timeout = 60_000L) public void testFreshStart() throws Exception { TestDruidNodeDiscovery druidNodeDiscovery = new TestDruidNodeDiscovery(); @@ -167,7 +167,7 @@ public class HttpRemoteTaskRunnerTest Simulates one task not getting acknowledged to be running after assigning it to a worker. But, other tasks are successfully assigned to other worker and get completed. */ - @Test(timeout = 10000L) + @Test(timeout = 60_000L) public void testOneStuckTaskAssignmentDoesntBlockOthers() throws Exception { TestDruidNodeDiscovery druidNodeDiscovery = new TestDruidNodeDiscovery(); @@ -254,7 +254,7 @@ public class HttpRemoteTaskRunnerTest /* Simulates restart of the Overlord where taskRunner, on start, discovers workers with prexisting tasks. */ - @Test(timeout = 10000L) + @Test(timeout = 60_000L) public void testTaskRunnerRestart() throws Exception { TestDruidNodeDiscovery druidNodeDiscovery = new TestDruidNodeDiscovery(); @@ -399,7 +399,7 @@ public class HttpRemoteTaskRunnerTest } - @Test(timeout = 10000L) + @Test(timeout = 60_000L) public void testWorkerDisapperAndReappearBeforeItsCleanup() throws Exception { TestDruidNodeDiscovery druidNodeDiscovery = new TestDruidNodeDiscovery(); @@ -562,7 +562,7 @@ public class HttpRemoteTaskRunnerTest Assert.assertTrue(future2.get().isSuccess()); } - @Test(timeout = 10000L) + @Test(timeout = 60_000L) public void testWorkerDisapperAndReappearAfterItsCleanup() throws Exception { TestDruidNodeDiscovery druidNodeDiscovery = new TestDruidNodeDiscovery(); @@ -725,7 +725,7 @@ public class HttpRemoteTaskRunnerTest Assert.assertTrue(taskRunner.run(task2).get().isFailure()); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testMarkWorkersLazy() throws Exception { TestDruidNodeDiscovery druidNodeDiscovery = new TestDruidNodeDiscovery(); diff --git a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordTest.java b/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordTest.java index ea1d742..468146f 100644 --- a/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/overlord/http/OverlordTest.java @@ -199,7 +199,7 @@ public class OverlordTest EmittingLogger.registerEmitter(serviceEmitter); } - @Test(timeout = 2000L) + @Test(timeout = 60_000L) public void testOverlordRun() throws Exception { // basic task master lifecycle test diff --git a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskManagerTest.java b/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskManagerTest.java index ddf162c..6eac599 100644 --- a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskManagerTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskManagerTest.java @@ -163,7 +163,7 @@ public class WorkerTaskManagerTest workerTaskManager.stop(); } - @Test(timeout = 10000L) + @Test(timeout = 60_000L) public void testTaskRun() throws Exception { Task task1 = createNoopTask("task1-assigned-via-assign-dir"); diff --git a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java b/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java index 0c8781a..f3abe4d 100644 --- a/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java +++ b/indexing-service/src/test/java/io/druid/indexing/worker/WorkerTaskMonitorTest.java @@ -215,7 +215,7 @@ public class WorkerTaskMonitorTest testingCluster.stop(); } - @Test(timeout = 30_000L) + @Test(timeout = 60_000L) public void testRunTask() throws Exception { Assert.assertTrue( @@ -271,7 +271,7 @@ public class WorkerTaskMonitorTest Assert.assertEquals(TaskState.SUCCESS, taskAnnouncement.getTaskStatus().getStatusCode()); } - @Test(timeout = 30_000L) + @Test(timeout = 60_000L) public void testGetAnnouncements() throws Exception { cf.create() @@ -309,7 +309,7 @@ public class WorkerTaskMonitorTest Assert.assertEquals(DUMMY_NODE.getPlaintextPort(), announcements.get(0).getTaskLocation().getPort()); } - @Test(timeout = 30_000L) + @Test(timeout = 60_000L) public void testRestartCleansOldStatus() throws Exception { task = TestTasks.unending("test"); @@ -345,7 +345,7 @@ public class WorkerTaskMonitorTest Assert.assertEquals(TaskState.FAILED, announcements.get(0).getTaskStatus().getStatusCode()); } - @Test(timeout = 30_000L) + @Test(timeout = 60_000L) public void testStatusAnnouncementsArePersistent() throws Exception { cf.create() diff --git a/java-util/src/test/java/io/druid/concurrent/ConcurrentAwaitableCounterTest.java b/java-util/src/test/java/io/druid/concurrent/ConcurrentAwaitableCounterTest.java index c13fa7b..8757571 100644 --- a/java-util/src/test/java/io/druid/concurrent/ConcurrentAwaitableCounterTest.java +++ b/java-util/src/test/java/io/druid/concurrent/ConcurrentAwaitableCounterTest.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; public class ConcurrentAwaitableCounterTest { - @Test(timeout = 1000) + @Test(timeout = 60_000L) public void smokeTest() throws InterruptedException { ConcurrentAwaitableCounter counter = new ConcurrentAwaitableCounter(); diff --git a/java-util/src/test/java/io/druid/java/util/emitter/core/EmitterTest.java b/java-util/src/test/java/io/druid/java/util/emitter/core/EmitterTest.java index 0320c76..fc695ed 100644 --- a/java-util/src/test/java/io/druid/java/util/emitter/core/EmitterTest.java +++ b/java-util/src/test/java/io/druid/java/util/emitter/core/EmitterTest.java @@ -367,7 +367,7 @@ public class EmitterTest Assert.assertTrue("httpClient.succeeded()", httpClient.succeeded()); } - @Test(timeout = 60_000) + @Test(timeout = 60_000L) public void testFailedEmission() throws Exception { final UnitEvent event1 = new UnitEvent("test", 1); diff --git a/java-util/src/test/java/io/druid/java/util/metrics/JvmMonitorTest.java b/java-util/src/test/java/io/druid/java/util/metrics/JvmMonitorTest.java index 1a01a74..3b7b646 100644 --- a/java-util/src/test/java/io/druid/java/util/metrics/JvmMonitorTest.java +++ b/java-util/src/test/java/io/druid/java/util/metrics/JvmMonitorTest.java @@ -31,7 +31,7 @@ import java.util.List; public class JvmMonitorTest { - @Test(timeout = 60000) + @Test(timeout = 60_000L) public void testGcCounts() throws InterruptedException { GcTrackingEmitter emitter = new GcTrackingEmitter(); diff --git a/processing/src/test/java/io/druid/query/ChainedExecutionQueryRunnerTest.java b/processing/src/test/java/io/druid/query/ChainedExecutionQueryRunnerTest.java index f83cf51..d1ad6f0 100644 --- a/processing/src/test/java/io/druid/query/ChainedExecutionQueryRunnerTest.java +++ b/processing/src/test/java/io/druid/query/ChainedExecutionQueryRunnerTest.java @@ -58,7 +58,7 @@ public class ChainedExecutionQueryRunnerTest neverRelease.lock(); } - @Test(timeout = 60000) + @Test(timeout = 60_000L) public void testQueryCancellation() throws Exception { ExecutorService exec = PrioritizedExecutorService.create( @@ -182,7 +182,7 @@ public class ChainedExecutionQueryRunnerTest EasyMock.verify(watcher); } - @Test(timeout = 60000) + @Test(timeout = 60_000L) public void testQueryTimeout() throws Exception { ExecutorService exec = PrioritizedExecutorService.create( diff --git a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java b/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java index 55c05dd..83c632a 100644 --- a/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java +++ b/processing/src/test/java/io/druid/query/groupby/GroupByQueryRunnerFailureTest.java @@ -180,7 +180,7 @@ public class GroupByQueryRunnerFailureTest this.runner = factory.mergeRunners(MoreExecutors.sameThreadExecutor(), ImmutableList.of(runner)); } - @Test(timeout = 10000) + @Test(timeout = 60_000L) public void testNotEnoughMergeBuffersOnQueryable() { expectedException.expect(QueryInterruptedException.class); @@ -209,7 +209,7 @@ public class GroupByQueryRunnerFailureTest GroupByQueryRunnerTestHelper.runQuery(factory, runner, query); } - @Test(timeout = 10000) + @Test(timeout = 60_000L) public void testResourceLimitExceededOnBroker() { expectedException.expect(ResourceLimitExceededException.class); @@ -247,7 +247,7 @@ public class GroupByQueryRunnerFailureTest GroupByQueryRunnerTestHelper.runQuery(factory, runner, query); } - @Test(timeout = 10000, expected = InsufficientResourcesException.class) + @Test(timeout = 60_000L, expected = InsufficientResourcesException.class) public void testInsufficientResourcesOnBroker() { final GroupByQuery query = GroupByQuery diff --git a/processing/src/test/java/io/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java b/processing/src/test/java/io/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java index e66cd77..8045fdc 100644 --- a/processing/src/test/java/io/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java +++ b/processing/src/test/java/io/druid/query/groupby/epinephelinae/StreamingMergeSortedGrouperTest.java @@ -80,7 +80,7 @@ public class StreamingMergeSortedGrouperTest ); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testEmptyIterator() { final TestColumnSelectorFactory columnSelectorFactory = GrouperTestUtil.newColumnSelectorFactory(); @@ -91,13 +91,13 @@ public class StreamingMergeSortedGrouperTest Assert.assertTrue(!grouper.iterator(true).hasNext()); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testStreamingAggregateWithLargeBuffer() throws ExecutionException, InterruptedException { testStreamingAggregate(1024); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testStreamingAggregateWithMinimumBuffer() throws ExecutionException, InterruptedException { testStreamingAggregate(60); diff --git a/processing/src/test/java/io/druid/segment/data/CompressionStrategyTest.java b/processing/src/test/java/io/druid/segment/data/CompressionStrategyTest.java index 7c81786..659f55d 100644 --- a/processing/src/test/java/io/druid/segment/data/CompressionStrategyTest.java +++ b/processing/src/test/java/io/druid/segment/data/CompressionStrategyTest.java @@ -119,7 +119,7 @@ public class CompressionStrategyTest Assert.assertArrayEquals("Uncompressed data does not match", originalData, checkArray); } - @Test(timeout = 60000) + @Test(timeout = 60_000L) public void testConcurrency() throws Exception { final int numThreads = 20; diff --git a/server/src/test/java/io/druid/client/HttpServerInventoryViewTest.java b/server/src/test/java/io/druid/client/HttpServerInventoryViewTest.java index 7f7f888..b1823af 100644 --- a/server/src/test/java/io/druid/client/HttpServerInventoryViewTest.java +++ b/server/src/test/java/io/druid/client/HttpServerInventoryViewTest.java @@ -67,7 +67,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ public class HttpServerInventoryViewTest { - @Test(timeout = 10000) + @Test(timeout = 60_000L) public void testSimple() throws Exception { ObjectMapper jsonMapper = TestHelper.makeJsonMapper(); diff --git a/server/src/test/java/io/druid/curator/CuratorUtilsTest.java b/server/src/test/java/io/druid/curator/CuratorUtilsTest.java index d327868..239ee90 100644 --- a/server/src/test/java/io/druid/curator/CuratorUtilsTest.java +++ b/server/src/test/java/io/druid/curator/CuratorUtilsTest.java @@ -40,7 +40,7 @@ public class CuratorUtilsTest extends CuratorTestBase tearDownServerAndCurator(); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testCreateIfNotExists() throws Exception { curator.start(); @@ -65,7 +65,7 @@ public class CuratorUtilsTest extends CuratorTestBase Assert.assertEquals("baz", StringUtils.fromUtf8(curator.getData().forPath("/foo/bar"))); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testCreateIfNotExistsPayloadTooLarge() throws Exception { curator.start(); @@ -89,7 +89,7 @@ public class CuratorUtilsTest extends CuratorTestBase Assert.assertNull(curator.checkExists().forPath("/foo/bar")); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testCreateOrSet() throws Exception { curator.start(); @@ -116,7 +116,7 @@ public class CuratorUtilsTest extends CuratorTestBase Assert.assertEquals("qux", StringUtils.fromUtf8(curator.getData().forPath("/foo/bar"))); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testCreateOrSetPayloadTooLarge() throws Exception { curator.start(); diff --git a/server/src/test/java/io/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java b/server/src/test/java/io/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java index 8182737..546a203 100644 --- a/server/src/test/java/io/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java +++ b/server/src/test/java/io/druid/curator/discovery/CuratorDruidLeaderSelectorTest.java @@ -47,7 +47,7 @@ public class CuratorDruidLeaderSelectorTest extends CuratorTestBase setupServerAndCurator(); } - @Test(timeout = 15000) + @Test(timeout = 60_000L) public void testSimple() throws Exception { curator.start(); diff --git a/server/src/test/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java b/server/src/test/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java index d3ec923..d8a11a2 100644 --- a/server/src/test/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java +++ b/server/src/test/java/io/druid/curator/discovery/CuratorDruidNodeAnnouncerAndDiscoveryTest.java @@ -52,7 +52,7 @@ public class CuratorDruidNodeAnnouncerAndDiscoveryTest extends CuratorTestBase setupServerAndCurator(); } - @Test(timeout = 5000) + @Test(timeout = 60_000L) public void testAnnouncementAndDiscovery() throws Exception { ObjectMapper objectMapper = new DefaultObjectMapper(); diff --git a/server/src/test/java/io/druid/metadata/SQLMetadataStorageActionHandlerTest.java b/server/src/test/java/io/druid/metadata/SQLMetadataStorageActionHandlerTest.java index 7f4f617..d0466f5 100644 --- a/server/src/test/java/io/druid/metadata/SQLMetadataStorageActionHandlerTest.java +++ b/server/src/test/java/io/druid/metadata/SQLMetadataStorageActionHandlerTest.java @@ -217,7 +217,7 @@ public class SQLMetadataStorageActionHandlerTest } } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testRepeatInsert() throws Exception { final String entryId = "abcd"; diff --git a/server/src/test/java/io/druid/query/lookup/LookupReferencesManagerTest.java b/server/src/test/java/io/druid/query/lookup/LookupReferencesManagerTest.java index a1898e5..843e147 100644 --- a/server/src/test/java/io/druid/query/lookup/LookupReferencesManagerTest.java +++ b/server/src/test/java/io/druid/query/lookup/LookupReferencesManagerTest.java @@ -434,7 +434,7 @@ public class LookupReferencesManagerTest Assert.assertTrue(state.getToDrop().contains("one")); } - @Test(timeout = 20000) + @Test(timeout = 60_000L) public void testRealModeWithMainThread() throws Exception { LookupReferencesManager lookupReferencesManager = new LookupReferencesManager( diff --git a/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java b/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java index 25533ac..81f6700 100644 --- a/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java +++ b/server/src/test/java/io/druid/segment/realtime/RealtimeManagerTest.java @@ -376,7 +376,7 @@ public class RealtimeManagerTest Assert.assertEquals(0, plumber2.getPersistCount()); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testNormalStop() throws InterruptedException { final TestFirehose firehose = new TestFirehose(rows.iterator()); @@ -421,7 +421,7 @@ public class RealtimeManagerTest Assert.assertTrue(plumber2.isFinishedJob()); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testStopByInterruption() { final SleepingFirehose firehose = new SleepingFirehose(); @@ -454,7 +454,7 @@ public class RealtimeManagerTest Assert.assertFalse(plumber.isFinishedJob()); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testQueryWithInterval() throws InterruptedException { List<Row> expectedResults = Arrays.asList( @@ -532,7 +532,7 @@ public class RealtimeManagerTest } } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testQueryWithSegmentSpec() throws InterruptedException { List<Row> expectedResults = Arrays.asList( @@ -611,7 +611,7 @@ public class RealtimeManagerTest } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testQueryWithMultipleSegmentSpec() throws InterruptedException { diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTest.java b/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTest.java index a052583..3b74c71 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTest.java +++ b/server/src/test/java/io/druid/segment/realtime/appenderator/AppenderatorTest.java @@ -414,7 +414,7 @@ public class AppenderatorTest } } - @Test(timeout = 10000L) + @Test(timeout = 60_000L) public void testTotalRowCount() throws Exception { try (final AppenderatorTester tester = new AppenderatorTester(3, true)) { diff --git a/server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java b/server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java index 603d5db..5592a99 100644 --- a/server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java +++ b/server/src/test/java/io/druid/segment/realtime/appenderator/StreamAppenderatorDriverTest.java @@ -126,7 +126,7 @@ public class StreamAppenderatorDriverTest extends EasyMockSupport driver.close(); } - @Test(timeout = 2000L) + @Test(timeout = 60_000L) public void testSimple() throws Exception { final TestCommitterSupplier<Integer> committerSupplier = new TestCommitterSupplier<>(); @@ -204,7 +204,7 @@ public class StreamAppenderatorDriverTest extends EasyMockSupport Assert.assertEquals(numSegments * MAX_ROWS_PER_SEGMENT, segmentsAndMetadata.getCommitMetadata()); } - @Test(timeout = 5000L, expected = TimeoutException.class) + @Test(timeout = 60_000L, expected = TimeoutException.class) public void testHandoffTimeout() throws Exception { final TestCommitterSupplier<Integer> committerSupplier = new TestCommitterSupplier<>(); diff --git a/server/src/test/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java b/server/src/test/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java index ffe066f..02aa14a 100644 --- a/server/src/test/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java +++ b/server/src/test/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseTest.java @@ -241,7 +241,7 @@ public class EventReceiverFirehoseTest ); } - @Test(timeout = 40_000L) + @Test(timeout = 60_000L) public void testShutdownWithPrevTime() throws Exception { EasyMock.expect(req.getAttribute(AuthConfig.DRUID_AUTHORIZATION_CHECKED)) @@ -261,7 +261,7 @@ public class EventReceiverFirehoseTest } } - @Test(timeout = 40_000L) + @Test(timeout = 60_000L) public void testShutdown() throws Exception { EasyMock.expect(req.getAttribute(AuthConfig.DRUID_AUTHORIZATION_CHECKED)) diff --git a/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java b/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java index 5dfc753..f7e1df3 100644 --- a/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java +++ b/server/src/test/java/io/druid/segment/realtime/plumber/RealtimePlumberSchoolTest.java @@ -248,13 +248,13 @@ public class RealtimePlumberSchoolTest FileUtils.deleteDirectory(tmpDir); } - @Test(timeout = 60000) + @Test(timeout = 60_000L) public void testPersist() throws Exception { testPersist(null); } - @Test(timeout = 60000) + @Test(timeout = 60_000L) public void testPersistWithCommitMetadata() throws Exception { final Object commitMetadata = "dummyCommitMetadata"; @@ -309,7 +309,7 @@ public class RealtimePlumberSchoolTest plumber.finishJob(); } - @Test(timeout = 60000) + @Test(timeout = 60_000L) public void testPersistFails() throws Exception { Sink sink = new Sink( @@ -356,7 +356,7 @@ public class RealtimePlumberSchoolTest Assert.assertEquals(1, metrics.failedPersists()); } - @Test(timeout = 60000) + @Test(timeout = 60_000L) public void testPersistHydrantGaps() throws Exception { final Object commitMetadata = "dummyCommitMetadata"; @@ -461,7 +461,7 @@ public class RealtimePlumberSchoolTest Assert.assertEquals(0, restoredPlumber2.getSinks().size()); } - @Test(timeout = 60000) + @Test(timeout = 60_000L) public void testDimOrderInheritance() throws Exception { final Object commitMetadata = "dummyCommitMetadata"; diff --git a/server/src/test/java/io/druid/server/AsyncQueryForwardingServletTest.java b/server/src/test/java/io/druid/server/AsyncQueryForwardingServletTest.java index c7c91ff..3870eb0 100644 --- a/server/src/test/java/io/druid/server/AsyncQueryForwardingServletTest.java +++ b/server/src/test/java/io/druid/server/AsyncQueryForwardingServletTest.java @@ -164,7 +164,7 @@ public class AsyncQueryForwardingServletTest extends BaseJettyTest Assert.assertNotEquals("gzip", postNoGzip.getContentEncoding()); } - @Test(timeout = 60_000) + @Test(timeout = 60_000L) public void testDeleteBroadcast() throws Exception { CountDownLatch latch = new CountDownLatch(2); diff --git a/server/src/test/java/io/druid/server/audit/SQLAuditManagerTest.java b/server/src/test/java/io/druid/server/audit/SQLAuditManagerTest.java index 24fb149..6accd61 100644 --- a/server/src/test/java/io/druid/server/audit/SQLAuditManagerTest.java +++ b/server/src/test/java/io/druid/server/audit/SQLAuditManagerTest.java @@ -64,7 +64,7 @@ public class SQLAuditManagerTest ); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testAuditEntrySerde() throws IOException { AuditEntry entry = new AuditEntry( @@ -83,7 +83,7 @@ public class SQLAuditManagerTest Assert.assertEquals(entry, serde); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testCreateAuditEntry() throws IOException { AuditEntry entry = new AuditEntry( @@ -109,7 +109,7 @@ public class SQLAuditManagerTest } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testFetchAuditHistory() { AuditEntry entry = new AuditEntry( @@ -135,7 +135,7 @@ public class SQLAuditManagerTest Assert.assertEquals(entry, auditEntries.get(1)); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testFetchAuditHistoryByKeyAndTypeWithLimit() { AuditEntry entry1 = new AuditEntry( @@ -171,7 +171,7 @@ public class SQLAuditManagerTest Assert.assertEquals(entry1, auditEntries.get(0)); } - @Test(timeout = 10_000L) + @Test(timeout = 60_000L) public void testFetchAuditHistoryByTypeWithLimit() { AuditEntry entry1 = new AuditEntry( diff --git a/server/src/test/java/io/druid/server/coordination/ChangeRequestHttpSyncerTest.java b/server/src/test/java/io/druid/server/coordination/ChangeRequestHttpSyncerTest.java index 0af314b..73ba16a 100644 --- a/server/src/test/java/io/druid/server/coordination/ChangeRequestHttpSyncerTest.java +++ b/server/src/test/java/io/druid/server/coordination/ChangeRequestHttpSyncerTest.java @@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ public class ChangeRequestHttpSyncerTest { - @Test(timeout = 10000) + @Test(timeout = 60_000L) public void testSimple() throws Exception { ObjectMapper jsonMapper = TestHelper.makeJsonMapper(); diff --git a/server/src/test/java/io/druid/server/coordination/SegmentLoadDropHandlerTest.java b/server/src/test/java/io/druid/server/coordination/SegmentLoadDropHandlerTest.java index 26eaeef..30ae75e 100644 --- a/server/src/test/java/io/druid/server/coordination/SegmentLoadDropHandlerTest.java +++ b/server/src/test/java/io/druid/server/coordination/SegmentLoadDropHandlerTest.java @@ -449,7 +449,7 @@ public class SegmentLoadDropHandlerTest Assert.assertTrue(infoDir.delete()); } - @Test(timeout = 1000L) + @Test(timeout = 60_000L) public void testProcessBatch() throws Exception { segmentLoadDropHandler.start(); diff --git a/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java b/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java index 35433da..bfbe8b3 100644 --- a/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java +++ b/server/src/test/java/io/druid/server/coordination/ZkCoordinatorTest.java @@ -81,7 +81,7 @@ public class ZkCoordinatorTest extends CuratorTestBase tearDownServerAndCurator(); } - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testLoadDrop() throws Exception { EmittingLogger.registerEmitter(new NoopServiceEmitter()); diff --git a/server/src/test/java/io/druid/server/coordinator/CuratorDruidCoordinatorTest.java b/server/src/test/java/io/druid/server/coordinator/CuratorDruidCoordinatorTest.java index 256d819..d1d13e2 100644 --- a/server/src/test/java/io/druid/server/coordinator/CuratorDruidCoordinatorTest.java +++ b/server/src/test/java/io/druid/server/coordinator/CuratorDruidCoordinatorTest.java @@ -240,7 +240,7 @@ public class CuratorDruidCoordinatorTest extends CuratorTestBase tearDownServerAndCurator(); } - @Test(timeout = 10_000) + @Test(timeout = 60_000L) public void testMoveSegment() throws Exception { segmentViewInitLatch = new CountDownLatch(1); diff --git a/server/src/test/java/io/druid/server/coordinator/HttpLoadQueuePeonTest.java b/server/src/test/java/io/druid/server/coordinator/HttpLoadQueuePeonTest.java index c238835..069279d 100644 --- a/server/src/test/java/io/druid/server/coordinator/HttpLoadQueuePeonTest.java +++ b/server/src/test/java/io/druid/server/coordinator/HttpLoadQueuePeonTest.java @@ -98,7 +98,7 @@ public class HttpLoadQueuePeonTest } }; - @Test(timeout = 10000) + @Test(timeout = 60_000L) public void testSimple() throws Exception { HttpLoadQueuePeon httpLoadQueuePeon = new HttpLoadQueuePeon( @@ -135,7 +135,7 @@ public class HttpLoadQueuePeonTest httpLoadQueuePeon.stop(); } - @Test(timeout = 10000) + @Test(timeout = 60_000L) public void testLoadDropAfterStop() throws Exception { HttpLoadQueuePeon httpLoadQueuePeon = new HttpLoadQueuePeon( diff --git a/server/src/test/java/io/druid/server/initialization/jetty/LimitRequestsFilterTest.java b/server/src/test/java/io/druid/server/initialization/jetty/LimitRequestsFilterTest.java index 70c620f..18893e3 100644 --- a/server/src/test/java/io/druid/server/initialization/jetty/LimitRequestsFilterTest.java +++ b/server/src/test/java/io/druid/server/initialization/jetty/LimitRequestsFilterTest.java @@ -33,7 +33,7 @@ import java.util.concurrent.CountDownLatch; */ public class LimitRequestsFilterTest { - @Test(timeout = 5000L) + @Test(timeout = 60_000L) public void testSimple() throws Exception { LimitRequestsFilter filter = new LimitRequestsFilter(2); diff --git a/server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerTest.java b/server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerTest.java index 3eb29e2..f07adfd 100644 --- a/server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerTest.java +++ b/server/src/test/java/io/druid/server/lookup/cache/LookupCoordinatorManagerTest.java @@ -1028,7 +1028,7 @@ public class LookupCoordinatorManagerTest } - @Test(timeout = 2_000) + @Test(timeout = 60_000L) public void testLookupManagementLoop() throws Exception { Map<String, LookupExtractorFactoryMapContainer> lookup1 = ImmutableMap.of( diff --git a/sql/src/test/java/io/druid/sql/avatica/DruidAvaticaHandlerTest.java b/sql/src/test/java/io/druid/sql/avatica/DruidAvaticaHandlerTest.java index 705e483..9794e6b 100644 --- a/sql/src/test/java/io/druid/sql/avatica/DruidAvaticaHandlerTest.java +++ b/sql/src/test/java/io/druid/sql/avatica/DruidAvaticaHandlerTest.java @@ -551,7 +551,7 @@ public class DruidAvaticaHandlerTest extends CalciteTestBase } - @Test(timeout = 90000) + @Test(timeout = 90_000L) public void testConcurrentQueries() throws Exception { final List<ListenableFuture<Integer>> futures = new ArrayList<>(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@druid.apache.org For additional commands, e-mail: dev-h...@druid.apache.org