Merge pull request #166 from tumblr/gabe-solr-tunables

add documentation for new solr tunables
tumblr · Jun 16, 2014 · b65de31 · b65de31
2 parents 65629b0 + f42c0ba
commit b65de31
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/_includes/config_solr.html b/_includes/config_solr.html
@@ -27,7 +27,7 @@
     <tr>
       <td class="inlinecode">embeddedSolrHome</td>
       <td>String</td>
-      <td>Must be a writable directory if useEmbeddedServer is true</td>
+      <td><span class="label label-info">Embedded only</span> Must be a writable directory if useEmbeddedServer is true</td>
     </tr>
     <tr>
       <td class="inlinecode">enabled</td>
@@ -37,7 +37,7 @@
     <tr>
       <td class="inlinecode">externalUrl</td>
       <td>String</td>
-      <td>If useEmbeddedServer is false, this must be a valid solr URL</td>
+      <td><span class="label label-info">External only</span> If useEmbeddedServer is false, this must be a valid solr URL</td>
     </tr>
     <tr>
       <td class="inlinecode">reactToUpdates</td>
@@ -54,6 +54,26 @@
       <td>Boolean</td>
       <td>Defaults to true</td>
     </tr>
+    <tr>
+      <td class="inlinecode">socketTimeout</td>
+      <td>Int</td>
+      <td><span class="label label-info">External only</span> Solr socket timeout for HTTP client. Defaults to 1000ms.</td>
+    </tr>
+    <tr>
+      <td class="inlinecode">connectionTimeout</td>
+      <td>Int</td>
+      <td><span class="label label-info">External only</span> Solr HTTP connection timeout. Defaults to 100ms.</td>
+    </tr>
+    <tr>
+      <td class="inlinecode">maxTotalConnections</td>
+      <td>Int</td>
+      <td><span class="label label-info">External only</span> Solr HTTP client tunable; defaults to 100.</td>
+    </tr>
+    <tr>
+      <td class="inlinecode">defaultMaxConnectionsPerHost</td>
+      <td>Int</td>
+      <td><span class="label label-info">External only</span> Solr HTTP client tunable; defaults to 100.</td>
+    </tr>
   </tbody>
 </table>