Improvements to how the simulator is able to stream to the BlockNode,…

… this commit creates a StreamingMode enum, with 2 values, CONSTANT_RATE and MILLIS_PER_BLOCK. CONSTANT_RATE is the streaming mode that we have been using, that streams a block item, then waits X amount of NS, then streams another blockItem. MILLIS_PER_BLOCK, does a lot less thread interruptions, and has a more realistic behaviour, since is going to stream the whole block, as fast as it can, and then going to sleep for X-(time it took to stream) being X the target of block production, by default 1 block is produced each second, so it will attempt to stream 1 block per every 1000 ms, however if the block takes more than 1000 ms to stream, it wont sleep at all, but WARN of a potential issue. Added documentation for explaining the changes Signed-off-by: Alfredo Gutierrez <[email protected]>
hashgraph · Oct 10, 2024 · 25c5ce6 · 25c5ce6
1 parent d55321f
commit 25c5ce6
Show file tree

Hide file tree

Showing 11 changed files with 315 additions and 46 deletions.
diff --git a/simulator/README.md b/simulator/README.md
@@ -38,15 +38,17 @@ There are 2 configuration sets:
 ### BlockStreamConfig
 Uses the prefix `blockStream` so all properties should start with `blockStream.`
 
-| Key                      | Description                                                                                                                                                                | Default Value                   |
-|--------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------|
-| `generationMode`         | The desired generation Mode to use, it can only be `DIR` or `AD_HOC`                                                                                                       | `DIR`                           |
-| `folderRootPath`         | If the generationMode is DIR this will be used as the source of the recording to stream to the Block-Node                                                                  | ``                              |
-| `delayBetweenBlockItems` | The delay between each block item in nanoseconds                                                                                                                           | `1_500_000`                     |
-| `managerImplementation`  | The desired implementation of the BlockStreamManager to use, it can only be `BlockAsDirBlockStreamManager`, `BlockAsFileBlockStreamManager` or `BlockAsFileLargeDataSets`  | `BlockAsFileBlockStreamManager` |
-| `maxBlockItemsToStream`  | exit condition for the simulator and the circular implementations such as `BlockAsDir` or `BlockAsFile` implementations                                                    | `10_000`                        |
-| `paddedLength`           | on the `BlockAsFileLargeDataSets` implementation, the length of the padded left zeroes `000001.blk.gz`                                                                     | 36                              |
-| `fileExtension`          | on the `BlockAsFileLargeDataSets` implementation, the extension of the files to be streamed                                                                                | `.blk.gz`                       |
+| Key                      | Description                                                                                                                                                               | Default Value                   |
+|--------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------|
+| `generationMode`         | The desired generation Mode to use, it can only be `DIR` or `AD_HOC`                                                                                                      | `DIR`                           |
+| `folderRootPath`         | If the generationMode is DIR this will be used as the source of the recording to stream to the Block-Node                                                                 | ``                              |
+| `delayBetweenBlockItems` | The delay between each block item in nanoseconds, only applicable when streamingMode=CONSTANT_RATE                                                                        | `1_500_000`                     |
+| `managerImplementation`  | The desired implementation of the BlockStreamManager to use, it can only be `BlockAsDirBlockStreamManager`, `BlockAsFileBlockStreamManager` or `BlockAsFileLargeDataSets` | `BlockAsFileBlockStreamManager` |
+| `maxBlockItemsToStream`  | exit condition for the simulator and the circular implementations such as `BlockAsDir` or `BlockAsFile` implementations                                                   | `10_000`                        |
+| `paddedLength`           | on the `BlockAsFileLargeDataSets` implementation, the length of the padded left zeroes `000001.blk.gz`                                                                    | 36                              |
+| `fileExtension`          | on the `BlockAsFileLargeDataSets` implementation, the extension of the files to be streamed                                                                               | `.blk.gz`                       |
+| `streamingMode`          | can either be `CONSTANT_RATE` or `MILLIS_PER_BLOCK`, if `CONSTANT_RATE`                                                                                                   | `CONSTANT_RATE`                 |
+| `millisecondsPerBlock`   | if streamingMode is `MILLIS_PER_BLOCK` this will be the time to wait between blocks in milliseconds                                                                       | `1_000`                         |
 
 ### GrpcConfig
 Uses the prefix `grpc` so all properties should start with `grpc.`

diff --git a/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorApp.java b/simulator/src/main/java/com/hedera/block/simulator/BlockStreamSimulatorApp.java
@@ -17,8 +17,10 @@
 package com.hedera.block.simulator;
 
 import com.hedera.block.simulator.config.data.BlockStreamConfig;
+import com.hedera.block.simulator.config.types.StreamingMode;
 import com.hedera.block.simulator.generator.BlockStreamManager;
 import com.hedera.block.simulator.grpc.PublishStreamGrpcClient;
+import com.hedera.hapi.block.stream.Block;
 import com.hedera.hapi.block.stream.BlockItem;
 import com.hedera.pbj.runtime.ParseException;
 import com.swirlds.config.api.Configuration;
@@ -32,13 +34,15 @@ public class BlockStreamSimulatorApp {
     private static final System.Logger LOGGER =
             System.getLogger(BlockStreamSimulatorApp.class.getName());
 
-    Configuration configuration;
-    BlockStreamManager blockStreamManager;
-    PublishStreamGrpcClient publishStreamGrpcClient;
-    BlockStreamConfig blockStreamConfig;
+    private final BlockStreamManager blockStreamManager;
+    private final PublishStreamGrpcClient publishStreamGrpcClient;
+    private final BlockStreamConfig blockStreamConfig;
+    private final StreamingMode streamingMode;
 
     private final int delayBetweenBlockItems;
 
+    private final int millisecondsPerBlock;
+
     boolean isRunning = false;
 
     /**
@@ -53,12 +57,13 @@ public BlockStreamSimulatorApp(
             @NonNull Configuration configuration,
             @NonNull BlockStreamManager blockStreamManager,
             @NonNull PublishStreamGrpcClient publishStreamGrpcClient) {
-        this.configuration = configuration;
         this.blockStreamManager = blockStreamManager;
         this.publishStreamGrpcClient = publishStreamGrpcClient;
 
         blockStreamConfig = configuration.getConfigData(BlockStreamConfig.class);
 
+        streamingMode = blockStreamConfig.streamingMode();
+        millisecondsPerBlock = blockStreamConfig.millisecondsPerBlock();
         delayBetweenBlockItems = blockStreamConfig.delayBetweenBlockItems();
     }
 
@@ -70,12 +75,37 @@ public BlockStreamSimulatorApp(
      * @throws IOException if an I/O error occurs
      */
     public void start() throws InterruptedException, ParseException, IOException {
-        int delayMSBetweenBlockItems = delayBetweenBlockItems / 1_000_000;
-        int delayNSBetweenBlockItems = delayBetweenBlockItems % 1_000_000;
 
         isRunning = true;
         LOGGER.log(System.Logger.Level.INFO, "Block Stream Simulator has started");
 
+        if (streamingMode == StreamingMode.MILLIS_PER_BLOCK) {
+            millisPerBlockStreaming();
+        } else {
+            constantRateStreaming();
+        }
+
+        LOGGER.log(System.Logger.Level.INFO, "Block Stream Simulator has stopped");
+    }
+
+    /**
+     * Returns whether the block stream simulator is running.
+     *
+     * @return true if the block stream simulator is running, false otherwise
+     */
+    public boolean isRunning() {
+        return isRunning;
+    }
+
+    /** Stops the block stream simulator. */
+    public void stop() {
+        isRunning = false;
+        LOGGER.log(System.Logger.Level.INFO, "Block Stream Simulator has stopped");
+    }
+
+    private void constantRateStreaming() throws InterruptedException, IOException, ParseException {
+        int delayMSBetweenBlockItems = delayBetweenBlockItems / 1_000_000;
+        int delayNSBetweenBlockItems = delayBetweenBlockItems % 1_000_000;
         boolean streamBlockItem = true;
         int blockItemsStreamed = 0;
 
@@ -103,22 +133,29 @@ public void start() throws InterruptedException, ParseException, IOException {
                 streamBlockItem = false;
             }
         }
-
-        LOGGER.log(System.Logger.Level.INFO, "Block Stream Simulator has stopped");
     }
 
-    /**
-     * Returns whether the block stream simulator is running.
-     *
-     * @return true if the block stream simulator is running, false otherwise
-     */
-    public boolean isRunning() {
-        return isRunning;
-    }
+    private void millisPerBlockStreaming()
+            throws IOException, ParseException, InterruptedException {
 
-    /** Stops the block stream simulator. */
-    public void stop() {
-        isRunning = false;
-        LOGGER.log(System.Logger.Level.INFO, "Block Stream Simulator has stopped");
+        final long secondsPerBlockNanos = millisecondsPerBlock * 1_000_000L;
+
+        Block nextBlock = blockStreamManager.getNextBlock();
+        while (nextBlock != null) {
+            long startTime = System.nanoTime();
+            publishStreamGrpcClient.streamBlock(nextBlock);
+            long elapsedTime = System.nanoTime() - startTime;
+            long timeToDelay = secondsPerBlockNanos - elapsedTime;
+            if (timeToDelay > 0) {
+                Thread.sleep(timeToDelay / 1_000_000, (int) (timeToDelay % 1_000_000));
+            } else {
+                LOGGER.log(
+                        System.Logger.Level.WARNING,
+                        "Block Server is running behind, Streaming took longer than max expected: "
+                                + millisecondsPerBlock
+                                + " milliseconds");
+            }
+            nextBlock = blockStreamManager.getNextBlock();
+        }
     }
 }
diff --git a/simulator/src/main/java/com/hedera/block/simulator/Constants.java b/simulator/src/main/java/com/hedera/block/simulator/Constants.java
@@ -16,10 +16,15 @@
 
 package com.hedera.block.simulator;
 
+/** The Constants class defines the constants for the block simulator. */
 public class Constants {
 
-    // The file extension for block files.
+    /** Constructor to prevent instantiation. this is only a utility class */
+    private Constants() {}
+
+    /** The file extension for block files. */
     public static final String RECORD_EXTENSION = "blk";
-    // postfix for gzipped files
+
+    /** postfix for gzip files */
     public static final String GZ_EXTENSION = ".gz";
 }
diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockStreamConfig.java b/simulator/src/main/java/com/hedera/block/simulator/config/data/BlockStreamConfig.java
@@ -17,6 +17,7 @@
 package com.hedera.block.simulator.config.data;
 
 import com.hedera.block.simulator.config.types.GenerationMode;
+import com.hedera.block.simulator.config.types.StreamingMode;
 import com.swirlds.config.api.ConfigData;
 import com.swirlds.config.api.ConfigProperty;
 import java.nio.file.Files;
@@ -33,6 +34,8 @@
  * @param maxBlockItemsToStream the maximum number of block items to stream
  * @param paddedLength the padded length of 0 the block file format
  * @param fileExtension the file extension of the block file format
+ * @param streamingMode the mode of streaming for the block stream
+ * @param millisecondsPerBlock the milliseconds per block
  */
 @ConfigData("blockStream")
 public record BlockStreamConfig(
@@ -43,7 +46,9 @@ public record BlockStreamConfig(
                 String managerImplementation,
         @ConfigProperty(defaultValue = "10_000") int maxBlockItemsToStream,
         @ConfigProperty(defaultValue = "36") int paddedLength,
-        @ConfigProperty(defaultValue = ".blk.gz") String fileExtension) {
+        @ConfigProperty(defaultValue = ".blk.gz") String fileExtension,
+        @ConfigProperty(defaultValue = "MILLIS_PER_BLOCK") StreamingMode streamingMode,
+        @ConfigProperty(defaultValue = "1000") int millisecondsPerBlock) {
 
     /**
      * Constructor to set the default root path if not provided, it will be set to the data

diff --git a/simulator/src/main/java/com/hedera/block/simulator/config/types/StreamingMode.java b/simulator/src/main/java/com/hedera/block/simulator/config/types/StreamingMode.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2024 Hedera Hashgraph, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hedera.block.simulator.config.types;
+
+/** The StreamingMode enum defines the different modes for streaming blocks. */
+public enum StreamingMode {
+
+    /** It will wait X Nanos between each block. */
+    CONSTANT_RATE,
+
+    /** It will attempt to send a block each X Millis. */
+    MILLIS_PER_BLOCK;
+
+    /**
+     * Converts a string to a StreamingMode.
+     *
+     * @param mode the string to convert
+     * @return the StreamingMode
+     */
+    public static StreamingMode fromString(String mode) {
+        return switch (mode) {
+            case "CONSTANT_RATE" -> CONSTANT_RATE;
+            case "MILLIS_PER_BLOCK" -> MILLIS_PER_BLOCK;
+            default -> throw new IllegalArgumentException("Invalid mode: " + mode);
+        };
+    }
+}