Merge pull request #96 from Federico2014/fix/stress_test

fix(stress_test): fix the stress test tool

Author: kuny0707

tools/stress_test/README.md

@@ -115,16 +115,14 @@ broadcastTx = {
 
 - `relayTx`: configure whether to broadcast the relayed transactions;
 
-- `broadcastUrl`: configure the broadcast url list;
-
 - `tpsLimit`: configure the maximum broadcast transactions per second;
 
 - `saveTxId`: configure whether to save the transaction id of the broadcast transactions.
 
 *Note*: we can use the [DBFork](../toolkit/DBFork.md) tool to get enough `TRX/TRC10/TRC20` balances of address corresponding
   to the `privateKey` for the stress test.
 
-Then we can execute the following `generate` subcommand:
+Then we can execute the following `broadcast` subcommand:
 
 ```shell
 # execute full command

tools/stress_test/src/main/java/org/tron/trxs/BroadcastGenerate.java

@@ -93,7 +93,20 @@ public void broadcastTransactions() throws IOException, InterruptedException {
         long endTps;
         float currentTps;
         while ((transaction = Transaction.parseDelimitedFrom(fis)) != null) {
+          TransactionMessage message = new TransactionMessage(transaction);
+          int peerCnt = tronNetService.fastBroadcastTransaction(message);
+          while (peerCnt <= 0) {
+            logger.warn("broadcast task {}/{} has no available peers to broadcast, please wait",
+                index + 1, totalTask);
+            Thread.sleep(100);
+            peerCnt = tronNetService.fastBroadcastTransaction(message);
+          }
+
           trxCount++;
+          if (trxCount % 10000 == 0) {
+            logger.info("total broadcast tx num: {}", trxCount);
+          }
+
           if (cnt > TxConfig.getInstance().getBroadcastTpsLimit()) {
             endTps = System.currentTimeMillis();
             if (endTps - startTps <= 1000) {
@@ -107,19 +120,12 @@ public void broadcastTransactions() throws IOException, InterruptedException {
             cnt = 0;
             startTps = System.currentTimeMillis();
           } else {
-            TransactionMessage message = new TransactionMessage(transaction);
-            int peerCnt = tronNetService.fastBroadcastTransaction(message);
-            while (peerCnt <= 0) {
-              logger.warn("broadcast task {}/{} has no available peers to broadcast, please wait",
-                  index + 1, totalTask);
-              Thread.sleep(100);
-              peerCnt = tronNetService.fastBroadcastTransaction(message);
-            }
-            if (saveTrxId) {
-              transactionIDs.add(transaction);
-            }
             cnt++;
           }
+
+          if (saveTrxId) {
+            transactionIDs.add(transaction);
+          }
         }
 
         isFinishSend = true;

tools/stress_test/src/main/java/org/tron/trxs/BroadcastRelay.java

@@ -83,7 +83,18 @@ public void broadcastTransactions() {
       long startTps = System.currentTimeMillis();
       long endTps;
       while ((transaction = Transaction.parseDelimitedFrom(fis)) != null) {
+        TransactionMessage message = new TransactionMessage(transaction);
+        int peerCnt = tronNetService.fastBroadcastTransaction(message);
+        while (peerCnt <= 0) {
+          logger.warn("broadcast relay task has no available peers to broadcast, please wait");
+          Thread.sleep(100);
+          peerCnt = tronNetService.fastBroadcastTransaction(message);
+        }
+
         trxCount++;
+        if (trxCount % 10000 == 0) {
+          logger.info("total broadcast tx num: {}", trxCount);
+        }
         if (cnt > TxConfig.getInstance().getBroadcastTpsLimit()) {
           endTps = System.currentTimeMillis();
           if (endTps - startTps < 1000) {
@@ -92,25 +103,12 @@ public void broadcastTransactions() {
           cnt = 0;
           startTps = System.currentTimeMillis();
         } else {
-          try {
-            TransactionMessage message = new TransactionMessage(transaction);
-            int peerCnt = tronNetService.fastBroadcastTransaction(message);
-            while (peerCnt <= 0) {
-              logger.warn("broadcast relay task has no available peers to broadcast, please wait");
-              Thread.sleep(100);
-              peerCnt = tronNetService.fastBroadcastTransaction(message);
-            }
-            if (trxCount % 1000 == 0) {
-              logger.info("total broadcast tx num: {}", trxCount);
-            }
-          } catch (Exception e) {
-            e.printStackTrace();
-          }
-          if (saveTrxId) {
-            transactionIDs.add(transaction);
-          }
           cnt++;
         }
+
+        if (saveTrxId) {
+          transactionIDs.add(transaction);
+        }
       }
 
       isFinishSend = true;