Fixing tests

Signed-off-by: Ankit Kala <[email protected]>
opensearch-project · Mar 12, 2024 · fdf7502 · fdf7502
1 parent fc71528
commit fdf7502
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.../reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java b/.../reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java
@@ -199,7 +199,8 @@ private void executeWithRetries(
         RejectAwareActionListener<Response> childListener
     ) {
         execute(request, parser, new RetryListener(logger, threadPool, backoffPolicy, r -> {
-            logger.trace("Retrying execute request");
+            logger.trace("Retrying execute request {}", request.getEndpoint());
+            countSearchRetry.run();
             execute(request, parser, r);
         }, childListener));
     }

diff --git a/...dex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java b/...dex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java
@@ -523,7 +523,7 @@ public void testInvalidJsonThinksRemoteIsNotES() throws IOException {
         Exception e = expectThrows(RuntimeException.class, () -> sourceWithMockedRemoteCall("some_text.txt").start());
         assertEquals(
             "Error parsing the response, remote is likely not an OpenSearch instance",
-            e.getCause().getCause().getCause().getMessage()
+            e.getCause().getCause().getCause().getCause().getMessage()
         );
     }
 
@@ -532,7 +532,7 @@ public void testUnexpectedJsonThinksRemoteIsNotES() throws IOException {
         Exception e = expectThrows(RuntimeException.class, () -> sourceWithMockedRemoteCall("main/2_3_3.json").start());
         assertEquals(
             "Error parsing the response, remote is likely not an OpenSearch instance",
-            e.getCause().getCause().getCause().getMessage()
+            e.getCause().getCause().getCause().getCause().getMessage()
         );
     }
 

diff --git a/server/src/main/java/org/opensearch/index/reindex/RetryListener.java b/server/src/main/java/org/opensearch/index/reindex/RetryListener.java
@@ -84,7 +84,7 @@ public void onRejection(Exception e) {
         if (retries.hasNext()) {
             retryCount += 1;
             TimeValue delay = retries.next();
-            logger.trace(() -> new ParameterizedMessage("retrying rejected search after [{}]", delay, e.getMessage()));
+            logger.trace(() -> new ParameterizedMessage("retrying rejected search after [{}]", delay), e);
             schedule(() -> retryScrollHandler.accept(this), delay);
         } else {
             logger.warn(() -> new ParameterizedMessage("giving up on search because we retried [{}] times without success", retryCount), e);