Avoid reindexing before executing upgrade tasks (#19952)

* Avoid reindexing before executing upgrade tasks * Cancels running thread if any
dotCMS · Feb 16, 2021 · 3e4401c · 3e4401c
1 parent 7ca466f
commit 3e4401c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java b/dotCMS/src/main/java/com/dotmarketing/common/reindex/ReindexThread.java
@@ -295,6 +295,17 @@ public static void stopThread() {
         }
     }
 
+    /**
+     * Gets the running thread if any, and cancels it.
+     */
+
+    public static void cancelThread(){
+        if (instance != null && instance.threadRunning != null) {
+            instance.threadRunning.cancel(true);
+            instance = null;
+        }
+    }
+
     /**
      * This instance is intended to already be started. It will try to restart the thread if instance is
      * null.

diff --git a/dotCMS/src/main/java/com/dotmarketing/startup/StartupTasksExecutor.java b/dotCMS/src/main/java/com/dotmarketing/startup/StartupTasksExecutor.java
@@ -180,7 +180,7 @@ public void executeUpgrades() throws DotDataException {
         String name = null;
 
 
-        ReindexThread.pause();
+        ReindexThread.cancelThread();
         for (Class<?> c : TaskLocatorUtil.getStartupRunOnceTaskClasses()) {
             name = c.getCanonicalName();
             name = name.substring(name.lastIndexOf(".") + 1);