Skip to content

Commit 21ad7ef

Browse files
ibhatt-jumptradingibhatt-jumptrading
committed
runtime: removing cluster version toml option
1 parent a38b0a0 commit 21ad7ef

File tree

21 files changed

+136
-187
lines changed

21 files changed

+136
-187
lines changed

‎.github/workflows/benchmark.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ jobs:
6161
sudo $OBJDIR/bin/firedancer-dev configure init keys
6262
rm -rf baseline.log
6363
DUMP_DIR=../dump ./src/flamenco/runtime/tests/run_ledger_backtest.sh \
64-
-l mainnet-368528500-perf \
65-
-y 5 -m 2000000 -e 368529500 -c 3.0.0 \
64+
-l mainnet-368528500-perf -y 5 -m 2000000 -e 368529500 \
6665
--log baseline.log --skip-checksum
6766
SPS_BASELINE=$(grep "Backtest playback done." baseline.log | awk -F 'sec/slot: ' '{print $2}')
6867
TOTAL_ELAPSED_BASELINE=$(grep "Backtest playback done." baseline.log | awk -F 'elapsed: ' '{print $2}' | awk '{print $1}')
@@ -90,8 +89,7 @@ jobs:
9089
rm -rf new.log
9190
sudo $OBJDIR/bin/firedancer-dev configure init keys
9291
DUMP_DIR=../dump ./src/flamenco/runtime/tests/run_ledger_backtest.sh \
93-
-l mainnet-368528500-perf \
94-
-y 5 -m 2000000 -e 368529500 -c 3.0.0 \
92+
-l mainnet-368528500-perf -y 5 -m 2000000 -e 368529500 \
9593
--log new.log --skip-checksum
9694
SPS_NEWVAL=$(grep "Backtest playback done." new.log | awk -F 'sec/slot: ' '{print $2}')
9795
TOTAL_ELAPSED_NEWVAL=$(grep "Backtest playback done." new.log | awk -F 'elapsed: ' '{print $2}' | awk '{print $1}')

‎contrib/offline-replay/offline_replay.toml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
end_slot = {end_slot}
77
ingest_mode = "rocksdb"
88
rocksdb_path = "{ledger}/rocksdb"
9-
[tiles.replay]
10-
cluster_version = "{cluster_version}"
119
[tiles.gui]
1210
enabled = false
1311
[tiles.rpc]

‎contrib/offline-replay/offline_replay_network_parameters.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ case $network in
1818
export INDEX_MAX=1100000000
1919
export PAGES=50
2020
export AGAVE_TAG=v2.3.6
21-
export FD_CLUSTER_VERSION=2.3.6
2221
;;
2322
"testnet")
2423
export BUCKET_ENDPOINT="gs://testnet-ledger-us-sv15"
@@ -28,7 +27,6 @@ case $network in
2827
export INDEX_MAX=200000000
2928
export PAGES=50
3029
export AGAVE_TAG=v2.3.6
31-
export FD_CLUSTER_VERSION=2.3.6
3230
;;
3331
"devnet")
3432
export BUCKET_ENDPOINT="gs://solana-devnet-ledger-us-ny5"
@@ -38,7 +36,6 @@ case $network in
3836
export INDEX_MAX=200000000
3937
export PAGES=50
4038
export AGAVE_TAG=v2.3.6
41-
export FD_CLUSTER_VERSION=2.3.6
4239
;;
4340
*)
4441
echo "Unknown network: $network"

‎contrib/offline-replay/run_offline_replay_backtest.sh‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ EOF
4040
curl -X POST -H 'Content-type: application/json' --data "$json_payload" $SLACK_DEBUG_WEBHOOK_URL
4141
}
4242

43-
send_slack_message "Starting $NETWORK-offline-replay run on \`$(hostname)\` in \`$(pwd)\` with agave tag \`$AGAVE_TAG\` and firedancer cluster version \`$FD_CLUSTER_VERSION\`"
43+
send_slack_message "Starting $NETWORK-offline-replay run on \`$(hostname)\` in \`$(pwd)\` with agave tag \`$AGAVE_TAG\`
4444
CURRENT_MISMATCH_COUNT=0
4545
CURRENT_FAILURE_COUNT=0
4646
@@ -165,7 +165,7 @@ while true; do
165165
166166
while [ $DONE -eq 0 ]; do
167167
cd $FIREDANCER_REPO
168-
send_slack_message "Starting ledger replay with commit \`$FD_COMMIT\` and cluster version \`$FD_CLUSTER_VERSION\`"
168+
send_slack_message "Starting ledger replay with commit \`$FD_COMMIT\`
169169
set +e
170170

171171
cp $FIREDANCER_REPO/contrib/offline-replay/offline_replay.toml $LEDGER_DIR
@@ -175,15 +175,13 @@ while true; do
175175
export end_slot=$ROCKSDB_ROOTED_MAX
176176
export funk_pages=$BACKTEST_FUNK_PAGES
177177
export index_max=$INDEX_MAX
178-
export cluster_version=$FD_CLUSTER_VERSION
179178
export heap_size=$HEAP_SIZE
180179
export log=$TEMP_LOG
181180

182181
sed -i "s#{ledger}#${ledger}#g" "$LEDGER_DIR/offline_replay.toml"
183182
sed -i "s#{end_slot}#${end_slot}#g" "$LEDGER_DIR/offline_replay.toml"
184183
sed -i "s#{funk_pages}#${funk_pages}#g" "$LEDGER_DIR/offline_replay.toml"
185184
sed -i "s#{index_max}#${index_max}#g" "$LEDGER_DIR/offline_replay.toml"
186-
sed -i "s#{cluster_version}#${cluster_version}#g" "$LEDGER_DIR/offline_replay.toml"
187185
sed -i "s#{heap_size}#${heap_size}#g" "$LEDGER_DIR/offline_replay.toml"
188186
sed -i "s#{log}#${log}#g" "$LEDGER_DIR/offline_replay.toml"
189187

@@ -365,7 +363,7 @@ while true; do
365363

366364
ledger_name=$(basename $MISMATCH_DIR)
367365
end_slot=$((NEXT_ROOTED_SLOT+5))
368-
send_slack_message "Command to reproduce mismatch: \`\`\`src/flamenco/runtime/tests/run_ledger_backtest.sh -l $ledger_name -y 10 -m 2000000 -e $end_slot -c $FD_CLUSTER_VERSION\`\`\`"
366+
send_slack_message "Command to reproduce mismatch: \`\`\`src/flamenco/runtime/tests/run_ledger_backtest.sh -l $ledger_name -y 10 -m 2000000 -e $end_slot\`\`\`"
369367

370368
fi
371369
done

‎contrib/test/run_solcap_tests.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ sed -i "/lock_pages/d" "$DUMP/$LEDGER/devnet-398736132_current.toml"
6363
sed -i "/heap_size_gib/d" "$DUMP/$LEDGER/devnet-398736132_current.toml"
6464
sed -i "/max_total_banks/d" "$DUMP/$LEDGER/devnet-398736132_current.toml"
6565
sed -i "/max_fork_width/d" "$DUMP/$LEDGER/devnet-398736132_current.toml"
66+
sed -i "/cluster_version/d" "$DUMP/$LEDGER/devnet-398736132_current.toml"
6667

6768
echo "
6869
[gossip]

‎contrib/test/test_firedancer_leader.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ echo "
5050
[tiles.replay]
5151
capture = \"firedancer-dev.solcap\"
5252
snapshot = \"$FULL_SNAPSHOT\"
53-
cluster_version = \"2.0.14\"
5453
[tiles.gui]
5554
enabled = false
5655
gui_listen_address = \"64.130.51.169\"

‎src/app/firedancer/config/default.toml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,10 +1365,6 @@ user = ""
13651365
# Must be power of 2
13661366
slot_max = 4096
13671367

1368-
[tiles.replay]
1369-
# TODO: What is this ... needs to be deleted
1370-
cluster_version = "1.18.0"
1371-
13721368
# The tower tile runs the fork choice and tower rules to determine
13731369
# both what block to vote on and what block to build our own leader
13741370
# blocks on top of.

‎src/app/firedancer/topology.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,8 +1171,6 @@ fd_topo_configure_tile( fd_topo_tile_t * tile,
11711171
tile->replay.funk_obj_id = fd_pod_query_ulong( config->topo.props, "funk", ULONG_MAX ); FD_TEST( tile->replay.funk_obj_id !=ULONG_MAX );
11721172
tile->replay.progcache_obj_id = fd_pod_query_ulong( config->topo.props, "progcache", ULONG_MAX ); FD_TEST( tile->replay.progcache_obj_id!=ULONG_MAX );
11731173

1174-
strncpy( tile->replay.cluster_version, config->tiles.replay.cluster_version, sizeof(tile->replay.cluster_version) );
1175-
11761174
tile->replay.max_live_slots = config->firedancer.runtime.max_live_slots;
11771175

11781176
tile->replay.expected_shred_version = config->consensus.expected_shred_version;

‎src/app/shared/fd_config.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,6 @@ struct fd_config {
455455
} repair;
456456

457457
struct {
458-
char cluster_version[ 32 ];
459458
ulong enable_features_cnt;
460459
char enable_features[ 16 ][ FD_BASE58_ENCODED_32_SZ ];
461460
} replay;

‎src/app/shared/fd_config_parse.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@ fd_config_extract_pod( uchar * pod,
251251
CFG_POP ( bool, capture.dump_txn_to_pb );
252252
CFG_POP ( bool, capture.dump_block_to_pb );
253253

254-
CFG_POP ( cstr, tiles.replay.cluster_version );
255254
CFG_POP_ARRAY( cstr, tiles.replay.enable_features );
256255

257256
CFG_POP ( ushort, tiles.send.send_src_port );

0 commit comments

Comments
 (0)