0002428: Log who has the sync triggers job locked if it is cluster

locked and another node attempts to sync triggers
JumpMind · Oct 28, 2015 · 455680e · 455680e
1 parent 746ca6d
commit 455680e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
@@ -51,6 +51,7 @@
 import org.jumpmind.symmetric.config.TriggerSelector;
 import org.jumpmind.symmetric.io.data.DataEventType;
 import org.jumpmind.symmetric.model.Channel;
+import org.jumpmind.symmetric.model.Lock;
 import org.jumpmind.symmetric.model.NodeGroupLink;
 import org.jumpmind.symmetric.model.NodeSecurity;
 import org.jumpmind.symmetric.model.Router;
@@ -119,7 +120,7 @@ public class TriggerRouterService extends AbstractService implements ITriggerRou
 
     private Date lastUpdateTime;
 
-    private Object cacheLock = new Object();
+    private Object cacheLock = new Object();    
 
     /**
      * Cache the history for performance. History never changes and does not
@@ -1185,7 +1186,12 @@ public void syncTriggers(StringBuilder sqlBuffer, boolean force) {
                         log.info("Done synchronizing triggers");
                     }
                 } else {
-                    log.info("Sync triggers was locked by the cluster service");
+                    Lock lock = clusterService.findLocks().get(ClusterConstants.SYNCTRIGGERS);
+                    if (lock != null) {
+                        log.info("Sync triggers was locked by the cluster service.  The locking server id was: {}.  The lock time was: {}", lock.getLockingServerId(), lock.getLockTime());
+                    } else {
+                        log.info("Sync triggers was locked by something but lock details were found");
+                    }
                 }
             }
         } else {