0003894: Sync Triggers doesn't run after registration / initial load

when cluster.lock.enabled=true (3.8) # Conflicts: # symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java
JumpMind · Apr 23, 2019 · 4f636b0 · 4f636b0
1 parent 473c520
commit 4f636b0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/...e/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedDatabaseWriterFilter.java b/...e/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedDatabaseWriterFilter.java
@@ -327,6 +327,7 @@ public void syncEnded(DataContext context, List<IncomingBatch> batchesProcessed,
         if (context.get(CTX_KEY_RESYNC_NEEDED) != null
                 && parameterService.is(ParameterConstants.AUTO_SYNC_TRIGGERS)) {
             log.info("About to syncTriggers because new configuration came through the data loader");
+            engine.getClusterService().refreshLockEntries();  // Needed in case cluster.lock.enabled changed during config change.
             engine.getTriggerRouterService().syncTriggers();
             context.remove(CTX_KEY_RESYNC_NEEDED);
             engine.getRegistrationService().setAllowClientRegistration(true);

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IClusterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IClusterService.java
@@ -31,7 +31,9 @@
  */
 public interface IClusterService {
 
-    public void init();    
+    public void init();
+
+    public void refreshLockEntries();    
 
     public boolean lock(String action);
 

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java
@@ -90,6 +90,7 @@ public class ClusterService extends AbstractService implements IClusterService {
     private static boolean isUpgradedInstanceId;
 
     private String serverId = null;
+
     private static String instanceId = null;
 
     private INodeService nodeService;
@@ -122,20 +123,26 @@ public void init() {
 
         if (isClusteringEnabled()) {
             sqlTemplate.update(getSql("initLockSql"), new Object[] { getServerId() });
+            refreshLockEntries();
+        }
+    }
 
+    @Override
+    public void refreshLockEntries() {
+        if (isClusteringEnabled()) {
             Map<String, Lock> allLocks = findLocks();
 
             for (String action : actions) {
                 if (allLocks.get(action) == null) {
                     initLockTable(action, TYPE_CLUSTER);
                 }
             }
-            
+
             for (String action : sharedActions) {
                 if (allLocks.get(action) == null) {
                     initLockTable(action, TYPE_SHARED);
                 }
-            }
+            }        
         }
     }