threadpool

Signed-off-by: Bharathwaj G <[email protected]>
opensearch-project · Sep 6, 2023 · 0169e6f · 0169e6f
1 parent b6dfbf3
commit 0169e6f
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 30 deletions.
diff --git a/...est/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchRejectionIT.java b/...est/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchRejectionIT.java
@@ -222,7 +222,7 @@ public SearchTask createTask(long id, String type, String action, TaskId parentT
             }
             latch.await();
         } finally {
-            ThreadPool.terminate(threadPool, 100, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS);
         }
     }
 }
diff --git a/...a/org/opensearch/search/asynchronous/integTests/DeleteAsynchronousSearchSingleNodeIT.java b/...a/org/opensearch/search/asynchronous/integTests/DeleteAsynchronousSearchSingleNodeIT.java
@@ -196,7 +196,7 @@ public void onFailure(Exception e) {
             disableBlocks(plugins);
             assertionConsumer.apply(numDeleteAcknowledged, numDeleteUnAcknowledged, numResourceNotFound);
         } finally {
-            ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -241,7 +241,7 @@ public void onFailure(Exception e) {
             countDownLatch.await();
             assertionConsumer.apply(numDeleteAcknowledged, numDeleteUnAcknowledged, numResourceNotFound);
         } finally {
-            ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 }
diff --git a/...java/org/opensearch/search/asynchronous/integTests/GetAsynchronousSearchSingleNodeIT.java b/...java/org/opensearch/search/asynchronous/integTests/GetAsynchronousSearchSingleNodeIT.java
@@ -255,7 +255,7 @@ public void onFailure(Exception e) {
             disableBlocks(plugins);
             assertionConsumer.apply(numGetSuccess, numGetFailures, numVersionConflictFailures);
         } finally {
-            ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -333,7 +333,7 @@ public void onFailure(Exception e) {
             }
 
         } finally {
-            ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 }

diff --git a/src/test/java/org/opensearch/search/asynchronous/integTests/MixedOperationSingleNodeIT.java b/src/test/java/org/opensearch/search/asynchronous/integTests/MixedOperationSingleNodeIT.java
@@ -153,7 +153,7 @@ public void onFailure(Exception e) {
                 assertionConsumer.apply(numSuccess, numGetFailures, numVersionConflictFailures, numResourceNotFoundFailures);
             }
         } finally {
-            ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 }
diff --git a/...a/org/opensearch/search/asynchronous/integTests/SubmitAsynchronousSearchSingleNodeIT.java b/...a/org/opensearch/search/asynchronous/integTests/SubmitAsynchronousSearchSingleNodeIT.java
@@ -154,7 +154,7 @@ public void onFailure(Exception e) {
             disableBlocks(plugins);
             assertionConsumer.apply(numStartedAsynchronousSearch, numFailedAsynchronousSearch, numRejectedAsynchronousSearch);
         } finally {
-            ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -232,7 +232,7 @@ public void onFailure(Exception e) {
             countDownLatch.await();
             assertionConsumer.apply(numStartedAsynchronousSearch, numFailedAsynchronousSearch, numErrorResponseAsynchronousSearch);
         } finally {
-            ThreadPool.terminate(testThreadPool, 500, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 }
diff --git a/...st/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchCancellationIT.java b/...st/java/org/opensearch/search/asynchronous/listener/AsynchronousSearchCancellationIT.java
@@ -168,7 +168,7 @@ public SearchTask createTask(long id, String type, String action, TaskId parentT
                 assertThat(exceptionRef.get(), instanceOf(SearchPhaseExecutionException.class));
             }
         } finally {
-            ThreadPool.terminate(threadPool, 100, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS);
         }
     }
 }
diff --git a/...java/org/opensearch/search/asynchronous/listener/AsynchronousSearchPartialResponseIT.java b/...java/org/opensearch/search/asynchronous/listener/AsynchronousSearchPartialResponseIT.java
@@ -175,7 +175,7 @@ public SearchTask createTask(long id, String type, String action, TaskId parentT
             List<? extends Terms.Bucket> buckets = terms.getBuckets();
             assertThat(buckets.size(), equalTo(aggregationSize));
         } finally {
-            ThreadPool.terminate(threadPool, 100, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS);
         }
     }
 }
diff --git a/...ava/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListenerIT.java b/...ava/org/opensearch/search/asynchronous/listener/AsynchronousSearchProgressListenerIT.java
@@ -173,7 +173,7 @@ public SearchTask createTask(long id, String type, String action, TaskId parentT
             latch.await();
             AsynchronousSearchAssertions.assertSearchResponses(responseRef.get(), listener.partialResponse());
         } finally {
-            ThreadPool.terminate(threadPool, 100, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS);
         }
     }
 

diff --git a/...t/java/org/opensearch/search/asynchronous/listener/SearchProgressActionListenerTests.java b/...t/java/org/opensearch/search/asynchronous/listener/SearchProgressActionListenerTests.java
@@ -93,7 +93,7 @@ public void testListenerOnResponseForSuccessfulSearch() throws InterruptedExcept
                 assertEquals(mockAsynchronousSearchResp, responseList.get(i).get());
             }
         } finally {
-            ThreadPool.terminate(threadPool, 100, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -130,7 +130,7 @@ public void testListenerOnResponseForFailedSearch() throws InterruptedException
                 assertEquals(mockAsynchronousSearchFailResp, responseList.get(i).get());
             }
         } finally {
-            ThreadPool.terminate(threadPool, 100, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -167,7 +167,7 @@ public void testListenerOnFailureForFailedSearch() throws InterruptedException {
                 assertEquals(mockPostProcessingException, exceptionList.get(i).get());
             }
         } finally {
-            ThreadPool.terminate(threadPool, 100, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -204,7 +204,7 @@ public void testListenerOnFailureForSuccessfulSearch() throws InterruptedExcepti
                 assertEquals(mockPostProcessingException, exceptionList.get(i).get());
             }
         } finally {
-            ThreadPool.terminate(threadPool, 100, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS);
         }
     }
 

diff --git a/src/test/java/org/opensearch/search/asynchronous/restIT/AsynchronousSearchSettingsIT.java b/src/test/java/org/opensearch/search/asynchronous/restIT/AsynchronousSearchSettingsIT.java
@@ -59,7 +59,7 @@ public void testSubmitInvalidWaitForCompletion() throws Exception {
     }
 
     public void testMaxRunningAsynchronousSearchContexts() throws Exception {
-        int numThreads = 50;
+        int numThreads = 4000;
         List<Thread> threadsList = new LinkedList<>();
         CyclicBarrier barrier = new CyclicBarrier(numThreads + 1);
         for (int i = 0; i < numThreads; i++) {
@@ -116,7 +116,7 @@ public void testMaxRunningAsynchronousSearchContexts() throws Exception {
         for (Thread thread : threadsList) {
             thread.join();
         }
-        assertEquals(numFailures.get(), 50);
+        assertEquals(numFailures.get(), 4000);
         updateClusterSettings(AsynchronousSearchActiveStore.NODE_CONCURRENT_RUNNING_SEARCHES_SETTING.getKey(),
                 AsynchronousSearchActiveStore.NODE_CONCURRENT_RUNNING_SEARCHES);
     }

diff --git a/...java/org/opensearch/search/asynchronous/service/AsynchronousSearchPostProcessorTests.java b/...java/org/opensearch/search/asynchronous/service/AsynchronousSearchPostProcessorTests.java
@@ -137,7 +137,7 @@ public void testProcessSearchFailureOnDeletedContext() throws AsynchronousSearch
             assertFalse(activeContextCleanUpConsumerInvocation.get());
             assertEquals(0, fakeClient.persistenceCount);
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -180,7 +180,7 @@ public void testProcessSearchResponseBeginPersistence() throws AsynchronousSearc
             waitUntil(() -> fakeClient.persistenceCount == 1);
             assertEquals(1, fakeClient.persistenceCount);
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -226,7 +226,7 @@ public void testProcessSearchResponsePersisted() throws AsynchronousSearchStateM
         } catch (InterruptedException e) {
             fail("Test interrupted " + e.getMessage());
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -271,7 +271,7 @@ public void testProcessSearchResponseForExpiredContext() throws AsynchronousSear
         } catch (InterruptedException e) {
             fail("Interrupted exception" + e.getMessage());
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -315,7 +315,7 @@ public void testProcessSearchResponseOnClosedContext() throws AsynchronousSearch
             assertFalse(activeContextCleanUpConsumerInvocation.get());
             assertEquals(0, fakeClient.persistenceCount);
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 

diff --git a/src/test/java/org/opensearch/search/asynchronous/service/AsynchronousSearchServiceTests.java b/src/test/java/org/opensearch/search/asynchronous/service/AsynchronousSearchServiceTests.java
@@ -184,7 +184,7 @@ public void testFindContext() throws InterruptedException {
                 freeContextLatch.await();
             }
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -241,7 +241,7 @@ public void testUpdateExpirationTimesOutBlockedOnPersistence() throws Interrupte
             updateLatch.await();
             fakeClient.releaseBlock();
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -303,7 +303,7 @@ public void testUpdateExpirationOnRunningSearch() throws InterruptedException {
                     }, e -> fail()), updateLatch));
             updateLatch.await();
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -337,7 +337,7 @@ public void testFindContextOnNonExistentSearch() throws InterruptedException {
                     randomNonNegativeLong()), user1, failureExpectingListener);
             findContextLatch.await();
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -379,7 +379,7 @@ public void testBootStrapOnClosedSearch() {
             expectThrows(IllegalStateException.class, () -> asService.bootstrapSearch(task,
                     context.getContextId()));
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -433,7 +433,7 @@ public boolean isCancelled() {
                     new LatchedActionListener<>(wrap(r -> fail(), e -> assertTrue(e instanceof ResourceNotFoundException)), latch));
             latch.await();
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 
@@ -486,7 +486,7 @@ public boolean isCancelled() {
                     new LatchedActionListener<>(wrap(Assert::assertTrue, e -> fail()), latch));
             latch.await();
         } finally {
-            ThreadPool.terminate(testThreadPool, 200, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(testThreadPool, 10, TimeUnit.SECONDS);
         }
     }
 

diff --git a/.../java/org/opensearch/search/asynchronous/service/AsynchronousSearchStateMachineTests.java b/.../java/org/opensearch/search/asynchronous/service/AsynchronousSearchStateMachineTests.java
@@ -169,7 +169,7 @@ public void testStateMachine() throws InterruptedException, BrokenBarrierExcepti
             assertEquals("success:" + success, 0, customContextListener.getRunningCount());
             assertEquals(1, customContextListener.getDeletedCount());
         } finally {
-            ThreadPool.terminate(threadPool, 100, TimeUnit.MILLISECONDS);
+            ThreadPool.terminate(threadPool, 10, TimeUnit.SECONDS);
         }
     }