Subsume --checkIndexVersion into regular run

Author: idodeclare

OpenGrok

@@ -449,6 +449,10 @@ ${BZR:+-Dorg.opensolaris.opengrok.history.Bazaar=$BZR} \
         ASSIGNMENTS="`echo $OPENGROK_ASSIGNMENTS | sed 's/[:space:]+/_/g'`"
         ASSIGNMENTS="-A `echo $ASSIGNMENTS | sed 's/,/ -A /g'`"
     fi
+
+    if [ -f "${XML_CONFIGURATION}" ]; then
+        CHK_INDEX_CONF="${XML_CONFIGURATION}"
+    fi
 }
 
 #
@@ -857,21 +861,6 @@ CreateRuntimeRequirements()
     fi
 }
 
-CheckIndexVersion()
-{
-    if [ ! -f "${XML_CONFIGURATION}" ]
-    then
-        return
-    fi
-    if ! MinimalInvocation --checkIndexVersion \
-        -R "${XML_CONFIGURATION}" -d "${DATA_ROOT}" "$@"
-    then
-        echo "\nIndex version check failed. You might want to remove all data" \
-            "under the data root directory ${DATA_ROOT} and reindex.\n"
-        exit 1
-    fi
-}
-
 MinimalInvocation()
 {
     ${DO} ${JAVA} ${JAVA_OPTS} ${PROPERTIES}                    	\
@@ -900,6 +889,7 @@ CommonInvocation()
         ${ASSIGNMENTS}							\
         ${READ_XML_CONF}                                        	\
         ${WEBAPP_CONFIG}						\
+        ${CHK_INDEX_CONF:+--checkIndexVersion} ${CHK_INDEX_CONF}	\
         ${OPENGROK_PROFILER:+--profiler}				\
         "${@}"
 }
@@ -1086,14 +1076,12 @@ case "${1}" in
 
     update)
         ValidateConfiguration
-        CheckIndexVersion
         CreateRuntimeRequirements
         UpdateGeneratedData && UpdateDescriptionCache
         ;;
 
     updateQuietly)
         ValidateConfiguration
-        CheckIndexVersion
         CreateRuntimeRequirements
         QUIET="-q"
         VERBOSE=""
@@ -1120,7 +1108,6 @@ case "${1}" in
             SRC_ROOT="${2}"
         fi
         ValidateConfiguration
-        CheckIndexVersion
         CreateRuntimeRequirements
         UpdateGeneratedData && UpdateDescriptionCache
         ;;
@@ -1135,7 +1122,6 @@ case "${1}" in
 	    FatalError "need configuration via OPENGROK_READ_XML_CONFIGURATION"
 	fi
         ValidateConfiguration
-        CheckIndexVersion $@
         CreateRuntimeRequirements
         UpdateDataPartial $@
         ;;

src/org/opensolaris/opengrok/index/IndexVersion.java

@@ -19,12 +19,15 @@
 
 /*
  * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
  */
 package org.opensolaris.opengrok.index;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.apache.lucene.index.IndexNotFoundException;
 import org.apache.lucene.index.SegmentInfos;
 import org.apache.lucene.store.Directory;
@@ -33,13 +36,17 @@
 import org.apache.lucene.store.NativeFSLockFactory;
 import org.apache.lucene.util.Version;
 import org.opensolaris.opengrok.configuration.Configuration;
+import org.opensolaris.opengrok.logger.LoggerFactory;
 
 /**
  * Index version checker
  *
  * @author Vladimir Kotal
  */
 public class IndexVersion {
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(IndexVersion.class);
+
     /**
      * exception thrown when index version does not match Lucene version
      */
@@ -58,18 +65,28 @@ public IndexVersionException(String s) {
      */
     public static void check(Configuration cfg, List<String> subFilesList) throws Exception {
         File indexRoot = new File(cfg.getDataRoot(), IndexDatabase.INDEX_DIR);
+        LOGGER.log(Level.FINE, "Checking for Lucene index version mismatch in {0}",
+                indexRoot);
 
         if (!subFilesList.isEmpty()) {
             // Assumes projects are enabled.
             for (String projectName : subFilesList) {
+                LOGGER.log(Level.FINER,
+                        "Checking Lucene index version in project {0}",
+                        projectName);
                 checkDir(getDirectory(new File(indexRoot, projectName)));
             }
         } else {
             if (cfg.isProjectsEnabled()) {
                 for (String projectName : cfg.getProjects().keySet()) {
+                    LOGGER.log(Level.FINER,
+                            "Checking Lucene index version in project {0}",
+                            projectName);
                     checkDir(getDirectory(new File(indexRoot, projectName)));
                 }
             } else {
+                LOGGER.log(Level.FINER, "Checking Lucene index version in {0}",
+                        indexRoot);
                 checkDir(getDirectory(indexRoot));
             }
         }

src/org/opensolaris/opengrok/index/Indexer.java

@@ -81,14 +81,14 @@ public final class Indexer {
 
     private static final Indexer index = new Indexer();
     private static Configuration cfg = null;
+    private static Configuration checkIndexVersionCfg;
     private static boolean listRepos = false;
     private static boolean runIndex = true;
     private static boolean optimizedChanged = false;
     private static boolean addProjects = false;
     private static boolean searchRepositories = false;
     private static boolean noindex = false;
     private static boolean awaitProfiler;
-    private static boolean checkIndexVersion = false;
 
     private static boolean help;
     private static String helpUsage;
@@ -128,7 +128,6 @@ public static void main(String argv[]) {
         boolean createDict = false;
 
         try {
-
             argv = parseOptions(argv);
             if (help) {
                 status = 1;
@@ -196,16 +195,17 @@ public static void main(String argv[]) {
             }
 
             // Check version of index(es) versus current Lucene version and exit
-            // with return code indicating success or failure.
-            if (checkIndexVersion) {
-                int retval = 0;
+            // with return code upon failure.
+            if (checkIndexVersionCfg != null) {
                 try {
-                    IndexVersion.check(cfg, subFilesList);
+                    IndexVersion.check(checkIndexVersionCfg, subFilesList);
                 } catch (IndexVersionException e) {
-                    System.err.printf("Index version check failed: %s", e);
-                    retval = 1;
+                    System.err.printf("Index version check failed: %s\n", e);
+                    System.err.printf("You might want to remove all data " +
+                            "under the DATA_ROOT and to reindex\n");
+                    status = 1;
+                    System.exit(status);
                 }
-                System.exit(retval);
             }
 
             // If an user used customizations for projects he perhaps just
@@ -388,7 +388,7 @@ public static String[] parseOptions(String[] argv) throws ParseException {
         OptionParser configure = OptionParser.scan(parser -> {
             parser.on("-R configPath").Do( cfgFile -> {
                 try {
-                cfg = Configuration.read(new File((String)cfgFile));
+                    cfg = Configuration.read(new File((String)cfgFile));
                 } catch(IOException e) {
                     die(e.getMessage());
                 }
@@ -399,7 +399,6 @@ public static String[] parseOptions(String[] argv) throws ParseException {
         OptionParser.accept(WebAddress.class, s -> { return parseWebAddress(s); });
 
         openGrok = OptionParser.Do(parser -> {
-
             parser.setPrologue(
                 String.format("\nUsage: java -jar %s [options] [subDir1 [...]]\n", program));
 
@@ -442,9 +441,14 @@ public static String[] parseOptions(String[] argv) throws ParseException {
                 }
             );
 
-            parser.on("--checkIndexVersion",
+            parser.on("--checkIndexVersion", "=/path/to/conf",
                     "Check if current Lucene version matches index version").Do( v -> {
-                checkIndexVersion = true;
+                try {
+                    File cfgFile = new File((String)v);
+                    checkIndexVersionCfg = Configuration.read(cfgFile);
+                } catch(IOException|NullPointerException e) {
+                    die(e.getMessage());
+                }
             });
 
             parser.on("-d", "--dataRoot", "=/path/to/data/root",