Merge pull request #1730 from vladak/get_rid_of_startIndexReopenThread

get rid of startIndexReopenThread()

Author: tarzanek

src/org/opensolaris/opengrok/configuration/Configuration.java

@@ -176,7 +176,6 @@ public final class Configuration {
     private final Map<String, String> cmds;  // repository type -> command
     private int tabSize;
     private int commandTimeout; // in seconds
-    private int indexRefreshPeriod; // in seconds
     private boolean scopesEnabled;
     private boolean projectsEnabled;
     private boolean foldingEnabled;
@@ -309,14 +308,6 @@ public void setCommandTimeout(int commandTimeout) throws IllegalArgumentExceptio
         this.commandTimeout = commandTimeout;
     }
 
-    public int getIndexRefreshPeriod() {
-        return indexRefreshPeriod;
-    }
-
-    public void setIndexRefreshPeriod(int seconds) {
-        this.indexRefreshPeriod = seconds;
-    }
-
     public String getStatisticsFilePath() {
         return statisticsFilePath;
     }
@@ -380,7 +371,6 @@ public Configuration() {
         setHitsPerPage(25);
         setIgnoredNames(new IgnoredNames());
         setIncludedNames(new Filter());
-        setIndexRefreshPeriod(3600);
         setIndexVersionedFilesOnly(false);
         setLastEditedDisplayMode(true);
         setMaxSearchThreadCount(2 * Runtime.getRuntime().availableProcessors());

src/org/opensolaris/opengrok/configuration/RuntimeEnvironment.java

@@ -281,14 +281,6 @@ public void setCommandTimeout(int timeout) {
         threadConfig.get().setCommandTimeout(timeout);
     }
 
-    public int getIndexRefreshPeriod() {
-        return threadConfig.get().getIndexRefreshPeriod();
-    }
-
-    public void setIndexRefreshPeriod(int seconds) {
-        threadConfig.get().setIndexRefreshPeriod(seconds);
-    }
-
     public Statistics getStatistics() {
         return statistics;
     }
@@ -1970,42 +1962,6 @@ public void maybeRefreshIndexSearchers() {
         }
     }
 
-    /**
-     * Call maybeRefresh() on each SearcherManager object from dedicated thread
-     * periodically.
-     * If the corresponding index has changed in the meantime, it will be safely
-     * reopened, i.e. without impacting existing IndexSearcher/IndexReader
-     * objects, thus not disrupting searches in progress.
-     */
-    public void startIndexReopenThread() {
-        indexReopenThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                while (!Thread.currentThread().isInterrupted()) {
-                    try {
-                        maybeRefreshIndexSearchers();
-                        Thread.sleep(getIndexRefreshPeriod() * 1000);
-                    } catch (InterruptedException ex) {
-                        Thread.currentThread().interrupt();
-                    }
-                }
-            }
-        }, "indexReopenThread");
-
-        indexReopenThread.start();
-    }
-
-    public void stopIndexReopenThread() {
-        if (indexReopenThread != null) {
-            indexReopenThread.interrupt();
-            try {
-                indexReopenThread.join();
-            } catch (InterruptedException ex) {
-                LOGGER.log(Level.INFO, "Cannot join indexReopen thread: ", ex);
-            }
-        }
-    }
-
     /**
      * Get IndexSearcher for given project.
      * Each IndexSearcher is born from a SearcherManager object. There is

src/org/opensolaris/opengrok/web/WebappListener.java

@@ -115,7 +115,6 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
             RuntimeEnvironment.getInstance().startWatchDogService(new File(env.getConfiguration().getPluginDirectory()));
         }
 
-        RuntimeEnvironment.getInstance().startIndexReopenThread();
         RuntimeEnvironment.getInstance().startExpirationTimer();
 
         try {
@@ -134,7 +133,6 @@ public void contextInitialized(final ServletContextEvent servletContextEvent) {
     public void contextDestroyed(final ServletContextEvent servletContextEvent) {
         RuntimeEnvironment.getInstance().stopConfigurationListenerThread();
         RuntimeEnvironment.getInstance().stopWatchDogService();
-        RuntimeEnvironment.getInstance().stopIndexReopenThread();
         RuntimeEnvironment.getInstance().stopExpirationTimer();
         try {
             RuntimeEnvironment.getInstance().saveStatistics();