[HippoCMS-svn] [45313] hippo-cms7/repository: REPO-992 when the repository shuts down, running scripts must be cancelled

[uhommes]

Revision: 45313
Author:   uhommes
Date:     2014-06-25 16:21:44 +0200 (Wed, 25 Jun 2014)
Log Message:
-----------
REPO-992 when the repository shuts down, running scripts must be cancelled

Modified Paths:
--------------
    
hippo-cms7/repository/trunk/engine/src/main/java/org/onehippo/repository/update/UpdaterExecutionModule.java

Modified: 
hippo-cms7/repository/trunk/engine/src/main/java/org/onehippo/repository/update/UpdaterExecutionModule.java
===================================================================
--- 
hippo-cms7/repository/trunk/engine/src/main/java/org/onehippo/repository/update/UpdaterExecutionModule.java
 2014-06-25 13:06:21 UTC (rev 45312)
+++ 
hippo-cms7/repository/trunk/engine/src/main/java/org/onehippo/repository/update/UpdaterExecutionModule.java
 2014-06-25 14:21:44 UTC (rev 45313)
@@ -35,7 +35,6 @@
 import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 
-import org.codehaus.groovy.control.CompilationFailedException;
 import org.hippoecm.repository.api.HippoNodeType;
 import org.onehippo.cms7.services.HippoServiceRegistry;
 import org.onehippo.repository.modules.DaemonModule;
@@ -56,6 +55,8 @@
     private Session session;
     private UpdaterRegistry updaterRegistry;
     private NodeUpdaterService updaterService;
+    private volatile ExecuteUpdatersTask task;
+    private final Object monitor = new Object();
 
     @Override
     public void initialize(final Session session) throws RepositoryException {
@@ -100,7 +101,16 @@
         } catch (RepositoryException e) {
             log.error(e.getClass().getName() + ": " + e.getMessage(), e);
         }
+        synchronized (monitor) {
+            if (task != null) {
+                task.cancel();
+            }
         updaterExecutor.shutdown();
+        }
+        try {
+            updaterExecutor.awaitTermination(10, TimeUnit.SECONDS);
+        } catch (InterruptedException ignore) {
+        }
         if (updaterRegistry != null) {
             HippoServiceRegistry.unregisterService(updaterService, 
NodeUpdaterService.class);
             updaterRegistry.stop();
@@ -113,8 +123,12 @@
     }
 
     private void runExecuteUpdatersTask() {
-        updaterExecutor.execute(new ExecuteUpdatersTask());
+        synchronized (monitor) {
+            if (task == null) {
+                updaterExecutor.execute(task = new ExecuteUpdatersTask());
     }
+        }
+    }
 
     private final class ExecuteUpdatersTask implements Runnable {
 
@@ -121,6 +135,7 @@
         private Lock lock;
         private ScheduledExecutorService keepAliveExecutor;
         private UpdaterExecutor updaterExecutor;
+        private volatile boolean cancelled;
 
         private ExecuteUpdatersTask() {}
 
@@ -134,11 +149,22 @@
             } catch (RepositoryException e) {
                 log.error("Failed to obtain lock", e);
             } finally {
+                synchronized (monitor) {
+                    task = null;
+                }
                 stopLockKeepAlive();
                 unlock();
             }
         }
 
+        private void cancel() {
+            cancelled = true;
+            synchronized (monitor) {
+                if (updaterExecutor != null) {
+                    updaterExecutor.cancel();
+                }
+            }
+        }
 
         private boolean lock() throws RepositoryException {
             log.debug("Trying to obtain lock");
@@ -159,11 +185,10 @@
         }
 
         private void executeUpdatersInQueue() {
-            Node updaterNode = getNextUpdaterNodeFromQueue();
-            while (updaterNode != null) {
+            Node updaterNode;
+            while (!cancelled && (updaterNode = getNextUpdaterNodeFromQueue()) 
!= null) {
                 executeUpdater(updaterNode);
                 moveToHistory(updaterNode);
-                updaterNode = getNextUpdaterNodeFromQueue();
             }
         }
 
@@ -179,9 +204,11 @@
                 log.error(e.getClass().getName() + ": " + e.getMessage(), e);
             } finally {
                 if (updaterExecutor != null) {
+                    synchronized (monitor) {
                     updaterExecutor.destroy();
                     updaterExecutor = null;
                 }
+                }
                 if (session != null) {
                     session.logout();
                 }

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn