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 3677f4315caf1bd760d770d1d2d223b23f269a46 Author: Ubuntu <[email protected]> AuthorDate: Thu Nov 13 19:44:45 2025 +0000 update script --- scripts/deploy/batching_experiment.sh | 2 +- scripts/deploy/config/hs.config | 7 +-- scripts/deploy/config/hs1.config | 2 +- scripts/deploy/config/hs2.config | 3 +- scripts/deploy/config/performance.conf | 1 + scripts/deploy/config/slot_hs1.config | 2 +- scripts/deploy/performance/hs1_performance.sh | 5 ++- scripts/deploy/performance/hs2_performance.sh | 6 ++- scripts/deploy/performance/hs_performance.sh | 5 ++- scripts/deploy/performance/slot_hs1_performance.sh | 5 ++- .../results_data/.figure1_cd_batching.py.swp | Bin 0 -> 1024 bytes .../deploy/results_data/figure1_ab_scalability.py | 48 ++++++++++++++------- 12 files changed, 59 insertions(+), 27 deletions(-) diff --git a/scripts/deploy/batching_experiment.sh b/scripts/deploy/batching_experiment.sh index 98d9b538..5d0eefab 100755 --- a/scripts/deploy/batching_experiment.sh +++ b/scripts/deploy/batching_experiment.sh @@ -25,6 +25,6 @@ OUTPUT=$(python3 "$PYTHON_SCRIPT" "$PROTOCOL" "$BATCH_SIZE") echo "returned command: $OUTPUT" # Run the returned string as a command -# eval "$OUTPUT" +eval "$OUTPUT" diff --git a/scripts/deploy/config/hs.config b/scripts/deploy/config/hs.config index 53ffe3e8..a31e3606 100644 --- a/scripts/deploy/config/hs.config +++ b/scripts/deploy/config/hs.config @@ -3,7 +3,7 @@ "enable_viewchange": false, "recovery_enabled": false, "max_client_complaint_num": 10, - "max_process_txn": 5, + "max_process_txn": 3, "worker_num": 8, "input_worker_num": 5, "output_worker_num": 5, @@ -11,6 +11,7 @@ "fork_tail_num": 0, "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/hs1.config b/scripts/deploy/config/hs1.config index a1dc6fc2..a31e3606 100644 --- a/scripts/deploy/config/hs1.config +++ b/scripts/deploy/config/hs1.config @@ -8,7 +8,7 @@ "input_worker_num": 5, "output_worker_num": 5, "non_responsive_num": 0, - "fork_tail_num": 10, + "fork_tail_num": 0, "rollback_num": 0, "tpcc_enabled": false, "network_delay_num": 0, diff --git a/scripts/deploy/config/hs2.config b/scripts/deploy/config/hs2.config index ed77f474..ff9fb6b5 100644 --- a/scripts/deploy/config/hs2.config +++ b/scripts/deploy/config/hs2.config @@ -12,5 +12,6 @@ "rollback_num": 0, "tpcc_enabled": false, "network_delay_num": 0, - "mean_network_delay": 0 + "mean_network_delay": 0, + "timer_length": 100 } diff --git a/scripts/deploy/config/performance.conf b/scripts/deploy/config/performance.conf index b85e34c5..348496e5 100644 --- a/scripts/deploy/config/performance.conf +++ b/scripts/deploy/config/performance.conf @@ -31,6 +31,7 @@ iplist=( 172.31.25.82 172.31.28.81 172.31.30.211 +172.31.16.82 ) client_num=1 diff --git a/scripts/deploy/config/slot_hs1.config b/scripts/deploy/config/slot_hs1.config index a1dc6fc2..a31e3606 100644 --- a/scripts/deploy/config/slot_hs1.config +++ b/scripts/deploy/config/slot_hs1.config @@ -8,7 +8,7 @@ "input_worker_num": 5, "output_worker_num": 5, "non_responsive_num": 0, - "fork_tail_num": 10, + "fork_tail_num": 0, "rollback_num": 0, "tpcc_enabled": false, "network_delay_num": 0, diff --git a/scripts/deploy/performance/hs1_performance.sh b/scripts/deploy/performance/hs1_performance.sh index fbae905d..f1d7bfab 100755 --- a/scripts/deploy/performance/hs1_performance.sh +++ b/scripts/deploy/performance/hs1_performance.sh @@ -5,7 +5,10 @@ RESET="\033[0m" ./performance/run_performance.sh $* + echo -e "${RED}PLEASE DO NOT FORGET TO STOP ALL AWS INSTANCES AFTER RUNNING ALL EXPERIMENTS USING THE FOLLOWING COMMAND:" -echo -e "${RED}../../stop_us_east_1_instances.sh${RESET}" +echo -e "${RED}./stop_us_east_1_instances.sh${RESET}" +echo -e "${RED}If YOU ARE RUNNING THE GEO-SCALE EXPERIMENT OR THE GEOGRAPHICAL DEPLOYMENT EXPERIMENT, PLEASE USE THE FOLLOWING COMMAND INSTEAD:${RESET}" +echo -e "${RED}./stop_all_instances.sh${RESET}" diff --git a/scripts/deploy/performance/hs2_performance.sh b/scripts/deploy/performance/hs2_performance.sh index b99ec8d9..0cf99cad 100755 --- a/scripts/deploy/performance/hs2_performance.sh +++ b/scripts/deploy/performance/hs2_performance.sh @@ -6,5 +6,9 @@ RESET="\033[0m" ./performance/run_performance.sh $* + echo -e "${RED}PLEASE DO NOT FORGET TO STOP ALL AWS INSTANCES AFTER RUNNING ALL EXPERIMENTS USING THE FOLLOWING COMMAND:" -echo -e "${RED}../../stop_us_east_1_instances.sh${RESET}" \ No newline at end of file +echo -e "${RED}./stop_us_east_1_instances.sh${RESET}" + +echo -e "${RED}If YOU ARE RUNNING THE GEO-SCALE EXPERIMENT OR THE GEOGRAPHICAL DEPLOYMENT EXPERIMENT, PLEASE USE THE FOLLOWING COMMAND INSTEAD:${RESET}" +echo -e "${RED}./stop_all_instances.sh${RESET}" \ No newline at end of file diff --git a/scripts/deploy/performance/hs_performance.sh b/scripts/deploy/performance/hs_performance.sh index 6c9191a1..c0847000 100755 --- a/scripts/deploy/performance/hs_performance.sh +++ b/scripts/deploy/performance/hs_performance.sh @@ -7,4 +7,7 @@ RESET="\033[0m" ./performance/run_performance.sh $* echo -e "${RED}PLEASE DO NOT FORGET TO STOP ALL AWS INSTANCES AFTER RUNNING ALL EXPERIMENTS USING THE FOLLOWING COMMAND:" -echo -e "${RED}../../stop_us_east_1_instances.sh${RESET}" \ No newline at end of file +echo -e "${RED}./stop_us_east_1_instances.sh${RESET}" + +echo -e "${RED}If YOU ARE RUNNING THE GEO-SCALE EXPERIMENT OR THE GEOGRAPHICAL DEPLOYMENT EXPERIMENT, PLEASE USE THE FOLLOWING COMMAND INSTEAD:${RESET}" +echo -e "${RED}./stop_all_instances.sh${RESET}" \ No newline at end of file diff --git a/scripts/deploy/performance/slot_hs1_performance.sh b/scripts/deploy/performance/slot_hs1_performance.sh index 930284ae..8f0a490a 100755 --- a/scripts/deploy/performance/slot_hs1_performance.sh +++ b/scripts/deploy/performance/slot_hs1_performance.sh @@ -7,4 +7,7 @@ RESET="\033[0m" ./performance/run_performance.sh $* echo -e "${RED}PLEASE DO NOT FORGET TO STOP ALL AWS INSTANCES AFTER RUNNING ALL EXPERIMENTS USING THE FOLLOWING COMMAND:" -echo -e "${RED}../../stop_us_east_1_instances.sh${RESET}" \ No newline at end of file +echo -e "${RED}./stop_us_east_1_instances.sh${RESET}" + +echo -e "${RED}If YOU ARE RUNNING THE GEO-SCALE EXPERIMENT OR THE GEOGRAPHICAL DEPLOYMENT EXPERIMENT, PLEASE USE THE FOLLOWING COMMAND INSTEAD:${RESET}" +echo -e "${RED}./stop_all_instances.sh${RESET}" \ No newline at end of file diff --git a/scripts/deploy/results_data/.figure1_cd_batching.py.swp b/scripts/deploy/results_data/.figure1_cd_batching.py.swp new file mode 100644 index 00000000..f3db0501 Binary files /dev/null and b/scripts/deploy/results_data/.figure1_cd_batching.py.swp differ diff --git a/scripts/deploy/results_data/figure1_ab_scalability.py b/scripts/deploy/results_data/figure1_ab_scalability.py index 580d2f13..11ecc3da 100644 --- a/scripts/deploy/results_data/figure1_ab_scalability.py +++ b/scripts/deploy/results_data/figure1_ab_scalability.py @@ -6,31 +6,47 @@ class ThroughputLatency: self.latency = latency HS = { - 4: ThroughputLatency(89945, 5.4735), - 16: ThroughputLatency(65173, 7.8041), - 32: ThroughputLatency(55642, 9.0037), - 64: ThroughputLatency(37627, 14.0277), +# 4: ThroughputLatency(89945, 5.4735), + 4: ThroughputLatency(94112.72727272728, 0.0050583275), +# 16: ThroughputLatency(65173, 7.8041), + 16: ThroughputLatency(76777.02127659574, 0.0064289125), +# 32: ThroughputLatency(55642, 9.0037), + 32: ThroughputLatency(59135.36842105263, 0.008704050000000001), +# 64: ThroughputLatency(37627, 14.0277), + 64: ThroughputLatency(40829.424083769634, 0.01475465), } HS_2 = { - 4: ThroughputLatency(90253, 4.3366), - 16: ThroughputLatency(65236, 5.9582), - 32: ThroughputLatency(55470, 7.171), - 64: ThroughputLatency(37479, 11.2806), +# 4: ThroughputLatency(90253, 4.3366), + 4: ThroughputLatency(99250.90909090909, 0.0038422200000000004), +# 16: ThroughputLatency(65236, 5.9582), + 16: ThroughputLatency(76741.27659574468, 0.0051071675), +# 32: ThroughputLatency(55470, 7.171), + 32: ThroughputLatency(59370.52631578947, 0.00693072), +# 64: ThroughputLatency(37479, 11.2806), + 64: ThroughputLatency(40748.2722513089, 0.011482744999999999), } HS_1 = { - 4: ThroughputLatency(90286, 3.2029), - 16: ThroughputLatency(64815, 4.5172), - 32: ThroughputLatency(55303, 5.5422), - 64: ThroughputLatency(37314, 8.4171), +# 4: ThroughputLatency(90286, 3.2029), + 4: ThroughputLatency(97541.81818181818, 0.0029669375), +# 16: ThroughputLatency(64815, 4.5172), + 16: ThroughputLatency(76488.08510638298, 0.0038136374999999997), +# 32: ThroughputLatency(55303, 5.5422), + 32: ThroughputLatency(58766.94736842105, 0.00520517), +# 64: ThroughputLatency(37314, 8.4171), + 64: ThroughputLatency(40781.04712041885, 0.00871747), } HS_1_SLOT = { - 4: ThroughputLatency(90152, 3.21112), - 16: ThroughputLatency(64928, 4.4728), - 32: ThroughputLatency(56983, 5.336), - 64: ThroughputLatency(37711, 8.4536), +# 4: ThroughputLatency(90152, 3.21112), + 4: ThroughputLatency(105396.66666666667, 0.0026632550000000002), +# 16: ThroughputLatency(64928, 4.4728), + 16: ThroughputLatency(77025.83333333333, 0.0037831774999999997), +# 32: ThroughputLatency(56983, 5.336), + 32: ThroughputLatency(59698.541666666664, 0.0050861), +# 64: ThroughputLatency(37711, 8.4536), + 64: ThroughputLatency(39966.979166666664, 0.0084669775), }
