Merge branch '3.9' of https://github.com/JumpMind/symmetric-ds.git in…

…to 3.9
JumpMind · Oct 30, 2018 · bb5f6bc · bb5f6bc
2 parents 29dc377 + 40b05f8
commit bb5f6bc
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 21 deletions.
diff --git a/symmetric-assemble/common.gradle b/symmetric-assemble/common.gradle
@@ -191,7 +191,7 @@ subprojects { subproject ->
         powerMockVersion = '1.5.3'
         mysqlVersion = '5.1.45'
         servletVersion = '3.1.0'
-        springVersion = '4.3.13.RELEASE'
+        springVersion = '4.3.16.RELEASE'
         jtdsVersion = '1.2.8'
         voltDbVersion = '6.2'
         bouncyCastleVersion = '1.59'

diff --git a/symmetric-assemble/gradle/wrapper/gradle-wrapper.properties b/symmetric-assemble/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
diff --git a/symmetric-assemble/src/asciidoc/appendix/mysql.ad b/symmetric-assemble/src/asciidoc/appendix/mysql.ad
@@ -31,6 +31,15 @@ grant create routine on *.* to symmetric;
 grant process on *.* to symmetric;
 ----
 
+Starting in MySQL 5.7.6, the "PROCESS" privilege is also required for the MySQL user that is modifying the application tables.
+This is required to look up the transaction id. Internally, the trigger will submit this query during an insert/update/delete:
+
+select TRX_ID from INFORMATION_SCHEMA.INNODB_TRX where TRX_MYSQL_THREAD_ID = CONNECTION_ID();
+
+----
+grant process on *.* to db_user;
+----
+
 MySQL allows '0000-00-00 00:00:00' to be entered as a value for datetime and timestamp columns.
 JDBC cannot deal with a date value with a year of 0. In order to work around this SymmetricDS can be configured to treat date and time 
 columns as varchar columns for data capture and data load. To enable this feature set the db.treat.date.time.as.varchar.enabled property to true.

diff --git a/symmetric-core/build.gradle b/symmetric-core/build.gradle
@@ -7,7 +7,7 @@ apply from: symAssembleDir + '/common.gradle'
         compile project(":symmetric-util")
         compile "commons-fileupload:commons-fileupload:$commonsFileuploadVersion"
         compile "javax.mail:mail:1.4.5"
-        compile "com.fasterxml.jackson.core:jackson-databind:2.9.3"
+        compile "com.fasterxml.jackson.core:jackson-databind:2.9.5"
         compile "com.google.code.gson:gson:2.8.2"
         compile "org.springframework:spring-core:$springVersion"
 

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/monitor/MonitorTypeMemory.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/monitor/MonitorTypeMemory.java
@@ -61,7 +61,7 @@ public MonitorEvent check(Monitor monitor) {
         MonitorEvent event = new MonitorEvent();
         long usage = 0;
         if (tenuredPool != null) {
-            usage = (long) (tenuredPool.getUsage().getUsed() / tenuredPool.getUsage().getMax());
+            usage = (long) ((double)tenuredPool.getUsage().getUsed() / (double)tenuredPool.getUsage().getMax() * 100);
         }
         event.setValue(usage);
         return event;

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/FileSyncService.java
@@ -146,6 +146,10 @@ public void trackChanges(boolean force) {
                     try {
                         log.debug("Tracking changes for file sync");
                         Node local = engine.getNodeService().findIdentity();
+                        if (local == null) {
+                            log.warn("Not running file sync trackChanges because the local node is not available yet.  It may not be registered yet.");
+                            return;
+                        }
                         ProcessInfo processInfo = engine.getStatisticManager().newProcessInfo(
                                 new ProcessInfoKey(local.getNodeId(), null, ProcessType.FILE_SYNC_TRACKER));
                         boolean useCrc = engine.getParameterService().is(ParameterConstants.FILE_SYNC_USE_CRC);

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java
@@ -933,7 +933,11 @@ public AuthenticationStatus getAuthenticationStatus(String nodeId, String securi
         if (node == null) {
             retVal = AuthenticationStatus.REGISTRATION_REQUIRED;
         } else if (!syncEnabled(node)) {
-            retVal = AuthenticationStatus.SYNC_DISABLED;
+            if(registrationOpen(node)){
+                retVal = AuthenticationStatus.REGISTRATION_REQUIRED;
+            }else{
+                retVal = AuthenticationStatus.SYNC_DISABLED;
+            }
         } else if (!isNodeAuthorized(nodeId, securityToken)) {
             retVal = AuthenticationStatus.FORBIDDEN;
         }
@@ -946,6 +950,14 @@ protected boolean syncEnabled(Node node) {
             syncEnabled = node.isSyncEnabled();
         }
         return syncEnabled;
-    }    
+    }
+
+    protected boolean registrationOpen(Node node){
+        NodeSecurity security = findNodeSecurity(node.getNodeId());
+        if(security != null){
+            return security.isRegistrationEnabled();
+        }
+        return false;
+    } 
 
 }
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
@@ -1343,20 +1343,14 @@ public void dropTriggers(TriggerHistory history) {
 
     protected void dropTriggers(TriggerHistory history, StringBuilder sqlBuffer) {
         try {
-            if (StringUtils.isNotBlank(history.getNameForInsertTrigger())) {
-                symmetricDialect.removeTrigger(sqlBuffer, history.getSourceCatalogName(), history.getSourceSchemaName(),
-                        history.getNameForInsertTrigger(), history.getSourceTableName());
-            }
+            dropTrigger(sqlBuffer, history.getSourceCatalogName(), history.getSourceSchemaName(),
+                    history.getNameForInsertTrigger(), history.getSourceTableName());
 
-            if (StringUtils.isNotBlank(history.getNameForDeleteTrigger())) {
-                symmetricDialect.removeTrigger(sqlBuffer, history.getSourceCatalogName(), history.getSourceSchemaName(),
-                        history.getNameForDeleteTrigger(), history.getSourceTableName());
-            }
+            dropTrigger(sqlBuffer, history.getSourceCatalogName(), history.getSourceSchemaName(),
+                    history.getNameForDeleteTrigger(), history.getSourceTableName());
 
-            if (StringUtils.isNotBlank(history.getNameForUpdateTrigger())) {
-                symmetricDialect.removeTrigger(sqlBuffer, history.getSourceCatalogName(), history.getSourceSchemaName(),
-                        history.getNameForUpdateTrigger(), history.getSourceTableName());
-            }
+            dropTrigger(sqlBuffer, history.getSourceCatalogName(), history.getSourceSchemaName(),
+                    history.getNameForUpdateTrigger(), history.getSourceTableName());
 
             if (parameterService.is(ParameterConstants.AUTO_SYNC_TRIGGERS)) {
                 for (ITriggerCreationListener l : extensionService.getExtensionPointList(ITriggerCreationListener.class)) {
@@ -1381,6 +1375,16 @@ protected void dropTriggers(TriggerHistory history, StringBuilder sqlBuffer) {
             log.error("Error while dropping triggers for table {}", history.getSourceTableName(), ex);
         }
     }
+
+    protected void dropTrigger(StringBuilder sqlBuffer, String catalog, String schema, String triggerName, String tableName) {
+        if (StringUtils.isNotBlank(triggerName)) {
+            try {
+                symmetricDialect.removeTrigger(sqlBuffer, catalog, schema, triggerName, tableName);
+            } catch (Throwable e) {
+                log.error("Error while dropping trigger {} for table {}", triggerName, tableName, e);
+            }
+        }
+    }
 
     protected List<TriggerRouter> toList(Collection<List<TriggerRouter>> source) {
         ArrayList<TriggerRouter> list = new ArrayList<TriggerRouter>();
@@ -1507,8 +1511,8 @@ public void syncTriggers(Table table, boolean force) {
         List<Trigger> triggersForCurrentNode = getTriggersForCurrentNode();
         List<TriggerHistory> activeTriggerHistories = getActiveTriggerHistories();
         for (Trigger trigger : triggersForCurrentNode) {
-            if (trigger.matches(table, platform.getDefaultCatalog(), platform.getDefaultSchema(),
-                    ignoreCase)) {
+            if (trigger.matches(table, platform.getDefaultCatalog(), platform.getDefaultSchema(), ignoreCase) &&
+                    (!trigger.isSourceTableNameWildCarded() || !containsExactMatchForSourceTableName(table, triggersForCurrentNode, ignoreCase))) {
                 log.info("Synchronizing triggers for {}", table.getFullyQualifiedTableName());
                 updateOrCreateDatabaseTriggers(trigger, table, null, force, true, activeTriggerHistories);
                 log.info("Done synchronizing triggers for {}", table.getFullyQualifiedTableName());

diff --git a/symmetric-sqlexplorer/build.gradle b/symmetric-sqlexplorer/build.gradle
@@ -38,7 +38,9 @@ artifacts {
 }
 
 configurations.archives.with {    
-    artifacts.remove artifacts.find { it.archiveTask.is war }
+
+
+    artifacts.remove artifacts.find { it.type == 'war' }
 }
 
 dependencies {