From 8ee4daea9c8073c369682a8957f0437c18cb1083 Mon Sep 17 00:00:00 2001 From: Gabe Conradi Date: Fri, 13 Jun 2014 17:19:35 -0400 Subject: [PATCH 1/2] add documentation for new solr tunables --- _includes/config_solr.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/_includes/config_solr.html b/_includes/config_solr.html index 8e45a13fa..f50a3e6c8 100644 --- a/_includes/config_solr.html +++ b/_includes/config_solr.html @@ -54,6 +54,26 @@ Boolean Defaults to true + + socketTimeout + Int + Solr socket timeout for HTTP client. Defaults to 1000ms. (Only applicable to external Solr server) + + + connectionTimeout + Int + Solr HTTP connection timeout. Defaults to 100ms. (Only applicable to external Solr server) + + + maxTotalConnections + Int + Solr HTTP client tunable; defaults to 100. (Only applicable to external Solr server) + + + defaultMaxConnectionsPerHost + Int + Solr HTTP client tunable; defaults to 100. (Only applicable to external Solr server) + From f42c0bac5e42554cc999323e6f520cacf899cc7f Mon Sep 17 00:00:00 2001 From: Gabe Conradi Date: Fri, 13 Jun 2014 22:24:07 -0400 Subject: [PATCH 2/2] tag configs as external or internal --- _includes/config_solr.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_includes/config_solr.html b/_includes/config_solr.html index f50a3e6c8..060602f52 100644 --- a/_includes/config_solr.html +++ b/_includes/config_solr.html @@ -27,7 +27,7 @@ embeddedSolrHome String - Must be a writable directory if useEmbeddedServer is true + Embedded only Must be a writable directory if useEmbeddedServer is true enabled @@ -37,7 +37,7 @@ externalUrl String - If useEmbeddedServer is false, this must be a valid solr URL + External only If useEmbeddedServer is false, this must be a valid solr URL reactToUpdates @@ -57,22 +57,22 @@ socketTimeout Int - Solr socket timeout for HTTP client. Defaults to 1000ms. (Only applicable to external Solr server) + External only Solr socket timeout for HTTP client. Defaults to 1000ms. connectionTimeout Int - Solr HTTP connection timeout. Defaults to 100ms. (Only applicable to external Solr server) + External only Solr HTTP connection timeout. Defaults to 100ms. maxTotalConnections Int - Solr HTTP client tunable; defaults to 100. (Only applicable to external Solr server) + External only Solr HTTP client tunable; defaults to 100. defaultMaxConnectionsPerHost Int - Solr HTTP client tunable; defaults to 100. (Only applicable to external Solr server) + External only Solr HTTP client tunable; defaults to 100.