From 8e6ac4f7dc6e1d1e0ed8133199f925caf03c2aa8 Mon Sep 17 00:00:00 2001
From: Angel Borroy <48685308+aborroy@users.noreply.github.com>
Date: Thu, 3 Sep 2020 10:26:08 +0200
Subject: [PATCH] Merge pull request #919 from
 Alfresco/fix/SEARCH-2401_HttpSocketTimeOut

SEARCH-2401: Add socketTimeOut parameter to HttpConnections
(cherry picked from commit cb64ba034c727b108e4588e39615ca6b1f36db67)
---
 .../java/org/alfresco/solr/SolrInformationServer.java    | 9 ++++++++-
 .../org/alfresco/solr/client/SOLRAPIClientFactory.java   | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
index 15b4d1b3e..15325426d 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
@@ -4091,7 +4091,14 @@ public class SolrInformationServer implements InformationServer
         }
         catch (Exception exception)
         {
-            LOGGER.error("Unable to get nodes metadata from repository. See the stacktrace below for further details.", exception);
+            LOGGER.error("Unable to get nodes metadata from repository using "
+                    + "fromNodeId=" + parameters.getFromNodeId() + ", "
+                    + "toNodeId=" + parameters.getToNodeId() + ", "
+                    + "nodeIds=" + parameters.getNodeIds() +  ", "
+                    + "fromTxId=" + parameters.getFromTxnId() + ", "
+                    + "toTxId=" + parameters.getToTxnId() + ", "
+                    + "txIds=" + parameters.getTransactionIds() 
+                    + ". See the stacktrace below for further details.", exception);
             return empty();
         }
     }
diff --git a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java
index 4db063ae4..98afbac4e 100644
--- a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java
+++ b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIClientFactory.java
@@ -195,7 +195,7 @@ public class SOLRAPIClientFactory
         else
         {
             httpClientFactory = new PlainHttpClientFactory(alfrescoHost, alfrescoPort, maxTotalConnections,
-                    maxHostConnections);
+                    maxHostConnections, socketTimeout);
         }
 
         AlfrescoHttpClient repoClient = httpClientFactory.getRepoClient(alfrescoHost, alfrescoPortSSL);
@@ -235,13 +235,14 @@ public class SOLRAPIClientFactory
      */
     class PlainHttpClientFactory extends HttpClientFactory
     {
-        public PlainHttpClientFactory(String host, int port, int maxTotalConnections, int maxHostConnections)
+        public PlainHttpClientFactory(String host, int port, int maxTotalConnections, int maxHostConnections, int socketTimeout)
         {
             setSecureCommsType("none");
             setHost(host);
             setPort(port);
             setMaxTotalConnections(maxTotalConnections);
             setMaxHostConnections(maxHostConnections);
+            setSocketTimeout(socketTimeout);
             init();
         }