Merge branch 'x1-txtracing' into x1-txtracing-jacklevin74-patch-1

FairCrypto · Jan 30, 2024 · bcdf540 · bcdf540
2 parents 3970622 + 0f9a10a
commit bcdf540
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 4 deletions.
diff --git a/docker/networksimulator/README.md b/docker/networksimulator/README.md
@@ -115,3 +115,18 @@ python3 test.py 5 --no-wait --validator 2
 python3 test.py --help
 ```
 
+## Rolling out partial upgrades
+
+First, build the new docker image with the changes you want to test.
+
+```shell
+docker-compose build
+```
+
+Then, you can upgrade the nodes one at a time.
+
+```shell
+docker-compose up -d --build --no-deps node2
+docker-compose up -d --build --no-deps node3
+docker-compose up -d --build --no-deps node4
+```
diff --git a/docker/networksimulator/generate.py b/docker/networksimulator/generate.py
@@ -5,7 +5,7 @@
 DEFAULT_IP_BASE = '172.16.239.0'
 DEFAULT_NUM_NODES = 3
 DEFAULT_STARTING_PORT = 7050
-DEFAULT_FLAGS = "--testnet --metrics --metrics.addr 0.0.0.0 --http --http.port 8545 --http.addr 0.0.0.0 --http.vhosts '*' --http.corsdomain '*' --ws --ws.addr 0.0.0.0 --ws.port 8546 --ws.origins '*' --verbosity 3 "
+DEFAULT_FLAGS = "--testnet --syncmode full --gcmode archive --metrics --metrics.addr 0.0.0.0 --http --http.port 8545 --http.addr 0.0.0.0 --http.vhosts '*' --http.corsdomain '*' --ws --ws.addr 0.0.0.0 --ws.port 8546 --ws.origins '*' --verbosity 3 "
 BOOT_NODE_KEY = "4b20a091f6389ca9ee1492187cc2d775511fa1e0801bf1f787b3a14f961530b1"
 BOOT_NODE_PUB_KEY = "d06482f636e5c68586215f9ab9dfda270d38bf468195fc2e767d5d74b5fc7ab4faffc46028aa360b723ce53ded022949a8a6b1c96013d8ec1771f4ed448518b4"
 

diff --git a/docker/networksimulator/grafana/var/lib/grafana/dashboards/home.json b/docker/networksimulator/grafana/var/lib/grafana/dashboards/home.json
@@ -2378,7 +2378,7 @@
               }
             ]
           },
-          "unit": "short",
+          "unit": "reqps",
           "unitScale": true
         },
         "overrides": []
@@ -2410,14 +2410,14 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "max(increase(chain_txs[$interval]))\n",
+          "expr": "max(rate(chain_txs[$interval]))\n",
           "instant": false,
           "legendFormat": "TXs",
           "range": true,
           "refId": "A"
         }
       ],
-      "title": "Transaction Receipt Count",
+      "title": "Transaction Recipt Rate",
       "type": "timeseries"
     },
     {