0003861: Table reload request by channel will be treated as a full load

and mark all outgoing batches as OK
JumpMind · Jan 22, 2019 · 80d11e9 · 80d11e9
1 parent 2aca731
commit 80d11e9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/TableReloadRequest.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/TableReloadRequest.java
@@ -155,7 +155,11 @@ public void setDeleteFirst(boolean deleteFirst) {
     }
 
     public boolean isFullLoadRequest() {
-        return ParameterConstants.ALL.equals(getTriggerId()) && ParameterConstants.ALL.equals(getRouterId());
+        return ParameterConstants.ALL.equals(getTriggerId()) && ParameterConstants.ALL.equals(getRouterId()) && getChannelId() == null;
+    }
+
+    public boolean isChannelRequest() {
+        return getChannelId() != null;
     }
 
     public String getIdentifier() {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -390,8 +390,17 @@ public void insertReloadEvents(Node targetNode, boolean reverse, List<TableReloa
                     boolean isFullLoad = reloadRequests == null 
                             || (reloadRequests.size() == 1 && reloadRequests.get(0).isFullLoadRequest());
 
+                    boolean isChannelLoad = false;
+                    String channelId = null;
+                    if (reloadRequests != null 
+                            && (reloadRequests.size() == 1 && reloadRequests.get(0).isChannelRequest())) {
+                        isChannelLoad=true;
+                        channelId = reloadRequests.get(0).getChannelId();
+                    }
+
                     if (!reverse) {
-                        log.info("Queueing up " + (isFullLoad ? "an initial" : "a") + " load to node " + targetNode.getNodeId());
+                        log.info("Queueing up " + (isFullLoad ? "an initial" : "a") + " load to node " + targetNode.getNodeId() 
+                            + (isChannelLoad ? " for channel " + channelId : ""));
                     } else {
                         log.info("Queueing up a reverse " + (isFullLoad ? "initial" : "") + " load to node " + targetNode.getNodeId());
                     }
@@ -430,10 +439,10 @@ public void insertReloadEvents(Node targetNode, boolean reverse, List<TableReloa
 
                         List<TriggerHistory> triggerHistories = new ArrayList<TriggerHistory>();
 
-                        if (isFullLoad) {
+                        if (isFullLoad || isChannelLoad) {
                             triggerHistories.addAll(activeHistories);
                             if (reloadRequests != null && reloadRequests.size() == 1) {
-                                String channelId = reloadRequests.get(0).getChannelId();
+
                                 if (channelId != null) {
                                     List<TriggerHistory> channelTriggerHistories = new ArrayList<TriggerHistory>();
 
@@ -465,7 +474,7 @@ public void insertReloadEvents(Node targetNode, boolean reverse, List<TableReloa
                                     createBy, transactional, transaction);
                             }
                         }
-                        Map<String, TableReloadRequest> mapReloadRequests = convertReloadListToMap(reloadRequests, triggerRouters, isFullLoad);
+                        Map<String, TableReloadRequest> mapReloadRequests = convertReloadListToMap(reloadRequests, triggerRouters, isFullLoad, isChannelLoad);
 
                         String symNodeSecurityReloadChannel = null;
                         int totalTableCount = 0;
@@ -586,13 +595,13 @@ private String findChannelFor(TriggerHistory history, List<TriggerRouter> trigge
     }
 
     @SuppressWarnings("unchecked")
-    protected Map<String, TableReloadRequest> convertReloadListToMap(List<TableReloadRequest> reloadRequests, List<TriggerRouter> triggerRouters, boolean isFullLoad) {
+    protected Map<String, TableReloadRequest> convertReloadListToMap(List<TableReloadRequest> reloadRequests, List<TriggerRouter> triggerRouters, boolean isFullLoad, boolean isChannelLoad) {
         if (reloadRequests == null) {
             return null;
         }
         Map<String, TableReloadRequest> reloadMap = new CaseInsensitiveMap();
         for (TableReloadRequest reloadRequest : reloadRequests) {
-            if (!isFullLoad) {
+            if (!isFullLoad && !isChannelLoad) {
                 validate(reloadRequest, triggerRouters);
             }
             reloadMap.put(reloadRequest.getIdentifier(), reloadRequest);