Merge pull request #10444 from jaikiran/scheduler-test-race

Fix race condition in scheduler and quartz's ConcurrentExecutionTest
quarkusio · Jul 3, 2020 · 71e2452 · 71e2452
2 parents 2f20cf5 + e5f1d11
commit 71e2452
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...sions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionTest.java b/...sions/quartz/deployment/src/test/java/io/quarkus/quartz/test/ConcurrentExecutionTest.java
@@ -44,6 +44,10 @@ void concurrent() {
 
         @Scheduled(every = "1s", concurrentExecution = SKIP)
         void nonconcurrent() throws InterruptedException {
+            if (LATCH.getCount() == 0) {
+                // we are already done with our test, don't increment the counter anymore
+                return;
+            }
             COUNTER.incrementAndGet();
             if (!LATCH.await(5, TimeUnit.SECONDS)) {
                 throw new IllegalStateException("");

diff --git a/...scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionTest.java b/...scheduler/deployment/src/test/java/io/quarkus/scheduler/test/ConcurrentExecutionTest.java
@@ -44,6 +44,10 @@ void concurrent() {
 
         @Scheduled(every = "1s", concurrentExecution = SKIP)
         void nonconcurrent() throws InterruptedException {
+            if (LATCH.getCount() == 0) {
+                // we are already done with our test, don't increment the counter anymore
+                return;
+            }
             COUNTER.incrementAndGet();
             if (!LATCH.await(5, TimeUnit.SECONDS)) {
                 throw new IllegalStateException("");