From 9532a3edeacd8fb3df67e8a01ed4e89069ffc017 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Wed, 15 May 2019 08:41:01 +0200
Subject: [PATCH] Bug 22705: Change default value of cxn_pool to 'Static'

'Static' is the default value of Search::Elasticsearch and for a good
reason : it works in most cases, unlike the 'Sniff' option

To test:
1 - Apply patch
2 - Edit koha-conf.xml
3 - Add '<cxn_pool>Static</cxn_pool>' to the elasticsearch stanza
4 - Restart all the things!
5 - Reindex ES, it works
6 - Set SearchEngine to ES, try searching
7 - It works!

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 Koha/SearchEngine/Elasticsearch.pm | 2 +-
 etc/koha-conf.xml                  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Koha/SearchEngine/Elasticsearch.pm b/Koha/SearchEngine/Elasticsearch.pm
index b46537d112..8a52d574ec 100644
--- a/Koha/SearchEngine/Elasticsearch.pm
+++ b/Koha/SearchEngine/Elasticsearch.pm
@@ -144,7 +144,7 @@ sub get_elasticsearch_params {
 
     $es->{key_prefix} = 'es_';
     $es->{client} //= '5_0::Direct';
-    $es->{cxn_pool} //= 'Sniff';
+    $es->{cxn_pool} //= 'Static';
     $es->{request_timeout} //= 60;
 
     return $es;
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index b6c9d52f13..c8473c6c6b 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -165,6 +165,9 @@ __PAZPAR2_TOGGLE_XML_POST__
  <elasticsearch>
      <server>localhost:9200</server>
      <index_name>koha___DB_NAME__</index_name>
+
+     <!-- See https://metacpan.org/pod/Search::Elasticsearch#cxn_pool -->
+     <cxn_pool>Static</cxn_pool>
  </elasticsearch>
  <!-- Uncomment the following line if you want to override the Elasticsearch default index settings -->
  <!-- <elasticsearch_index_config>__KOHA_CONF_DIR__/searchengine/elasticsearch/index_config.yaml</elasticsearch_index_config> -->
-- 
2.11.4.GIT