This is an automated email from the ASF dual-hosted git repository. dakaikang pushed a commit to branch hotstuff-1-ari in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git
commit f6cd6393599825138c15914b78d2232987b01a5b Author: Ubuntu <[email protected]> AuthorDate: Fri Nov 28 06:22:17 2025 +0000 update scipts --- scripts/deploy/batching_experiment.py | 4 +- scripts/deploy/config/hs.config | 6 +-- scripts/deploy/config/hs1.config | 2 +- scripts/deploy/config/hs2.config | 2 +- scripts/deploy/config/performance.conf | 48 ++++++++--------- scripts/deploy/config/slot_hs1.config | 2 +- scripts/deploy/geo_scale_experiment.py | 6 +-- scripts/deploy/geo_scale_experiment.sh | 2 +- scripts/deploy/leader_slowness_experiment.py | 2 +- scripts/deploy/network_delay_experiment.py | 2 +- .../results_data/.figure1_cd_batching.py.swp | Bin 1024 -> 0 bytes scripts/deploy/results_data/figure1_cd_batching.py | 60 ++++++++++++++------- .../results_data/figure1_ef_geoscale_ycsb.py | 8 ++- scripts/deploy/rollback_experiment.py | 2 +- scripts/deploy/scalability_experiment.py | 2 +- scripts/deploy/tail_forking_experiment.py | 2 +- scripts/null | 6 ++- 17 files changed, 92 insertions(+), 64 deletions(-) diff --git a/scripts/deploy/batching_experiment.py b/scripts/deploy/batching_experiment.py index efa7703f..3e820e6d 100644 --- a/scripts/deploy/batching_experiment.py +++ b/scripts/deploy/batching_experiment.py @@ -21,7 +21,7 @@ def generate_config( tpcc_enabled = False, network_delay_num = 0, mean_network_delay = 0, - timer_length = 100): + timer_length = 0): config_dict = { "clientBatchNum": str(clientBatchNum), @@ -93,7 +93,7 @@ def main(): batch_size = args.batch_size command, config_path, max_process_txn = get_experiment_command_and_config_and_maxprocesstxn(protocol) - generate_config(config_path = config_path, clientBatchNum = batch_size) + generate_config(config_path = config_path, clientBatchNum = batch_size, max_process_txn = max_process_txn) command = command + " ./config/performance.conf" diff --git a/scripts/deploy/config/hs.config b/scripts/deploy/config/hs.config index a31e3606..887e7e41 100644 --- a/scripts/deploy/config/hs.config +++ b/scripts/deploy/config/hs.config @@ -1,9 +1,9 @@ { - "clientBatchNum": 100, + "clientBatchNum": 1000, "enable_viewchange": false, "recovery_enabled": false, "max_client_complaint_num": 10, - "max_process_txn": 3, + "max_process_txn": 5, "worker_num": 8, "input_worker_num": 5, "output_worker_num": 5, @@ -13,5 +13,5 @@ "tpcc_enabled": false, "network_delay_num": 0, "mean_network_delay": 0, - "timer_length": 100 + "timer_length": 0 } diff --git a/scripts/deploy/config/hs1.config b/scripts/deploy/config/hs1.config index a31e3606..cd04ba07 100644 --- a/scripts/deploy/config/hs1.config +++ b/scripts/deploy/config/hs1.config @@ -13,5 +13,5 @@ "tpcc_enabled": false, "network_delay_num": 0, "mean_network_delay": 0, - "timer_length": 100 + "timer_length": 0 } diff --git a/scripts/deploy/config/hs2.config b/scripts/deploy/config/hs2.config index ff9fb6b5..29f64373 100644 --- a/scripts/deploy/config/hs2.config +++ b/scripts/deploy/config/hs2.config @@ -13,5 +13,5 @@ "tpcc_enabled": false, "network_delay_num": 0, "mean_network_delay": 0, - "timer_length": 100 + "timer_length": 0 } diff --git a/scripts/deploy/config/performance.conf b/scripts/deploy/config/performance.conf index 348496e5..201fa875 100644 --- a/scripts/deploy/config/performance.conf +++ b/scripts/deploy/config/performance.conf @@ -7,31 +7,31 @@ iplist=( 172.31.17.35 172.31.16.166 172.31.22.194 +20.0.6.255 +20.0.2.190 +20.0.8.253 +20.0.9.123 +20.0.11.77 +20.0.5.74 +20.0.13.231 +20.0.14.230 +30.0.5.184 +30.0.8.136 +30.0.6.72 +30.0.2.168 +30.0.2.63 +30.0.6.58 +30.0.0.172 +30.0.8.115 +40.0.8.133 +40.0.4.165 +40.0.2.81 +40.0.12.0 +40.0.5.190 +40.0.12.253 +40.0.5.182 +40.0.0.70 172.31.27.199 -172.31.31.12 -172.31.21.12 -172.31.27.59 -172.31.19.124 -172.31.19.253 -172.31.22.192 -172.31.25.183 -172.31.24.183 -172.31.22.250 -172.31.18.186 -172.31.30.241 -172.31.26.53 -172.31.30.181 -172.31.23.246 -172.31.19.31 -172.31.29.223 -172.31.17.214 -172.31.25.86 -172.31.31.90 -172.31.31.23 -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 a31e3606..c82d68d3 100644 --- a/scripts/deploy/config/slot_hs1.config +++ b/scripts/deploy/config/slot_hs1.config @@ -1,5 +1,5 @@ { - "clientBatchNum": 100, + "clientBatchNum": 5000, "enable_viewchange": false, "recovery_enabled": false, "max_client_complaint_num": 10, diff --git a/scripts/deploy/geo_scale_experiment.py b/scripts/deploy/geo_scale_experiment.py index 40e1b4fb..1db0e48a 100644 --- a/scripts/deploy/geo_scale_experiment.py +++ b/scripts/deploy/geo_scale_experiment.py @@ -21,7 +21,7 @@ def generate_config( tpcc_enabled = False, network_delay_num = 0, mean_network_delay = 0, - timer_length = 100): + timer_length = 0): config_dict = { "clientBatchNum": str(clientBatchNum), @@ -102,13 +102,13 @@ def generate_performance_server_conf(region_number, output_file = "./config/perf for filepath, k in input_file_dict.items(): with open(filepath, "r") as infile: for i, line in enumerate(infile): - if i >= k: # One more line for one client + if i >= k: break outfile.write(line) outfile.write("\n") with open("./config/us-east-1-machines", "r") as infile: for i, line in enumerate(infile): - if i == 1 + input_file_dict["./config/us-east-1-machines"]: # One more line for one client + if i == input_file_dict["./config/us-east-1-machines"]: # One more line for one client outfile.write(line) break outfile.write(")\n\nclient_num=1\nkey="+ssh_key) diff --git a/scripts/deploy/geo_scale_experiment.sh b/scripts/deploy/geo_scale_experiment.sh index e33e36cd..82e34a7b 100755 --- a/scripts/deploy/geo_scale_experiment.sh +++ b/scripts/deploy/geo_scale_experiment.sh @@ -20,7 +20,7 @@ REGION_NUMBER=$2 BENCHMARK=$3 # Capture the Python script's output -OUTPUT=$(python3 "$PYTHON_SCRIPT" "$PROTOCOL" "$REGION_NUMBER", "$BENCHMARK") +OUTPUT=$(python3 "$PYTHON_SCRIPT" "$PROTOCOL" "$REGION_NUMBER" "$BENCHMARK") # Print the output (or use it later in the script) echo "returned command: $OUTPUT" diff --git a/scripts/deploy/leader_slowness_experiment.py b/scripts/deploy/leader_slowness_experiment.py index bdd6e6dc..6b441b43 100644 --- a/scripts/deploy/leader_slowness_experiment.py +++ b/scripts/deploy/leader_slowness_experiment.py @@ -21,7 +21,7 @@ def generate_config( tpcc_enabled = False, network_delay_num = 0, mean_network_delay = 0, - timer_length = 100): + timer_length = 0): config_dict = { "clientBatchNum": str(clientBatchNum), diff --git a/scripts/deploy/network_delay_experiment.py b/scripts/deploy/network_delay_experiment.py index 5e16a82c..c073d53a 100644 --- a/scripts/deploy/network_delay_experiment.py +++ b/scripts/deploy/network_delay_experiment.py @@ -21,7 +21,7 @@ def generate_config( tpcc_enabled = False, network_delay_num = 0, mean_network_delay = 0, - timer_length = 100): + timer_length = 0): config_dict = { "clientBatchNum": str(clientBatchNum), diff --git a/scripts/deploy/results_data/.figure1_cd_batching.py.swp b/scripts/deploy/results_data/.figure1_cd_batching.py.swp deleted file mode 100644 index f3db0501..00000000 Binary files a/scripts/deploy/results_data/.figure1_cd_batching.py.swp and /dev/null differ diff --git a/scripts/deploy/results_data/figure1_cd_batching.py b/scripts/deploy/results_data/figure1_cd_batching.py index 1018aa69..3ef94d3b 100644 --- a/scripts/deploy/results_data/figure1_cd_batching.py +++ b/scripts/deploy/results_data/figure1_cd_batching.py @@ -6,35 +6,55 @@ class ThroughputLatency: self.latency = latency HS = { - 100: ThroughputLatency(55642, 9.0037), - 1000: ThroughputLatency(393056, 20.1699), - 2000: ThroughputLatency(653600, 30.6009), - 5000: ThroughputLatency(1007000, 59.5984), - 10000: ThroughputLatency(998000, 110.4805), +# 100: ThroughputLatency(55642, 9.0037), + 100: ThroughputLatency(0, 0), +# 1000: ThroughputLatency(393056, 20.1699), + 1000: ThroughputLatency(0, 0), +# 2000: ThroughputLatency(653600, 30.6009), + 2000: ThroughputLatency(0, 0), +# 5000: ThroughputLatency(1007000, 59.5984), + 5000: ThroughputLatency(0, 0), +# 10000: ThroughputLatency(998000, 110.4805), + 10000: ThroughputLatency(0, 0), } HS_2 = { - 100: ThroughputLatency(55470, 7.171), - 1000: ThroughputLatency(397826, 15.82379), - 2000: ThroughputLatency(651938, 25.94823), - 5000: ThroughputLatency(1003582, 47.59186), - 10000: ThroughputLatency(998000, 84.84423), +# 100: ThroughputLatency(55470, 7.171), + 100: ThroughputLatency(44351.57894736842, 0.0069697249999999995), +# 1000: ThroughputLatency(397826, 15.82379), + 1000: ThroughputLatency(140981.05263157896, 0.024751925), +# 2000: ThroughputLatency(651938, 25.94823), + 2000: ThroughputLatency(179751.57894736843, 0.041366575), +# 5000: ThroughputLatency(1003582, 47.59186), + 5000: ThroughputLatency(187052.63157894736, 0.09664127499999998), +# 10000: ThroughputLatency(998000, 84.84423), + 10000: ThroughputLatency(210357.8947368421, 0.162620325), } HS_1 = { - 100: ThroughputLatency(55303, 5.5422), - 1000: ThroughputLatency(397826, 11.11878), - 2000: ThroughputLatency(657016, 17.11501), - 5000: ThroughputLatency(1003935, 32.2121), - 10000: ThroughputLatency(998000, 60.077), +# 100: ThroughputLatency(55303, 5.5422), + 100: ThroughputLatency(57232.42105263158, 0.0059790875), +# 1000: ThroughputLatency(397826, 11.11878), + 1000: ThroughputLatency(227029.47368421053, 0.013924875), +# 2000: ThroughputLatency(657016, 17.11501) , + 2000: ThroughputLatency(316471.5789473684, 0.02088595), +# 5000: ThroughputLatency(1003935, 32.2121), + 5000: ThroughputLatency(339252.63157894736, 0.05006580000000001), +# 10000: ThroughputLatency(998000, 60.077), + 10000: ThroughputLatency(310968.4210526316, 0.09185317500000001), } HS_1_SLOT = { - 100: ThroughputLatency(56983, 5.336), - 1000: ThroughputLatency(394827, 11.3962), - 2000: ThroughputLatency(655849, 17.0732), - 5000: ThroughputLatency(1001097, 31.4161), - 10000: ThroughputLatency(1000000, 61.8673), +# 100: ThroughputLatency(56983, 5.336), + 100: ThroughputLatency(59397.708333333336, 0.0051389174999999995), +# 1000: ThroughputLatency(394827, 11.3962), + 1000: ThroughputLatency(146475.0, 0.086021625), +# 2000: ThroughputLatency(655849, 17.0732), + 2000: ThroughputLatency(198129.16666666666, 0.04868), +# 5000: ThroughputLatency(1001097, 31.4161), + 5000: ThroughputLatency(253000.0, 0.081467025), +# 10000: ThroughputLatency(1000000, 61.8673), + 10000: ThroughputLatency(280437.5, 0.108040925), } diff --git a/scripts/deploy/results_data/figure1_ef_geoscale_ycsb.py b/scripts/deploy/results_data/figure1_ef_geoscale_ycsb.py index 354e4836..1b089d48 100644 --- a/scripts/deploy/results_data/figure1_ef_geoscale_ycsb.py +++ b/scripts/deploy/results_data/figure1_ef_geoscale_ycsb.py @@ -21,9 +21,13 @@ HS_2 = { } HS_1 = { - 2: ThroughputLatency(449, 0.719953), - 3: ThroughputLatency(278, 1.240168), + # 2: ThroughputLatency(449, 0.719953), + 2: ThroughputLatency(103.57894736842105, 3.0429666666666666), +# 3: ThroughputLatency(278, 1.240168), + 3: ThroughputLatency(0, 0), 4: ThroughputLatency(192, 1.711321), + 4: ThroughputLatency(192, 1.711321), + 5: ThroughputLatency(184, 1.840360), 5: ThroughputLatency(184, 1.840360), } diff --git a/scripts/deploy/rollback_experiment.py b/scripts/deploy/rollback_experiment.py index 66be8064..b07a84c5 100644 --- a/scripts/deploy/rollback_experiment.py +++ b/scripts/deploy/rollback_experiment.py @@ -21,7 +21,7 @@ def generate_config( tpcc_enabled = False, network_delay_num = 0, mean_network_delay = 0, - timer_length = 100): + timer_length = 0): config_dict = { "clientBatchNum": str(clientBatchNum), diff --git a/scripts/deploy/scalability_experiment.py b/scripts/deploy/scalability_experiment.py index ec751fae..5cda1548 100644 --- a/scripts/deploy/scalability_experiment.py +++ b/scripts/deploy/scalability_experiment.py @@ -21,7 +21,7 @@ def generate_config( tpcc_enabled = False, network_delay_num = 0, mean_network_delay = 0, - timer_length = 100): + timer_length = 0): config_dict = { "clientBatchNum": str(clientBatchNum), diff --git a/scripts/deploy/tail_forking_experiment.py b/scripts/deploy/tail_forking_experiment.py index f5e7b053..ae0648ea 100644 --- a/scripts/deploy/tail_forking_experiment.py +++ b/scripts/deploy/tail_forking_experiment.py @@ -21,7 +21,7 @@ def generate_config( tpcc_enabled = False, network_delay_num = 0, mean_network_delay = 0, - timer_length = 100): + timer_length = 0): config_dict = { "clientBatchNum": str(clientBatchNum), diff --git a/scripts/null b/scripts/null index 5f879988..7d372eba 100644 --- a/scripts/null +++ b/scripts/null @@ -1 +1,5 @@ -/home/ubuntu/incubator-resilientdb/service/contract/benchmark/data/smallbank.json: No such file or directory +ssh: connect to host 30.0.2.63 port 22: Connection timed out +lost connection + + +n: No such file or directory
