Merge pull request #2184 from AndrewZWood/DS-3658

DS-3658 Configure ReindexerThread disable reindex

Author: mwoodiupui

dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java

@@ -1244,14 +1244,13 @@ public static synchronized void setReindexDiscovery(boolean reindex)
      * <P>
      * Because the DB migration may be initialized by commandline or any one of
      * the many DSpace webapps, this checks for the existence of a temporary
-     * file to know when Discovery/Solr needs reindexing.
-     * @return whether reindex flag is true/false
+     * file, and the discovery.autoReindex setting to know when Discovery/Solr needs reindexing.
+     * @return whether reindexing should happen.
      */
     public static boolean getReindexDiscovery()
     {
-        // Simply check if the flag file exists
-        File reindexFlag = new File(reindexDiscoveryFilePath);
-        return reindexFlag.exists();
+        boolean autoReindex = DSpaceServicesFactory.getInstance().getConfigurationService().getBooleanProperty("discovery.autoReindex", true);
+        return (autoReindex && new File(reindexDiscoveryFilePath).exists());
     }
 
     /**

dspace/config/modules/discovery.cfg

@@ -22,3 +22,10 @@ discovery.index.projection=dc.title,dc.contributor.*,dc.date.issued
 # 1) you need to set the DiscoverySearchRequestProcessor in the dspace.cfg 
 # 2) to show facet on Site/Community/etc. you need to add a Site/Community/Collection
 #	 Processors plugin in the dspace.cfg
+
+# Allow auto-reindexing
+# When enabled, if any database migrations are applied to your database (via Flyway), then a reindex flag 
+# is written to [dspace]/solr/search/conf/reindex.flag. Whenever the DSpace webapp is (re)started, it checks
+# for the existence of that file. If found, a background reindex of all content is triggered in Discovery.
+# Defaults to true: auto-reindexing is enabled.
+#discovery.autoReindex = true