0006364: Added logging when instance ID changes

JumpMind · Apr 29, 2024 · b74734f · b74734f
1 parent 41c4fef
commit b74734f
Showing 1 changed file with 12 additions and 2 deletions.
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
@@ -65,6 +65,7 @@
 import org.jumpmind.symmetric.SymmetricException;
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.common.SystemConstants;
+import org.jumpmind.symmetric.common.TableConstants;
 import org.jumpmind.symmetric.db.ISymmetricDialect;
 import org.jumpmind.symmetric.model.Lock;
 import org.jumpmind.symmetric.model.NodeHost;
@@ -111,7 +112,10 @@ public void init() {
         }
         initInstanceId();
         if (isUpgradedInstanceId) {
-            nodeService.deleteNodeHost(nodeService.findIdentityNodeId()); // This is cleanup mostly for an upgrade.
+            String nodeHostTableName = TableConstants.getTableName(tablePrefix, TableConstants.SYM_NODE_HOST);
+            String nodeId = nodeService.findIdentityNodeId();
+            log.info("Deleting the row(s) in {} for node '{}' because the instance ID has changed", nodeHostTableName, nodeId);
+            nodeService.deleteNodeHost(nodeId); // This is cleanup mostly for an upgrade.
         }
         checkSymDbOwnership();
         for (Lock lock : lockCache.values()) {
@@ -165,14 +169,20 @@ public static String initInstanceId(IClusterInstanceGenerator generator) {
                 log.debug("Failed to load instance id from classpath '" + instanceIdURL + "'", ex);
             }
         }
-        if (StringUtils.isBlank(instanceId) || (generator != null && !generator.isValid(instanceId))) {
+        boolean isInstanceIdBlank = StringUtils.isBlank(instanceId);
+        if (isInstanceIdBlank || (generator != null && !generator.isValid(instanceId))) {
             String newInstanceId = null;
             if (generator != null) {
                 newInstanceId = generator.generateInstanceId();
             }
             if (newInstanceId == null) {
                 newInstanceId = generateInstanceId(AppUtils.getHostName());
             }
+            if (isInstanceIdBlank) {
+                log.info("Generated a new instance ID ({}) because the current instance ID is missing or blank", newInstanceId);
+            } else {
+                log.info("Generated a new instance ID ({}) because the current instance ID ({}) is invalid", newInstanceId, instanceId);
+            }
             instanceId = newInstanceId;
             isUpgradedInstanceId = true;
             if (instanceIdFile != null) {