05786 5396 misc startup improvements

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/Browser.java

@@ -16,6 +16,7 @@
 
 package com.swirlds.platform;
 
+import static com.swirlds.base.ArgumentUtils.throwArgNull;
 import static com.swirlds.common.io.utility.FileUtils.getAbsolutePath;
 import static com.swirlds.common.io.utility.FileUtils.rethrowIO;
 import static com.swirlds.common.threading.manager.AdHocThreadManager.getStaticThreadManager;
@@ -64,7 +65,6 @@
 import com.swirlds.common.system.address.Address;
 import com.swirlds.common.system.address.AddressBook;
 import com.swirlds.common.threading.framework.config.ThreadConfiguration;
-import com.swirlds.common.threading.interrupt.Uninterruptable;
 import com.swirlds.common.utility.CommonUtils;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.ConfigurationBuilder;
@@ -89,6 +89,10 @@
 import com.swirlds.platform.gui.internal.InfoMember;
 import com.swirlds.platform.gui.internal.InfoSwirld;
 import com.swirlds.platform.gui.internal.StateHierarchy;
+import com.swirlds.platform.health.OSHealthChecker;
+import com.swirlds.platform.health.clock.OSClockSpeedSourceChecker;
+import com.swirlds.platform.health.entropy.OSEntropyChecker;
+import com.swirlds.platform.health.filesystem.OSFileSystemChecker;
 import com.swirlds.platform.reconnect.emergency.EmergencySignedStateValidator;
 import com.swirlds.platform.state.EmergencyRecoveryManager;
 import com.swirlds.platform.state.signed.SavedStateInfo;
@@ -113,13 +117,15 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import javax.swing.JFrame;
 import javax.swing.UIManager;
@@ -151,9 +157,6 @@ public class Browser {
 
     private static Logger logger = LogManager.getLogger(Browser.class);
 
-    /** the thread for each Platform.run */
-    private static Thread[] platformRunThreads;
-
     private static Thread[] appRunThreads;
 
     private static Browser INSTANCE;
@@ -226,6 +229,13 @@ private Browser(final Set<Integer> localNodesToStart) throws IOException {
         ConfigurationHolder.getInstance().setConfiguration(configuration);
         CryptographyHolder.reset();
 
+        OSHealthChecker.performOSHealthChecks(
+                configuration.getConfigData(OSHealthCheckConfig.class),
+                List.of(
+                        OSClockSpeedSourceChecker::performClockSourceSpeedCheck,
+                        OSEntropyChecker::performEntropyChecks,
+                        OSFileSystemChecker::performFileSystemCheck));
+
         try {
             // discover the inset size and set the look and feel
             if (!GraphicsEnvironment.isHeadless()) {
@@ -350,8 +360,8 @@ private Browser(final Set<Integer> localNodesToStart) throws IOException {
     @NonNull
     private Map<Long, SwirldMain> loadSwirldMains(
             @NonNull final ApplicationDefinition appDefinition, @NonNull final Set<Integer> localNodesToStart) {
-        Objects.requireNonNull(appDefinition, "appDefinition must not be null");
-        Objects.requireNonNull(localNodesToStart, "localNodesToStart must not be null");
+        throwArgNull(appDefinition, "appDefinition must not be null");
+        throwArgNull(localNodesToStart, "localNodesToStart must not be null");
         try {
             // Create the SwirldAppLoader
             final SwirldAppLoader appLoader;
@@ -577,19 +587,21 @@ private static SwirldMain buildAppMain(final ApplicationDefinition appDefinition
         }
     }
 
-    private void createLocalPlatforms(
+    private Collection<SwirldsPlatform> createLocalPlatforms(
             @NonNull final ApplicationDefinition appDefinition,
             @NonNull final Crypto[] crypto,
             @NonNull final InfoSwirld infoSwirld,
             @NonNull final Map<Long, SwirldMain> appMains,
             @NonNull final Configuration configuration,
             @NonNull final MetricsProvider metricsProvider) {
-        Objects.requireNonNull(appDefinition, "the app definition must not be null");
-        Objects.requireNonNull(crypto, "the crypto array must not be null");
-        Objects.requireNonNull(infoSwirld, "the infoSwirld must not be null");
-        Objects.requireNonNull(appMains, "the appMains map must not be null");
-        Objects.requireNonNull(configuration, "the configuration must not be null");
-        Objects.requireNonNull(metricsProvider, "the metricsProvider must not be null");
+        throwArgNull(appDefinition, "the app definition must not be null");
+        throwArgNull(crypto, "the crypto array must not be null");
+        throwArgNull(infoSwirld, "the infoSwirld must not be null");
+        throwArgNull(appMains, "the appMains map must not be null");
+        throwArgNull(configuration, "the configuration must not be null");
+        throwArgNull(metricsProvider, "the metricsProvider must not be null");
+
+        final List<SwirldsPlatform> platforms = new ArrayList<>();
 
         final AddressBook addressBook = appDefinition.getAddressBook();
 
@@ -654,6 +666,7 @@ private void createLocalPlatforms(
                         appMain::newState,
                         loadedSignedState,
                         emergencyRecoveryManager);
+                platforms.add(platform);
 
                 new InfoMember(infoSwirld, i, platform);
 
@@ -667,26 +680,14 @@ private void createLocalPlatforms(
                         .build();
                 appRunThreads[ownHostIndex] = appThread;
 
-                platformRunThreads[ownHostIndex] = new ThreadConfiguration(getStaticThreadManager())
-                        .setDaemon(false)
-                        .setPriority(Settings.getInstance().getThreadPriorityNonSync())
-                        .setNodeId((long) ownHostIndex)
-                        .setComponent(SwirldsPlatform.PLATFORM_THREAD_POOL_NAME)
-                        .setThreadName("platformRun")
-                        .setRunnable(() -> {
-                            platform.run();
-                            // When the SwirldMain quits, end the run() for this platform instance
-                            Uninterruptable.abortAndLogIfInterrupted(
-                                    appThread::join, "interrupted when waiting for app thread to terminate");
-                        })
-                        .build();
-
                 ownHostIndex++;
                 synchronized (getPlatforms()) {
                     getPlatforms().add(platform);
                 }
             }
         }
+
+        return Collections.unmodifiableList(platforms);
     }
 
     /**
@@ -767,7 +768,6 @@ private void startPlatforms(
         // the thread for each Platform.run
         // will create a new thread with a new Platform for each local address
         // general address number addIndex is local address number i
-        platformRunThreads = new Thread[ownHostCount];
         appRunThreads = new Thread[ownHostCount];
         appDefinition.setMasterKey(new byte[CryptoConstants.SYM_KEY_SIZE_BYTES]);
         appDefinition.setSwirldId(new byte[CryptoConstants.HASH_SIZE_BYTES]);
@@ -794,14 +794,15 @@ private void startPlatforms(
         CryptoMetrics.registerMetrics(globalMetrics);
 
         // Create all instances for all nodes that should run locally
-        createLocalPlatforms(appDefinition, crypto, infoSwirld, appMains, configuration, metricsProvider);
+        final Collection<SwirldsPlatform> platforms =
+                createLocalPlatforms(appDefinition, crypto, infoSwirld, appMains, configuration, metricsProvider);
 
         // Write all metrics information to file
         MetricsDocUtils.writeMetricsDocumentToFile(globalMetrics, getPlatforms(), configuration);
 
-        // the platforms need to start after all the initial loading has been done
-        for (int nodeIndex = 0; nodeIndex < platformRunThreads.length; nodeIndex++) {
-            platformRunThreads[nodeIndex].start();
+        platforms.forEach(SwirldsPlatform::start);
+
+        for (int nodeIndex = 0; nodeIndex < appRunThreads.length; nodeIndex++) {
             appRunThreads[nodeIndex].start();
         }
 
@@ -817,15 +818,6 @@ private void startPlatforms(
         logger.debug(STARTUP.getMarker(), "Done with starting platforms");
     }
 
-    /**
-     * Wait until all platform main threads are stopped.
-     */
-    public static void join() throws InterruptedException {
-        for (final Thread thread : platformRunThreads) {
-            thread.join();
-        }
-    }
-
     public static void main(final String[] args) {
         parseCommandLineArgsAndLaunch(args);
     }

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/SwirldsPlatform.java

@@ -25,9 +25,7 @@
 import static com.swirlds.logging.LogMarker.STARTUP;
 import static com.swirlds.platform.state.GenesisStateBuilder.buildGenesisState;
 
-import com.swirlds.common.config.BasicConfig;
 import com.swirlds.common.config.ConsensusConfig;
-import com.swirlds.common.config.OSHealthCheckConfig;
 import com.swirlds.common.config.StateConfig;
 import com.swirlds.common.config.singleton.ConfigurationHolder;
 import com.swirlds.common.context.PlatformContext;
@@ -76,9 +74,9 @@
 import com.swirlds.common.time.Time;
 import com.swirlds.common.utility.AutoCloseableWrapper;
 import com.swirlds.common.utility.Clearable;
-import com.swirlds.common.utility.CommonUtils;
 import com.swirlds.common.utility.LoggingClearables;
 import com.swirlds.common.utility.PlatformVersion;
+import com.swirlds.common.utility.Startable;
 import com.swirlds.logging.LogMarker;
 import com.swirlds.logging.payloads.PlatformStatusPayload;
 import com.swirlds.logging.payloads.SavedStateLoadedPayload;
@@ -144,10 +142,6 @@
 import com.swirlds.platform.event.validation.TransactionSizeValidator;
 import com.swirlds.platform.eventhandling.ConsensusRoundHandler;
 import com.swirlds.platform.eventhandling.PreConsensusEventHandler;
-import com.swirlds.platform.health.OSHealthChecker;
-import com.swirlds.platform.health.clock.OSClockSpeedSourceChecker;
-import com.swirlds.platform.health.entropy.OSEntropyChecker;
-import com.swirlds.platform.health.filesystem.OSFileSystemChecker;
 import com.swirlds.platform.intake.IntakeCycleStats;
 import com.swirlds.platform.internal.EventImpl;
 import com.swirlds.platform.metrics.AddedEventMetrics;
@@ -191,7 +185,6 @@
 import com.swirlds.platform.reconnect.ReconnectProtocolResponder;
 import com.swirlds.platform.reconnect.ReconnectThrottle;
 import com.swirlds.platform.reconnect.emergency.EmergencyReconnectProtocol;
-import com.swirlds.platform.state.BackgroundHashChecker;
 import com.swirlds.platform.state.EmergencyRecoveryManager;
 import com.swirlds.platform.state.State;
 import com.swirlds.platform.state.StateSettings;
@@ -234,7 +227,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods, ConnectionTracker {
+public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods, ConnectionTracker, Startable {
 
     public static final String PLATFORM_THREAD_POOL_NAME = "platform-core";
     /** use this for all logging, as controlled by the optional data/log4j2.xml file */
@@ -247,7 +240,7 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
      * the ID of the member running this. Since a node can be a main node or a mirror node, the ID is not a primitive
      * value
      */
-    protected final NodeId selfId;
+    private final NodeId selfId;
     /** tell which pairs of members should establish connections */
     final NetworkTopology topology;
     /**
@@ -263,10 +256,6 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
      * is for this to replace EventMapper once syncing is removed from the code
      */
     private final ChatterEventMapper chatterEventMapper;
-    /** the name of the swirld being run */
-    private final String swirldName;
-    /** the name of the main class this platform will be running */
-    private final String mainClassName;
     /** this is the Nth Platform running on this machine (N=winNum) */
     private final int instanceNumber;
     /** parameters given to the app when it starts */
@@ -315,11 +304,11 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
 
     private final ChatterCore<GossipEvent> chatterCore;
     /** all the events and other data about the hashgraph */
-    protected EventTaskCreator eventTaskCreator;
+    private EventTaskCreator eventTaskCreator;
     /** ID number of the swirld being run */
-    protected byte[] swirldId;
+    private final byte[] swirldId;
     /** the object that contains all key pairs and CSPRNG state for this member */
-    protected Crypto crypto;
+    private final Crypto crypto;
     /** a long name including (app, swirld, member id, member self name) */
     private final String platformName;
     /** is used for calculating runningHash of all consensus events and writing consensus events to file */
@@ -336,11 +325,6 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
      * If a state was loaded from disk, this will have the hash of that state.
      */
     private Hash diskStateHash;
-    /**
-     * The previous version of the software that was run. Null if this is the first time running, or if the previous
-     * version ran before the concept of application software versioning was introduced.
-     */
-    private SoftwareVersion previousSoftwareVersion;
     /** Helps when executing a reconnect */
     private ReconnectHelper reconnectHelper;
     /** tells callers who to sync with and keeps track of whether we have fallen behind */
@@ -384,11 +368,6 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
      */
     private final List<StoppableThread> chatterThreads = new LinkedList<>();
 
-    /**
-     * Builds dispatchers and registers observers for this platform instance.
-     */
-    private final DispatchBuilder dispatchBuilder;
-
     /**
      * All components that need to be started or that have dispatch observers.
      */
@@ -426,8 +405,6 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
      */
     private final PreConsensusEventWriter preConsensusEventWriter;
 
-    private final BasicConfig basicConfig;
-
     /**
      * the browser gives the Platform what app to run. There can be multiple Platforms on one computer.
      *
@@ -463,11 +440,11 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
             @Nullable final SignedState loadedSignedState,
             @NonNull final EmergencyRecoveryManager emergencyRecoveryManager) {
 
-        this.platformContext = CommonUtils.throwArgNull(platformContext, "platformContext");
-        this.basicConfig = platformContext.getConfiguration().getConfigData(BasicConfig.class);
+        this.platformContext = Objects.requireNonNull(platformContext, "platformContext");
+
+        DispatchBuilder dispatchBuilder =
+                new DispatchBuilder(platformContext.getConfiguration().getConfigData(DispatchConfiguration.class));
 
-        dispatchBuilder =
-                new DispatchBuilder(ConfigurationHolder.getInstance().get().getConfigData(DispatchConfiguration.class));
         components = new PlatformComponents(dispatchBuilder);
 
         // FUTURE WORK: use a real thread manager here
@@ -487,9 +464,8 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
                 new SimultaneousSyncThrottle(settings.getMaxIncomingSyncsInc() + settings.getMaxOutgoingSyncs());
 
         final StateConfig stateConfig = platformContext.getConfiguration().getConfigData(StateConfig.class);
-        this.mainClassName = stateConfig.getMainClassName(mainClassName);
+        final String actualMainClassName = stateConfig.getMainClassName(mainClassName);
 
-        this.swirldName = swirldName;
         this.appVersion = appVersion;
 
         this.instanceNumber = instanceNumber;
@@ -553,7 +529,7 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
 
         stateManagementComponent = wiring.wireStateManagementComponent(
                 PlatformConstructor.platformSigner(crypto.getKeysAndCerts()),
-                this.mainClassName,
+                actualMainClassName,
                 selfId,
                 swirldName,
                 this::createPrioritySystemTransaction,
@@ -566,11 +542,6 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
                 new NetworkStatsTransmitter(platformContext, this::createSystemTransaction, networkMetrics);
         components.add(networkStatsTransmitter);
 
-        if (settings.getState().backgroundHashChecking) {
-            // This object performs background sanity checks on copies of the state.
-            new BackgroundHashChecker(threadManager, stateManagementComponent::getLatestSignedState);
-        }
-
         preConsensusSystemTransactionManager = new PreConsensusSystemTransactionManagerFactory()
                 .addHandlers(stateManagementComponent.getPreConsensusHandleMethods())
                 .build();
@@ -606,13 +577,6 @@ public class SwirldsPlatform implements Platform, PlatformWithDeprecatedMethods,
 
         final LoadedState loadedState = initializeLoadedStateFromSignedState(loadedSignedState);
         init(loadedState, genesisStateBuilder);
-
-        OSHealthChecker.performOSHealthChecks(
-                platformContext.getConfiguration().getConfigData(OSHealthCheckConfig.class),
-                List.of(
-                        OSClockSpeedSourceChecker::performClockSourceSpeedCheck,
-                        OSEntropyChecker::performEntropyChecks,
-                        OSFileSystemChecker::performFileSystemCheck));
     }
 
     /**
@@ -770,7 +734,11 @@ private State loadSavedState(final SignedState signedStateFromDisk) {
                         .setDepth(StateSettings.getDebugHashDepth())
                         .render());
 
-        previousSoftwareVersion = signedStateFromDisk
+        /**
+         * The previous version of the software that was run. Null if this is the first time running, or if the previous
+         * version ran before the concept of application software versioning was introduced.
+         */
+        SoftwareVersion previousSoftwareVersion = signedStateFromDisk
                 .getState()
                 .getPlatformState()
                 .getPlatformData()
@@ -1229,10 +1197,10 @@ private void buildEventHandlersFromState(
     }
 
     /**
-     * Start the platform, which will in turn start the app and all the syncing threads. When using the normal browser,
-     * only one Platform is running. But with config.txt, multiple can be running.
+     * Start this platform.
      */
-    void run() {
+    @Override
+    public void start() {
         syncManager = components.add(new SyncManagerImpl(
                 intakeQueue,
                 topology.getConnectionGraph(),