From ef9c7bd2d20f29c28cc692ed1421819f0746fadb Mon Sep 17 00:00:00 2001
From: eliaporciani <e.porciani@sease.io>
Date: Mon, 3 Feb 2020 10:16:33 +0100
Subject: [PATCH] [SEARCH-1687] updated solrconfigs

---
 .../solr/instance/templates/noRerank/conf/solrconfig.xml      | 4 ++++
 .../solr/instance/templates/rerank/conf/solrconfig.xml        | 2 +-
 .../test/resources/test-files/collection1/conf/solrconfig.xml | 2 +-
 .../src/test/resources/test-files/master/conf/solrconfig.xml  | 2 +-
 .../src/test/resources/test-files/slave/conf/solrconfig.xml   | 4 ++++
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrconfig.xml b/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrconfig.xml
index 0af4dbe6c..dd5d25d32 100644
--- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrconfig.xml
+++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/noRerank/conf/solrconfig.xml
@@ -315,6 +315,10 @@
   <!-- The default high-performance update handler -->
   <updateHandler class="solr.DirectUpdateHandler2">
 
+      <updateLog>
+          <str name="dir">${solr.ulog.dir:}</str>
+      </updateLog>
+
     <!-- Enables a transaction log, used for real-time get, durability, and
          and solr cloud replica recovery.  The log can grow as big as
          uncommitted changes to the index, so use of a hard autoCommit
diff --git a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
index 883523282..e13715b1f 100644
--- a/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
+++ b/search-services/alfresco-search/src/main/resources/solr/instance/templates/rerank/conf/solrconfig.xml
@@ -321,7 +321,7 @@
          is recommended (see below).
          "dir" - the target directory for transaction logs, defaults to the
                 solr data directory.  -->
-    <updateLog enable="${enable.update.log:true}">
+    <updateLog enable="true">
       <str name="dir">${solr.ulog.dir:}</str>
     </updateLog>
 
diff --git a/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrconfig.xml b/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrconfig.xml
index 1f6140432..c32181a5c 100644
--- a/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrconfig.xml
+++ b/search-services/alfresco-search/src/test/resources/test-files/collection1/conf/solrconfig.xml
@@ -84,7 +84,7 @@
         </listener>
         -->
 
-        <updateLog enable="${enable.update.log:true}">
+        <updateLog enable="true">
             <str name="dir">${solr.ulog.dir:}</str>
         </updateLog>
         <!--
diff --git a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml
index 91272fb83..684817afa 100644
--- a/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml
+++ b/search-services/alfresco-search/src/test/resources/test-files/master/conf/solrconfig.xml
@@ -84,7 +84,7 @@
         </listener>
         -->
 
-        <updateLog enable="${enable.update.log:true}">
+        <updateLog enable="true">
             <str name="dir">${solr.ulog.dir:}</str>
         </updateLog>
         <!--
diff --git a/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml b/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml
index e7bc2edd6..01893eb75 100644
--- a/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml
+++ b/search-services/alfresco-search/src/test/resources/test-files/slave/conf/solrconfig.xml
@@ -93,6 +93,10 @@
         </commitWithin>
         -->
 
+        <updateLog enable="true">
+            <str name="dir">${solr.ulog.dir:}</str>
+        </updateLog>
+
     </updateHandler>
 
     <query>