You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2021/01/24 02:18:18 UTC

[lucene-solr] 11/16: @1287 Tweak prep recovery cmd.

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 94dbe77314fb48c6dcb4013a1b0a3fbd014ca16d
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Jan 21 22:33:38 2021 -0600

    @1287 Tweak prep recovery cmd.
---
 solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 8eb64a9..ff6b669 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -923,19 +923,19 @@ public class RecoveryStrategy implements Runnable, Closeable {
     log.info("Sending prep recovery command to {} for core {} params={}", leaderBaseUrl, leaderCoreName, prepCmd.getParams());
 
     int conflictWaitMs = zkController.getLeaderConflictResolveWait();
-    int readTimeout = conflictWaitMs + Integer.parseInt(System.getProperty("prepRecoveryReadTimeoutExtraWait", "5000"));
+    int readTimeout = conflictWaitMs + Integer.parseInt(System.getProperty("prepRecoveryReadTimeoutExtraWait", "10000"));
     // nocommit
     try (Http2SolrClient client = new Http2SolrClient.Builder(leaderBaseUrl).withHttpClient(cc.getUpdateShardHandler().
         getRecoveryOnlyClient()).idleTimeout(readTimeout).markInternalRequest().build()) {
 
       prepCmd.setBasePath(leaderBaseUrl);
-      log.info("Sending prep recovery command to [{}]; [{}]", leaderBaseUrl, prepCmd);
+
       latch = new CountDownLatch(1);
       Cancellable result = client.asyncRequest(prepCmd, null, new NamedListAsyncListener(latch));
       try {
         prevSendPreRecoveryHttpUriRequest = result;
         try {
-          boolean success = latch.await(5, TimeUnit.SECONDS);
+          boolean success = latch.await(15, TimeUnit.SECONDS);
           if (!success) {
             result.cancel();
             throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "Timeout waiting for prep recovery cmd on leader");