Merge pull request #11562 from njr-11/11561-tolerate-17-minute-delay-…

…testTransactionTimeoutSuspendedTransactionFENoPolling tolerate 17+ minute delay in testTransactionTimeoutSuspendedTransactionFENoPolling
OpenLiberty · Apr 1, 2020 · 50d4aa1 · 50d4aa1
2 parents 94e41ad + dafe2ef
commit 50d4aa1
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...at_errorpaths/test-applications/persistenterrtest/src/web/PersistentErrorTestServlet.java b/...at_errorpaths/test-applications/persistenterrtest/src/web/PersistentErrorTestServlet.java
@@ -75,7 +75,7 @@ public class PersistentErrorTestServlet extends HttpServlet {
      * information is logged to disk, which can randomly take several minutes on poorly
      * performing test infrastructure.
      */
-    private static final long TIMEOUT_NS_FFDC_PATH = TimeUnit.MINUTES.toNanos(10);
+    private static final long TIMEOUT_NS_DISK_WRITE_PATH = TimeUnit.MINUTES.toNanos(30);
 
     @Resource(name = "java:comp/env/concurrent/mySchedulerRef", lookup = "concurrent/myScheduler")
     private PersistentExecutor scheduler;
@@ -1008,7 +1008,7 @@ public void testSkipRunFailsOnFirstExecutionAttempt(HttpServletRequest request,
 
         TaskStatus<Long> status = scheduler.schedule((Callable<Long>) task, trigger);
 
-        for (long start = System.nanoTime(); status != null && System.nanoTime() - start < TIMEOUT_NS_FFDC_PATH; Thread.sleep(POLL_INTERVAL))
+        for (long start = System.nanoTime(); status != null && System.nanoTime() - start < TIMEOUT_NS_DISK_WRITE_PATH; Thread.sleep(POLL_INTERVAL))
             status = scheduler.getStatus(status.getTaskId());
 
         if (status != null)
@@ -1033,7 +1033,7 @@ public void testSkipRunFailsOnLastExecutionAttempt(HttpServletRequest request, P
 
         TaskStatus<Long> status = scheduler.schedule((Callable<Long>) task, trigger);
 
-        for (long start = System.nanoTime(); status != null && System.nanoTime() - start < TIMEOUT_NS_FFDC_PATH; Thread.sleep(POLL_INTERVAL))
+        for (long start = System.nanoTime(); status != null && System.nanoTime() - start < TIMEOUT_NS_DISK_WRITE_PATH; Thread.sleep(POLL_INTERVAL))
             status = scheduler.getStatus(status.getTaskId());
 
         if (status != null)
@@ -1052,7 +1052,7 @@ public void testSkipRunFailsOnLastExecutionAttemptNoAutoPurge(HttpServletRequest
 
         TaskStatus<?> status = scheduler.schedule(task, trigger);
 
-        for (long start = System.nanoTime(); !status.toString().contains("SKIPPED") && System.nanoTime() - start < TIMEOUT_NS_FFDC_PATH; Thread.sleep(POLL_INTERVAL))
+        for (long start = System.nanoTime(); !status.toString().contains("SKIPPED") && System.nanoTime() - start < TIMEOUT_NS_DISK_WRITE_PATH; Thread.sleep(POLL_INTERVAL))
             status = scheduler.getStatus(status.getTaskId());
 
         if (!status.isDone() || status.isCancelled())
@@ -1081,7 +1081,7 @@ public void testSkipRunFailsOnMiddleExecutionAttempts(HttpServletRequest request
 
         TaskStatus<Long> status = scheduler.schedule((Callable<Long>) task, trigger);
 
-        for (long start = System.nanoTime(); status != null && System.nanoTime() - start < TIMEOUT_NS_FFDC_PATH; Thread.sleep(POLL_INTERVAL))
+        for (long start = System.nanoTime(); status != null && System.nanoTime() - start < TIMEOUT_NS_DISK_WRITE_PATH; Thread.sleep(POLL_INTERVAL))
             status = scheduler.getStatus(status.getTaskId());
 
         if (status != null)
@@ -1106,7 +1106,7 @@ public void testSkipRunFailsOnOnlyExecutionAttempt(HttpServletRequest request, P
 
         TaskStatus<Long> status = scheduler.schedule((Callable<Long>) task, trigger);
 
-        for (long start = System.nanoTime(); status != null && System.nanoTime() - start < TIMEOUT_NS_FFDC_PATH; Thread.sleep(POLL_INTERVAL))
+        for (long start = System.nanoTime(); status != null && System.nanoTime() - start < TIMEOUT_NS_DISK_WRITE_PATH; Thread.sleep(POLL_INTERVAL))
             status = scheduler.getStatus(status.getTaskId());
 
         if (status != null)
@@ -1126,7 +1126,7 @@ public void testSkipRunFailsOnOnlyExecutionAttemptNoAutoPurge(HttpServletRequest
 
         TaskStatus<?> status = scheduler.schedule(task, trigger);
 
-        for (long start = System.nanoTime(); !status.hasResult() && System.nanoTime() - start < TIMEOUT_NS_FFDC_PATH; Thread.sleep(POLL_INTERVAL))
+        for (long start = System.nanoTime(); !status.hasResult() && System.nanoTime() - start < TIMEOUT_NS_DISK_WRITE_PATH; Thread.sleep(POLL_INTERVAL))
             status = scheduler.getStatus(status.getTaskId());
 
         if (!status.isDone() || status.isCancelled())
@@ -1190,7 +1190,7 @@ public void testTransactionTimeoutSuspendedTransaction(HttpServletRequest reques
         task.getExecutionProperties().put(PersistentExecutor.TRANSACTION_TIMEOUT, "1");
 
         TaskStatus<Long> status = scheduler.submit(task);
-        for (long start = System.nanoTime(); !status.hasResult() && System.nanoTime() - start < TIMEOUT_NS; Thread.sleep(POLL_INTERVAL))
+        for (long start = System.nanoTime(); !status.hasResult() && System.nanoTime() - start < TIMEOUT_NS_DISK_WRITE_PATH; Thread.sleep(POLL_INTERVAL))
             status = scheduler.getStatus(status.getTaskId());
 
         try {