This is an automated email from the ASF dual-hosted git repository. dakaikang pushed a commit to branch hotstuff-1 in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git
commit a45732d70f9700503ecf2d1649eafbbdfeaee1cf Author: Ubuntu <[email protected]> AuthorDate: Sat Sep 13 23:30:58 2025 +0000 fxi bug in tailforking script --- scripts/deploy/config/hs1.config | 7 ++--- scripts/deploy/config/slot_hs1.config | 6 ++--- scripts/deploy/performance/hs2_performance.sh | 3 +++ scripts/deploy/performance/hs_performance.sh | 3 +++ scripts/deploy/performance/run_performance.sh | 5 ++-- scripts/deploy/performance/slot_hs1_performance.sh | 3 +++ .../deploy/results_data/figure3_ef_tailforking.py | 30 +++++++++++----------- scripts/deploy/tail_forking_experiment.py | 4 ++- scripts/deploy/tail_forking_experiment.sh | 9 ++++--- 9 files changed, 42 insertions(+), 28 deletions(-) diff --git a/scripts/deploy/config/hs1.config b/scripts/deploy/config/hs1.config index 8e6d5a8a..a1dc6fc2 100644 --- a/scripts/deploy/config/hs1.config +++ b/scripts/deploy/config/hs1.config @@ -8,9 +8,10 @@ "input_worker_num": 5, "output_worker_num": 5, "non_responsive_num": 0, - "fork_tail_num": 0, + "fork_tail_num": 10, "rollback_num": 0, "tpcc_enabled": false, - "network_delay_num": 31, - "mean_network_delay": 500 + "network_delay_num": 0, + "mean_network_delay": 0, + "timer_length": 100 } diff --git a/scripts/deploy/config/slot_hs1.config b/scripts/deploy/config/slot_hs1.config index 49f4fd20..a1dc6fc2 100644 --- a/scripts/deploy/config/slot_hs1.config +++ b/scripts/deploy/config/slot_hs1.config @@ -8,10 +8,10 @@ "input_worker_num": 5, "output_worker_num": 5, "non_responsive_num": 0, - "fork_tail_num": 0, + "fork_tail_num": 10, "rollback_num": 0, "tpcc_enabled": false, - "network_delay_num": 31, - "mean_network_delay": 5, + "network_delay_num": 0, + "mean_network_delay": 0, "timer_length": 100 } diff --git a/scripts/deploy/performance/hs2_performance.sh b/scripts/deploy/performance/hs2_performance.sh index f4d33caa..b99ec8d9 100755 --- a/scripts/deploy/performance/hs2_performance.sh +++ b/scripts/deploy/performance/hs2_performance.sh @@ -1,5 +1,8 @@ export server=//benchmark/protocols/hs2:kv_server_performance export TEMPLATE_PATH=$PWD/config/hs2.config +RED="\033[31m" +RESET="\033[0m" + ./performance/run_performance.sh $* diff --git a/scripts/deploy/performance/hs_performance.sh b/scripts/deploy/performance/hs_performance.sh index b8cd4547..6c9191a1 100755 --- a/scripts/deploy/performance/hs_performance.sh +++ b/scripts/deploy/performance/hs_performance.sh @@ -1,5 +1,8 @@ export server=//benchmark/protocols/hs:kv_server_performance export TEMPLATE_PATH=$PWD/config/hs.config +RED="\033[31m" +RESET="\033[0m" + ./performance/run_performance.sh $* diff --git a/scripts/deploy/performance/run_performance.sh b/scripts/deploy/performance/run_performance.sh index 4e09f368..e7fe37cf 100755 --- a/scripts/deploy/performance/run_performance.sh +++ b/scripts/deploy/performance/run_performance.sh @@ -53,7 +53,8 @@ wait python3 performance/calculate_result.py `ls result_*_log` > results.log -# rm -rf result_*_log +rm -rf result_*_log echo "save result to results.log" -cat results.log cat $TEMPLATE_PATH +cat results.log + diff --git a/scripts/deploy/performance/slot_hs1_performance.sh b/scripts/deploy/performance/slot_hs1_performance.sh index 21d686f8..930284ae 100755 --- a/scripts/deploy/performance/slot_hs1_performance.sh +++ b/scripts/deploy/performance/slot_hs1_performance.sh @@ -1,5 +1,8 @@ export server=//benchmark/protocols/slot_hs1:kv_server_performance export TEMPLATE_PATH=$PWD/config/slot_hs1.config +RED="\033[31m" +RESET="\033[0m" + ./performance/run_performance.sh $* diff --git a/scripts/deploy/results_data/figure3_ef_tailforking.py b/scripts/deploy/results_data/figure3_ef_tailforking.py index a9c7f3bd..f2079b22 100644 --- a/scripts/deploy/results_data/figure3_ef_tailforking.py +++ b/scripts/deploy/results_data/figure3_ef_tailforking.py @@ -6,27 +6,27 @@ class ThroughputLatency: self.latency = latency HS = { - 0: ThroughputLatency(55114, 9.0483), - 1: ThroughputLatency(53475, 9.3233), - 4: ThroughputLatency(48106, 10.3792), - 7: ThroughputLatency(43448, 11.444), - 10: ThroughputLatency(37906, 13.145), + 0: ThroughputLatency(55114, 0.009.0483), + 1: ThroughputLatency(53475, 0.009.3233), + 4: ThroughputLatency(48106, 0.010.3792), + 7: ThroughputLatency(43448, 0.011.444), + 10: ThroughputLatency(37906, 0.013.145), } HS_2 = { - 0: ThroughputLatency(55268, 7.1089), - 1: ThroughputLatency(53272, 7.4815), - 4: ThroughputLatency(47367, 8.4208), - 7: ThroughputLatency(43280, 9.1474), - 10: ThroughputLatency(38058, 10.3892), + 0: ThroughputLatency(55268, 0.007.1089), + 1: ThroughputLatency(53272, 0.007.4815), + 4: ThroughputLatency(47367, 0.008.4208), + 7: ThroughputLatency(43280, 0.009.1474), + 10: ThroughputLatency(38058, 0.010.3892), } HS_1 = { - 0: ThroughputLatency(55547, 5.3013), - 1: ThroughputLatency(53312, 5.5567), - 4: ThroughputLatency(48249, 6.1187), - 7: ThroughputLatency(43103, 6.8448), - 10: ThroughputLatency(38006, 7.7204), + 0: ThroughputLatency(55547, 0.005.3013), + 1: ThroughputLatency(53312, 0.005.5567), + 4: ThroughputLatency(48249, 0.006.1187), + 7: ThroughputLatency(43103, 0.006.8448), + 10: ThroughputLatency(38006, 0.007.7204), } HS_1_SLOT10 = { diff --git a/scripts/deploy/tail_forking_experiment.py b/scripts/deploy/tail_forking_experiment.py index 4b7061e4..f5e7b053 100644 --- a/scripts/deploy/tail_forking_experiment.py +++ b/scripts/deploy/tail_forking_experiment.py @@ -85,14 +85,16 @@ def main(): parser = argparse.ArgumentParser(description="Read protocol and replica number") parser.add_argument("protocol", type=str, help="Protocol name (string)") parser.add_argument("num_faulty", type=int, help="Number of faulty leaders (integer)") + parser.add_argument("timer_length", type=int, help="Timer length in ms (integer)") args = parser.parse_args() protocol = args.protocol num_faulty = args.num_faulty + timer_length = args.timer_length command, config_path, max_process_txn = get_experiment_command_and_config_and_maxprocesstxn(protocol) - generate_config(config_path = config_path, max_process_txn = max_process_txn, fork_tail_num = num_faulty) + generate_config(config_path = config_path, max_process_txn = max_process_txn, fork_tail_num = num_faulty, timer_length = timer_length) command = command + " ./config/performance.conf" diff --git a/scripts/deploy/tail_forking_experiment.sh b/scripts/deploy/tail_forking_experiment.sh index f24e4eef..c28536e7 100755 --- a/scripts/deploy/tail_forking_experiment.sh +++ b/scripts/deploy/tail_forking_experiment.sh @@ -5,11 +5,11 @@ BASE_DIR="$(cd "$(dirname "$0")" && pwd)" # Path to the Python script -PYTHON_SCRIPT="$BASE_DIR/leader_slowness_experiment.py" +PYTHON_SCRIPT="$BASE_DIR/tail_forking_experiment.py" # Check parameters -if [ $# -ne 2 ]; then - echo "Usage: $0 <protocol> <num_faulty_leader>" +if [ $# -ne 3 ]; then + echo "Usage: $0 <protocol> <num_faulty_leader> <time_length>" exit 1 fi @@ -17,9 +17,10 @@ rm -rf result_* PROTOCOL=$1 NUM_FAULTY=$2 +TIME_LENGTH=$3 # Capture the Python script's output -OUTPUT=$(python3 "$PYTHON_SCRIPT" "$PROTOCOL" "$NUM_FAULTY") +OUTPUT=$(python3 "$PYTHON_SCRIPT" "$PROTOCOL" "$NUM_FAULTY" "$TIME_LENGTH") # Print the output (or use it later in the script) echo "returned command: $OUTPUT"
