0001649: Remove auto.reload.sym.tables.on.upgrade altogether.

JumpMind · Apr 23, 2014 · 84a5463 · 84a5463
1 parent fbca28f
commit 84a5463
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 59 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -24,7 +24,6 @@
 import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -63,7 +62,6 @@
 import org.jumpmind.symmetric.model.NodeStatus;
 import org.jumpmind.symmetric.model.RemoteNodeStatuses;
 import org.jumpmind.symmetric.model.Router;
-import org.jumpmind.symmetric.model.TableReloadRequest;
 import org.jumpmind.symmetric.model.TriggerRouter;
 import org.jumpmind.symmetric.service.IAcknowledgeService;
 import org.jumpmind.symmetric.service.IBandwidthService;
@@ -503,52 +501,6 @@ public synchronized boolean start(boolean startJobs) {
 
                         triggerRouterService.syncTriggers();
 
-                        if (Version.isOlderMinorVersion(node.getSymmetricVersion())
-                                && !parameterService.isRegistrationServer()
-                                && parameterService.is(
-                                        ParameterConstants.AUTO_RELOAD_SYM_ON_UPGRADE, true)) {
-                            log.info("Minor version of SymmetricDS has increased.  Requesting a reload of key configuration tables");
-                            String parentNodeId = node.getCreatedAtNodeId();
-                            List<String> tableNames = new ArrayList<String>();
-                            String tablePrefix = getTablePrefix();
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_PARAMETER));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_CHANNEL));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_TRIGGER));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_ROUTER));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_TRIGGER_ROUTER));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_TRANSFORM_TABLE));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_LOAD_FILTER));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_TRANSFORM_COLUMN));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_CONFLICT));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_GROUPLET));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_GROUPLET_LINK));
-                            tableNames.add(TableConstants.getTableName(tablePrefix,
-                                    TableConstants.SYM_TRIGGER_ROUTER_GROUPLET));
-
-                            for (String tableName : tableNames) {
-                                TableReloadRequest request = new TableReloadRequest();
-                                request.setSourceNodeId(parentNodeId);
-                                request.setTargetNodeId(node.getNodeId());
-                                request.setTriggerId(tableName);
-                                request.setRouterId(Constants.UNKNOWN_ROUTER_ID);
-                                request.setLastUpdateBy(node.getSymmetricVersion() + " to "
-                                        + Version.version());
-                                dataService.saveTableReloadRequest(request);
-                            }
-
-                        }
-
                         if (parameterService
                                 .is(ParameterConstants.HEARTBEAT_SYNC_ON_STARTUP, false) || StringUtils.isBlank(node.getDatabaseType()) ||
                                 ! node.getSyncUrl().equals(parameterService.getSyncUrl())) {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java
@@ -86,7 +86,6 @@ private ParameterConstants() {
 
     public final static String AUTO_REGISTER_ENABLED = "auto.registration";
     public final static String AUTO_RELOAD_ENABLED = "auto.reload";
-    public final static String AUTO_RELOAD_SYM_ON_UPGRADE = "auto.reload.sym.tables.on.upgrade";
     public final static String AUTO_RELOAD_REVERSE_ENABLED = "auto.reload.reverse";
     public final static String AUTO_INSERT_REG_SVR_IF_NOT_FOUND = "auto.insert.registration.svr.if.not.found";
     public final static String AUTO_SYNC_CONFIGURATION = "auto.sync.configuration";

diff --git a/symmetric-core/src/main/resources/symmetric-default.properties b/symmetric-core/src/main/resources/symmetric-default.properties
@@ -356,16 +356,6 @@ auto.sync.triggers=true
 # Type: boolean
 auto.sync.triggers.after.config.change=true
 
-# If this is true, when a symmetric node other than the registration server
-# starts up and the minor release number has incremented, then the node will
-# request a reload of key symmetric tables (because there might be new tables or
-# columns.)
-#
-# DatabaseOverridable: true
-# Tags: general
-# Type: boolean
-auto.reload.sym.tables.on.upgrade=false
-
 # Capture and send SymmetricDS configuration changes to client nodes.
 #
 # Tags: general