9479: Add more logs to debug virtual map reconnect issues

platform-sdk/swirlds-common/src/main/java/com/swirlds/common/merkle/synchronization/LearningSynchronizer.java

@@ -36,6 +36,7 @@
 import com.swirlds.common.merkle.synchronization.views.CustomReconnectRoot;
 import com.swirlds.common.merkle.synchronization.views.LearnerTreeView;
 import com.swirlds.common.merkle.synchronization.views.StandardLearnerTreeView;
+import com.swirlds.common.merkle.utility.MerkleTreeVisualizer;
 import com.swirlds.common.threading.manager.ThreadManager;
 import com.swirlds.common.threading.pool.StandardWorkGroup;
 import com.swirlds.logging.payloads.SynchronizationCompletePayload;
@@ -149,7 +150,14 @@
      * Attempt to free any and all resources that were acquired during the reconnect attempt.
      */
     private void abort() {
-        logger.warn(RECONNECT.getMarker(), "deleting partially constructed tree");
+        logger.warn(
+                RECONNECT.getMarker(),
+                "Deleting partially constructed tree:\n{}",
+                new MerkleTreeVisualizer(newRoot)
+                        .setDepth(5)
+                        .setUseHashes(false)
+                        .setUseMnemonics(false)
+                        .render());
         try {
             if (newRoot != null) {
                 newRoot.release();

platform-sdk/swirlds-common/src/main/java/com/swirlds/common/merkle/utility/MerkleTreeVisualizer.java

@@ -196,18 +196,8 @@
                 indexString = Integer.toString(route.getStep(-1));
             }
 
-            final Hash hash = node == null ? CryptographyHolder.get().getNullHash() : node.getHash();
             final String className = node == null ? "null" : node.getClass().getSimpleName();
 
-            final String hashString;
-            if (hash == null) {
-                hashString = "null";
-            } else if (hashLength == -1) {
-                hashString = hash.toString();
-            } else {
-                hashString = hash.toString().substring(0, hashLength);
-            }
-
             final String formattedIndexString = useColors ? BRIGHT_CYAN.apply(indexString) : indexString;
             final String formattedClassName = useColors ? BRIGHT_YELLOW.apply(className) : className;
 
@@ -229,15 +219,27 @@
                 table.addToRow(formattedRouteString);
             }
 
-            if (useMnemonics) {
-                final String mnemonic = hash == null ? "" : hash.toMnemonic();
-                final String formattedMnemonic = useColors ? WHITE.apply(mnemonic) : mnemonic;
-                table.addToRow(formattedMnemonic);
-            }
+            if (useHashes || useMnemonics) {
+                final Hash hash = node == null ? CryptographyHolder.get().getNullHash() : node.getHash();
+                final String hashString;
+                if (hash == null) {
+                    hashString = "null";
+                } else if (hashLength == -1) {
+                    hashString = hash.toString();
+                } else {
+                    hashString = hash.toString().substring(0, hashLength);
+                }
+
+                if (useMnemonics) {
+                    final String mnemonic = hash == null ? "" : hash.toMnemonic();
+                    final String formattedMnemonic = useColors ? WHITE.apply(mnemonic) : mnemonic;
+                    table.addToRow(formattedMnemonic);
+                }
 
-            if (useHashes) {
-                final String formattedHashString = useColors ? GRAY.apply(hashString) : hashString;
-                table.addToRow(formattedHashString);
+                if (useHashes) {
+                    final String formattedHashString = useColors ? GRAY.apply(hashString) : hashString;
+                    table.addToRow(formattedHashString);
+                }
             }
         });
 

platform-sdk/swirlds-jasperdb/src/main/java/com/swirlds/merkledb/MerkleDbDataSource.java

@@ -736,29 +736,37 @@
                 // shut down all executors
                 shutdownThreadsAndWait(storeInternalExecutor, storeKeyToPathExecutor, snapshotExecutor);
             } finally {
-                // close all closable data stores
-                logger.info(MERKLE_DB.getMarker(), "Closing Data Source [{}]", tableName);
-                if (hashStoreRam != null) {
-                    hashStoreRam.close();
-                }
-                if (hashStoreDisk != null) {
-                    hashStoreDisk.close();
-                }
-                pathToDiskLocationInternalNodes.close();
-                pathToDiskLocationLeafNodes.close();
-                if (longKeyToPath != null) {
-                    longKeyToPath.close();
-                }
-                if (objectKeyToPath != null) {
-                    objectKeyToPath.close();
+                try {
+                    // close all closable data stores
+                    logger.info(MERKLE_DB.getMarker(), "Closing Data Source [{}]", tableName);
+                    if (hashStoreRam != null) {
+                        hashStoreRam.close();
+                    }
+                    if (hashStoreDisk != null) {
+                        hashStoreDisk.close();
+                    }
+                    pathToDiskLocationInternalNodes.close();
+                    pathToDiskLocationLeafNodes.close();
+                    if (longKeyToPath != null) {
+                        longKeyToPath.close();
+                    }
+                    if (objectKeyToPath != null) {
+                        objectKeyToPath.close();
+                    }
+                    pathToKeyValue.close();
+                    // Store metadata
+                    saveMetadata(dbPaths.metadataFile);
+                } catch (final Exception e) {
+                    logger.warn(EXCEPTION.getMarker(), "Exception while closing Data Source [{}]", tableName);
+                } catch (final Error t) {
+                    logger.error(EXCEPTION.getMarker(), "Error while closing Data Source [{}]", tableName);
+                    throw t;
+                } finally {
+                    // updated count of open databases
+                    COUNT_OF_OPEN_DATABASES.decrement();
+                    // Notify the database
+                    database.closeDataSource(this);
                 }
-                pathToKeyValue.close();
-                // updated count of open databases
-                COUNT_OF_OPEN_DATABASES.decrement();
-                // Store metadata
-                saveMetadata(dbPaths.metadataFile);
-                // Notify the database
-                database.closeDataSource(this);
             }
         }
     }

platform-sdk/swirlds-virtualmap/src/main/java/com/swirlds/virtualmap/internal/merkle/VirtualRootNode.java

@@ -965,7 +965,7 @@
         if (dataSource != null) {
             try {
                 dataSource.close();
-            } catch (final IOException e) {
+            } catch (final Exception e) {
                 logger.error(
                         EXCEPTION.getMarker(), "Could not close the dataSource after all copies were destroyed", e);
             }