Suggester rebuild terminate on undeploy (#3396)

fixes #3395

Author: Vladimir Kotal

suggester/src/main/java/org/opengrok/suggest/Suggester.java

@@ -71,7 +71,7 @@ public final class Suggester implements Closeable {
 
     private static final String PROJECTS_DISABLED_KEY = "";
 
-    private static final Logger logger = Logger.getLogger(Suggester.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(Suggester.class.getName());
 
     private final Map<String, SuggesterProjectData> projectData = new ConcurrentHashMap<>();
 
@@ -94,6 +94,7 @@ public final class Suggester implements Closeable {
     private final int rebuildParallelismLevel;
 
     private volatile boolean rebuilding;
+    private volatile boolean terminating;
     private final Lock rebuildLock = new ReentrantLock();
     private final Condition rebuildDone = rebuildLock.newCondition();
 
@@ -164,7 +165,7 @@ public Suggester(
      */
     public void init(final Collection<NamedIndexDir> luceneIndexes) {
         if (luceneIndexes == null || luceneIndexes.isEmpty()) {
-            logger.log(Level.INFO, "No index directories found, exiting...");
+            LOGGER.log(Level.INFO, "No index directories found, exiting...");
             return;
         }
         if (!projectsEnabled && luceneIndexes.size() > 1) {
@@ -173,11 +174,15 @@ public void init(final Collection<NamedIndexDir> luceneIndexes) {
 
         synchronized (lock) {
             Instant start = Instant.now();
-            logger.log(Level.INFO, "Initializing suggester");
+            LOGGER.log(Level.INFO, "Initializing suggester");
 
             ExecutorService executor = Executors.newWorkStealingPool(rebuildParallelismLevel);
 
             for (NamedIndexDir indexDir : luceneIndexes) {
+                if (terminating) {
+                    LOGGER.log(Level.INFO, "Terminating suggester initialization");
+                    return;
+                }
                 submitInitIfIndexExists(executor, indexDir);
             }
 
@@ -202,18 +207,22 @@ private void submitInitIfIndexExists(final ExecutorService executorService, fina
             if (indexExists(indexDir.path)) {
                 executorService.submit(getInitRunnable(indexDir));
             } else {
-                logger.log(Level.FINE, "Index in {0} directory does not exist, skipping...", indexDir);
+                LOGGER.log(Level.FINE, "Index in {0} directory does not exist, skipping...", indexDir);
             }
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Could not check if index exists", e);
+            LOGGER.log(Level.WARNING, "Could not check if index exists", e);
         }
     }
 
     private Runnable getInitRunnable(final NamedIndexDir indexDir) {
         return () -> {
             try {
+                if (terminating) {
+                    return;
+                }
+
                 Instant start = Instant.now();
-                logger.log(Level.FINE, "Initializing {0}", indexDir);
+                LOGGER.log(Level.FINE, "Initializing {0}", indexDir);
 
                 SuggesterProjectData wfst = new SuggesterProjectData(FSDirectory.open(indexDir.path),
                         getSuggesterDir(indexDir.name), allowMostPopular, allowedFields);
@@ -225,9 +234,9 @@ private Runnable getInitRunnable(final NamedIndexDir indexDir) {
                 }
 
                 Duration d = Duration.between(start, Instant.now());
-                logger.log(Level.FINE, "Finished initialization of {0}, took {1}", new Object[] {indexDir, d});
+                LOGGER.log(Level.FINE, "Finished initialization of {0}, took {1}", new Object[] {indexDir, d});
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "Could not initialize suggester data for " + indexDir, e);
+                LOGGER.log(Level.SEVERE, "Could not initialize suggester data for " + indexDir, e);
             }
         };
     }
@@ -254,11 +263,11 @@ private void shutdownAndAwaitTermination(final ExecutorService executorService,
             executorService.awaitTermination(awaitTerminationTime.toMillis(), TimeUnit.MILLISECONDS);
             Duration duration = Duration.between(start, Instant.now());
             timer.record(duration);
-            logger.log(Level.INFO, "{0} (took {1})", new Object[]{logMessageOnSuccess,
+            LOGGER.log(Level.INFO, "{0} (took {1})", new Object[]{logMessageOnSuccess,
                     DurationFormatUtils.formatDurationWords(duration.toMillis(),
                             true, true)});
         } catch (InterruptedException e) {
-            logger.log(Level.SEVERE, "Interrupted while building suggesters", e);
+            LOGGER.log(Level.SEVERE, "Interrupted while building suggesters", e);
             Thread.currentThread().interrupt();
         }
     }
@@ -269,7 +278,7 @@ private void shutdownAndAwaitTermination(final ExecutorService executorService,
      */
     public void rebuild(final Collection<NamedIndexDir> indexDirs) {
         if (indexDirs == null || indexDirs.isEmpty()) {
-            logger.log(Level.INFO, "Not rebuilding suggester data because no index directories were specified");
+            LOGGER.log(Level.INFO, "Not rebuilding suggester data because no index directories were specified");
             return;
         }
 
@@ -278,8 +287,12 @@ public void rebuild(final Collection<NamedIndexDir> indexDirs) {
         rebuildLock.unlock();
 
         synchronized (lock) {
+            if (terminating) {
+                return;
+            }
+
             Instant start = Instant.now();
-            logger.log(Level.INFO, "Rebuilding the following suggesters: {0}", indexDirs);
+            LOGGER.log(Level.INFO, "Rebuilding the following suggesters: {0}", indexDirs);
 
             ExecutorService executor = Executors.newWorkStealingPool(rebuildParallelismLevel);
 
@@ -325,14 +338,18 @@ public void waitForRebuild(long timeout, TimeUnit unit) throws InterruptedExcept
     private Runnable getRebuildRunnable(final SuggesterProjectData data) {
         return () -> {
             try {
+                if (terminating) {
+                    return;
+                }
+
                 Instant start = Instant.now();
-                logger.log(Level.FINE, "Rebuilding {0}", data);
+                LOGGER.log(Level.FINE, "Rebuilding {0}", data);
                 data.rebuild();
 
                 Duration d = Duration.between(start, Instant.now());
-                logger.log(Level.FINE, "Rebuild of {0} finished, took {1}", new Object[] {data, d});
+                LOGGER.log(Level.FINE, "Rebuild of {0} finished, took {1}", new Object[] {data, d});
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "Could not rebuild suggester", e);
+                LOGGER.log(Level.SEVERE, "Could not rebuild suggester", e);
             }
         };
     }
@@ -347,12 +364,12 @@ public void remove(final Iterable<String> names) {
         }
 
         synchronized (lock) {
-            logger.log(Level.INFO, "Removing following suggesters: {0}", names);
+            LOGGER.log(Level.INFO, "Removing following suggesters: {0}", names);
 
             for (String suggesterName : names) {
                 SuggesterProjectData collection = projectData.get(suggesterName);
                 if (collection == null) {
-                    logger.log(Level.WARNING, "Unknown suggester {0}", suggesterName);
+                    LOGGER.log(Level.WARNING, "Unknown suggester {0}", suggesterName);
                     continue;
                 }
                 collection.remove();
@@ -403,7 +420,7 @@ private Suggestions prefixLookup(
         List<LookupResultItem> results = readers.parallelStream().flatMap(namedIndexReader -> {
             SuggesterProjectData data = projectData.get(namedIndexReader.name);
             if (data == null) {
-                logger.log(Level.FINE, "{0} not yet initialized", namedIndexReader.name);
+                LOGGER.log(Level.FINE, "{0} not yet initialized", namedIndexReader.name);
                 partialResult.value = true;
                 return Stream.empty();
             }
@@ -442,7 +459,7 @@ private Suggestions complexLookup(
         try {
             futures = executorService.invokeAll(searchTasks, timeThreshold, TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
-            logger.log(Level.WARNING, "Interrupted while invoking suggester search", e);
+            LOGGER.log(Level.WARNING, "Interrupted while invoking suggester search", e);
             Thread.currentThread().interrupt();
             return new Suggestions(Collections.emptyList(), true);
         }
@@ -461,7 +478,7 @@ private Suggestions complexLookup(
                         try {
                             searchTask.wait();
                         } catch (InterruptedException e) {
-                            logger.log(Level.WARNING, "Interrupted while waiting for task: {0}", searchTask);
+                            LOGGER.log(Level.WARNING, "Interrupted while waiting for task: {0}", searchTask);
                             Thread.currentThread().interrupt();
                         }
                     }
@@ -501,7 +518,7 @@ public void onSearch(final Iterable<String> projects, final Query query) {
                 }
             }
         } catch (Exception e) {
-            logger.log(Level.FINE,
+            LOGGER.log(Level.FINE,
                     String.format("Could not update search count map%s",
                             projectsEnabled ? " for projects: " + projects : ""), e);
         }
@@ -550,7 +567,7 @@ public boolean increaseSearchCount(final String project, final Term term, final
         }
 
         if (data == null) {
-            logger.log(Level.WARNING, "Cannot update search count because of missing suggester data{}",
+            LOGGER.log(Level.WARNING, "Cannot update search count because of missing suggester data{}",
                     projectsEnabled ? " for project " + project : "");
             return false;
         }
@@ -574,7 +591,7 @@ public List<Entry<BytesRef, Integer>> getSearchCounts(
     ) {
         SuggesterProjectData data = projectData.get(project);
         if (data == null) {
-            logger.log(Level.FINE, "Cannot retrieve search counts because suggester data for project {0} was not found",
+            LOGGER.log(Level.FINE, "Cannot retrieve search counts because suggester data for project {0} was not found",
                     project);
             return Collections.emptyList();
         }
@@ -588,11 +605,12 @@ public List<Entry<BytesRef, Integer>> getSearchCounts(
     @Override
     public void close() {
         executorService.shutdownNow();
+        terminating = true;
         projectData.values().forEach(f -> {
             try {
                 f.close();
             } catch (IOException e) {
-                logger.log(Level.WARNING, "Could not close suggester data " + f, e);
+                LOGGER.log(Level.WARNING, "Could not close suggester data " + f, e);
             }
         });
     }
@@ -626,7 +644,7 @@ public Void call() {
 
                 SuggesterProjectData data = projectData.get(namedIndexReader.name);
                 if (data == null) {
-                    logger.log(Level.FINE, "{0} not yet initialized", namedIndexReader.name);
+                    LOGGER.log(Level.FINE, "{0} not yet initialized", namedIndexReader.name);
                     return null;
                 }
                 boolean gotLock = data.tryLock();