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
The following commit(s) were added to refs/heads/hotstuff-1-ari by this push:
new 6f9c48ac fix network_delay_test bugs
6f9c48ac is described below
commit 6f9c48ac9f890b49c2fef700844794050690573d
Author: Ubuntu <[email protected]>
AuthorDate: Sat Sep 13 00:16:28 2025 +0000
fix network_delay_test bugs
---
README.md | 4 +--
.../ordering/common/algorithm/protocol_base.cpp | 2 +-
platform/consensus/ordering/hs/algorithm/hs.h | 2 ++
scripts/deploy/batching_experiment.py | 6 ++--
scripts/deploy/config/hs.config | 6 ++--
scripts/deploy/config/hs1.config | 4 +--
scripts/deploy/config/performance.conf | 33 ------------------
scripts/deploy/config/slot_hs1.config | 5 +--
scripts/deploy/geo_scale_experiment.py | 6 ++--
scripts/deploy/leader_slowness_experiment.py | 4 ++-
scripts/deploy/leader_slowness_experiment.sh | 2 +-
scripts/deploy/network_delay_experiment.py | 8 +++--
scripts/deploy/performance/hs2_performance.sh | 3 ++
scripts/deploy/performance/hs_performance.sh | 3 ++
scripts/deploy/performance/run_performance.sh | 4 +--
scripts/deploy/performance/slot_hs1_performance.sh | 3 ++
.../figure3_ab_leader_slowness_10ms.py | 40 +++++++++++-----------
.../figure3_cd_leader_slowness_100ms.py | 40 +++++++++++-----------
scripts/deploy/scalability_experiment.py | 6 ++--
.../{aws_machines => }/start_all_instances.sh | 0
.../start_ap_east_1_instances.sh | 0
.../start_eu_central_2_instances.sh | 0
.../start_eu_west_2_instances.sh | 0
.../start_sa_east_1_instances.sh | 0
.../start_us_east_1_instances.sh | 0
.../{aws_machines => }/stop_all_instances.sh | 0
.../{aws_machines => }/stop_ap_east_1_instances.sh | 0
.../stop_eu_central_2_instances.sh | 0
.../{aws_machines => }/stop_eu_west_2_instances.sh | 0
.../{aws_machines => }/stop_sa_east_1_instances.sh | 0
.../{aws_machines => }/stop_us_east_1_instances.sh | 0
scripts/deploy/tail_forking_experiment.py | 4 ++-
scripts/null | 3 +-
33 files changed, 89 insertions(+), 99 deletions(-)
diff --git a/README.md b/README.md
index 5b420fed..ee7a37f4 100644
--- a/README.md
+++ b/README.md
@@ -313,7 +313,7 @@ Use the following script, replacing `protocol_name`,
`num_impacted_replica`, and
`protocol_name`: one of `[HS-1, HS-2, HS, HS-1-SLOT]`
-`num_impacted_replica`: one of `[0, 1, 4, 7, 10]`
+`num_impacted_replica`: one of `[0, 10, 11, 20, 21, 31]`
`network_delay`: one of `[1, 5, 50, 500]`
@@ -401,7 +401,7 @@ To launch instances, use the provided script:
./start_us_east_1_instances.sh 31
```
-#### Step 2: Run the Network Delay Experiment
+#### Step 2: Run the Leader Slowness Experiment
Use the following script, replacing `protocol_name`, `num_slow_leaders`, and
`timer_length` with your desired values:
diff --git a/platform/consensus/ordering/common/algorithm/protocol_base.cpp
b/platform/consensus/ordering/common/algorithm/protocol_base.cpp
index 3294ff4f..28c8ef6b 100644
--- a/platform/consensus/ordering/common/algorithm/protocol_base.cpp
+++ b/platform/consensus/ordering/common/algorithm/protocol_base.cpp
@@ -66,7 +66,7 @@ int ProtocolBase::Commit(const google::protobuf::Message&
msg) {
void ProtocolBase::SetNetworkDelayGenerator(int32_t network_delay_num, double
mean_network_delay) {
network_delay_num_ = network_delay_num;
- mean_network_delay_ = mean_network_delay;
+ mean_network_delay_ = mean_network_delay * 1000; // convert to microsecond
sigma_ = 0.2 * mean_network_delay_; // Standard deviation
gen_ = std::mt19937(rd_()); // Mersenne Twister engine
diff --git a/platform/consensus/ordering/hs/algorithm/hs.h
b/platform/consensus/ordering/hs/algorithm/hs.h
index f2dda184..7a2d209d 100644
--- a/platform/consensus/ordering/hs/algorithm/hs.h
+++ b/platform/consensus/ordering/hs/algorithm/hs.h
@@ -61,6 +61,8 @@ class HotStuff: public common::ProtocolBase {
std::unique_ptr<QC> formed_qc_;
uint64_t crash_num_ = 0;
+
+ uint64_t timer_length_;
};
} // namespace hs
diff --git a/scripts/deploy/batching_experiment.py
b/scripts/deploy/batching_experiment.py
index b51ac976..efa7703f 100644
--- a/scripts/deploy/batching_experiment.py
+++ b/scripts/deploy/batching_experiment.py
@@ -20,7 +20,8 @@ def generate_config(
rollback_num = 0,
tpcc_enabled = False,
network_delay_num = 0,
- mean_network_delay = 0):
+ mean_network_delay = 0,
+ timer_length = 100):
config_dict = {
"clientBatchNum": str(clientBatchNum),
@@ -36,7 +37,8 @@ def generate_config(
"rollback_num": str(rollback_num),
"tpcc_enabled": "true" if tpcc_enabled else "false",
"network_delay_num": str(network_delay_num),
- "mean_network_delay": str(mean_network_delay)
+ "mean_network_delay": str(mean_network_delay),
+ "timer_length": str(timer_length),
}
with open(config_path, "w") as f:
diff --git a/scripts/deploy/config/hs.config b/scripts/deploy/config/hs.config
index aa82b739..53ffe3e8 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": 6,
+ "max_process_txn": 5,
"worker_num": 8,
"input_worker_num": 5,
"output_worker_num": 5,
@@ -11,6 +11,6 @@
"fork_tail_num": 0,
"rollback_num": 0,
"tpcc_enabled": false,
- "network_delay_num": 0,
- "mean_network_delay": 0
+ "network_delay_num": 31,
+ "mean_network_delay": 500
}
diff --git a/scripts/deploy/config/hs1.config b/scripts/deploy/config/hs1.config
index 31ba1869..8e6d5a8a 100644
--- a/scripts/deploy/config/hs1.config
+++ b/scripts/deploy/config/hs1.config
@@ -11,6 +11,6 @@
"fork_tail_num": 0,
"rollback_num": 0,
"tpcc_enabled": false,
- "network_delay_num": 3,
- "mean_network_delay": 100
+ "network_delay_num": 31,
+ "mean_network_delay": 500
}
diff --git a/scripts/deploy/config/performance.conf
b/scripts/deploy/config/performance.conf
index d1f3d56d..b85e34c5 100644
--- a/scripts/deploy/config/performance.conf
+++ b/scripts/deploy/config/performance.conf
@@ -31,39 +31,6 @@ iplist=(
172.31.25.82
172.31.28.81
172.31.30.211
-172.31.16.82
-172.31.30.0
-172.31.19.193
-172.31.29.66
-172.31.27.133
-172.31.22.76
-172.31.25.206
-172.31.23.79
-172.31.21.208
-172.31.26.109
-172.31.20.111
-172.31.21.175
-172.31.20.182
-172.31.30.246
-172.31.22.122
-172.31.22.123
-172.31.25.59
-172.31.31.162
-172.31.19.36
-172.31.20.37
-172.31.22.167
-172.31.27.170
-172.31.17.234
-172.31.19.107
-172.31.28.45
-172.31.29.160
-172.31.28.161
-172.31.25.16
-172.31.18.147
-172.31.30.148
-172.31.25.149
-172.31.21.218
-172.31.26.95
)
client_num=1
diff --git a/scripts/deploy/config/slot_hs1.config
b/scripts/deploy/config/slot_hs1.config
index 9a39e4ed..49f4fd20 100644
--- a/scripts/deploy/config/slot_hs1.config
+++ b/scripts/deploy/config/slot_hs1.config
@@ -11,6 +11,7 @@
"fork_tail_num": 0,
"rollback_num": 0,
"tpcc_enabled": false,
- "network_delay_num": 0,
- "mean_network_delay": 0
+ "network_delay_num": 31,
+ "mean_network_delay": 5,
+ "timer_length": 100
}
diff --git a/scripts/deploy/geo_scale_experiment.py
b/scripts/deploy/geo_scale_experiment.py
index be147754..40e1b4fb 100644
--- a/scripts/deploy/geo_scale_experiment.py
+++ b/scripts/deploy/geo_scale_experiment.py
@@ -20,7 +20,8 @@ def generate_config(
rollback_num = 0,
tpcc_enabled = False,
network_delay_num = 0,
- mean_network_delay = 0):
+ mean_network_delay = 0,
+ timer_length = 100):
config_dict = {
"clientBatchNum": str(clientBatchNum),
@@ -36,7 +37,8 @@ def generate_config(
"rollback_num": str(rollback_num),
"tpcc_enabled": "true" if tpcc_enabled else "false",
"network_delay_num": str(network_delay_num),
- "mean_network_delay": str(mean_network_delay)
+ "mean_network_delay": str(mean_network_delay),
+ "timer_length": str(timer_length),
}
with open(config_path, "w") as f:
diff --git a/scripts/deploy/leader_slowness_experiment.py
b/scripts/deploy/leader_slowness_experiment.py
index c4f5e672..bdd6e6dc 100644
--- a/scripts/deploy/leader_slowness_experiment.py
+++ b/scripts/deploy/leader_slowness_experiment.py
@@ -98,7 +98,9 @@ def main():
command = command + " ./config/performance.conf"
- generate_performance_server_conf(region_number)
+ replica_num = 31
+
+ generate_performance_server_conf(replica_num)
print(f"{command}")
diff --git a/scripts/deploy/leader_slowness_experiment.sh
b/scripts/deploy/leader_slowness_experiment.sh
index 13caefd1..9146dec4 100755
--- a/scripts/deploy/leader_slowness_experiment.sh
+++ b/scripts/deploy/leader_slowness_experiment.sh
@@ -20,7 +20,7 @@ NUM_SLOW=$2
TIMEOUT_LENGTH=$3
# Capture the Python script's output
-OUTPUT=$(python3 "$PYTHON_SCRIPT" "$PROTOCOL" "$NUM_SLOW", "$TIMEOUT_LENGTH")
+OUTPUT=$(python3 "$PYTHON_SCRIPT" "$PROTOCOL" "$NUM_SLOW" "$TIMEOUT_LENGTH")
# Print the output (or use it later in the script)
echo "returned command: $OUTPUT"
diff --git a/scripts/deploy/network_delay_experiment.py
b/scripts/deploy/network_delay_experiment.py
index bccd97f5..5e16a82c 100644
--- a/scripts/deploy/network_delay_experiment.py
+++ b/scripts/deploy/network_delay_experiment.py
@@ -20,7 +20,8 @@ def generate_config(
rollback_num = 0,
tpcc_enabled = False,
network_delay_num = 0,
- mean_network_delay = 0):
+ mean_network_delay = 0,
+ timer_length = 100):
config_dict = {
"clientBatchNum": str(clientBatchNum),
@@ -36,7 +37,8 @@ def generate_config(
"rollback_num": str(rollback_num),
"tpcc_enabled": "true" if tpcc_enabled else "false",
"network_delay_num": str(network_delay_num),
- "mean_network_delay": str(mean_network_delay)
+ "mean_network_delay": str(mean_network_delay),
+ "timer_length": str(timer_length),
}
with open(config_path, "w") as f:
@@ -98,7 +100,7 @@ def main():
command = command + " ./config/performance.conf"
- # print(f"command: {command}")
+ replica_number = 31
generate_performance_server_conf(replica_number)
diff --git a/scripts/deploy/performance/hs2_performance.sh
b/scripts/deploy/performance/hs2_performance.sh
index 417e9ece..f4d33caa 100755
--- a/scripts/deploy/performance/hs2_performance.sh
+++ b/scripts/deploy/performance/hs2_performance.sh
@@ -2,3 +2,6 @@ export server=//benchmark/protocols/hs2:kv_server_performance
export TEMPLATE_PATH=$PWD/config/hs2.config
./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
diff --git a/scripts/deploy/performance/hs_performance.sh
b/scripts/deploy/performance/hs_performance.sh
index 6862fdcb..b8cd4547 100755
--- a/scripts/deploy/performance/hs_performance.sh
+++ b/scripts/deploy/performance/hs_performance.sh
@@ -2,3 +2,6 @@ export server=//benchmark/protocols/hs:kv_server_performance
export TEMPLATE_PATH=$PWD/config/hs.config
./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
diff --git a/scripts/deploy/performance/run_performance.sh
b/scripts/deploy/performance/run_performance.sh
index d9a5804b..4e09f368 100755
--- a/scripts/deploy/performance/run_performance.sh
+++ b/scripts/deploy/performance/run_performance.sh
@@ -2,7 +2,7 @@
. ./script/env.sh
-# ./script/copy_local_db.sh
+./script/copy_local_db.sh
./script/deploy.sh $1
@@ -53,7 +53,7 @@ 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
diff --git a/scripts/deploy/performance/slot_hs1_performance.sh
b/scripts/deploy/performance/slot_hs1_performance.sh
index be3f53da..21d686f8 100755
--- a/scripts/deploy/performance/slot_hs1_performance.sh
+++ b/scripts/deploy/performance/slot_hs1_performance.sh
@@ -2,3 +2,6 @@ export
server=//benchmark/protocols/slot_hs1:kv_server_performance
export TEMPLATE_PATH=$PWD/config/slot_hs1.config
./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
diff --git a/scripts/deploy/results_data/figure3_ab_leader_slowness_10ms.py
b/scripts/deploy/results_data/figure3_ab_leader_slowness_10ms.py
index 22d8b3e6..deb6405b 100644
--- a/scripts/deploy/results_data/figure3_ab_leader_slowness_10ms.py
+++ b/scripts/deploy/results_data/figure3_ab_leader_slowness_10ms.py
@@ -6,35 +6,35 @@ class ThroughputLatency:
self.latency = latency
HS = {
- 0: ThroughputLatency(55642, 9.0483),
- 1: ThroughputLatency(47048, 10.6237),
- 4: ThroughputLatency(32665, 15.4016),
- 7: ThroughputLatency(24479, 20.6294),
- 10: ThroughputLatency(20162, 24.9816),
+ 0: ThroughputLatency(55642, 0.009.0483),
+ 1: ThroughputLatency(47048, 0.010.6237),
+ 4: ThroughputLatency(32665, 0.015.4016),
+ 7: ThroughputLatency(24479, 0.020.6294),
+ 10: ThroughputLatency(20162, 0.024.9816),
}
HS_2 = {
- 0: ThroughputLatency(55470, 7.1089),
- 1: ThroughputLatency(47252, 8.4064),
- 4: ThroughputLatency(32642, 12.2794),
- 7: ThroughputLatency(24938, 16.1366),
- 10: ThroughputLatency(20196, 19.9252),
+ 0: ThroughputLatency(55470, 0.007.1089),
+ 1: ThroughputLatency(47252, 0.008.4064),
+ 4: ThroughputLatency(32642, 0.012.2794),
+ 7: ThroughputLatency(24938, 0.016.1366),
+ 10: ThroughputLatency(20196, 0.019.9252),
}
HS_1 = {
- 0: ThroughputLatency(55303, 5.3013),
- 1: ThroughputLatency(47301, 6.2944),
- 4: ThroughputLatency(32537, 9.2198),
- 7: ThroughputLatency(24916, 12.0650),
- 10: ThroughputLatency(20172, 14.9602),
+ 0: ThroughputLatency(55303, 0.005.3013),
+ 1: ThroughputLatency(47301, 0.006.2944),
+ 4: ThroughputLatency(32537, 0.009.2198),
+ 7: ThroughputLatency(24916, 0.012.0650),
+ 10: ThroughputLatency(20172, 0.014.9602),
}
HS_1_SLOT = {
- 0: ThroughputLatency(55983, 5.161),
- 1: ThroughputLatency(54977, 5.2078),
- 4: ThroughputLatency(48998, 5.6563),
- 7: ThroughputLatency(45032, 5.6839),
- 10: ThroughputLatency(39932, 6.1177),
+ 0: ThroughputLatency(55983, 0.005161),
+ 1: ThroughputLatency(54977, 0.0052078),
+ 4: ThroughputLatency(48998, 0.0056563),
+ 7: ThroughputLatency(45032, 0.0056839),
+ 10: ThroughputLatency(39932, 0.0061177),
}
diff --git a/scripts/deploy/results_data/figure3_cd_leader_slowness_100ms.py
b/scripts/deploy/results_data/figure3_cd_leader_slowness_100ms.py
index a8425e8a..16640b8e 100644
--- a/scripts/deploy/results_data/figure3_cd_leader_slowness_100ms.py
+++ b/scripts/deploy/results_data/figure3_cd_leader_slowness_100ms.py
@@ -6,35 +6,35 @@ class ThroughputLatency:
self.latency = latency
HS = {
- 0: ThroughputLatency(55642, 9.0483),
- 1: ThroughputLatency(20264, 24.812),
- 4: ThroughputLatency(6962, 72.384),
- 7: ThroughputLatency(4189, 124.2736),
- 10: ThroughputLatency(3015, 168.3731),
+ 0: ThroughputLatency(55642, 0.0090483),
+ 1: ThroughputLatency(20264, 0.02545),
+ 4: ThroughputLatency(6962, 0.072384),
+ 7: ThroughputLatency(4189, 0.1242736),
+ 10: ThroughputLatency(3015, 0.1683731),
}
HS_2 = {
- 0: ThroughputLatency(55470, 7.1089),
- 1: ThroughputLatency(20229, 19.8532),
- 4: ThroughputLatency(6939, 58.2012),
- 7: ThroughputLatency(4132, 98.8459),
- 10: ThroughputLatency(3019, 134.4022),
+ 0: ThroughputLatency(55470, 0.0071089),
+ 1: ThroughputLatency(20229, 0.0198532),
+ 4: ThroughputLatency(6939, 0.0582012),
+ 7: ThroughputLatency(4132, 0.0988459),
+ 10: ThroughputLatency(3019, 0.1344022),
}
HS_1 = {
- 0: ThroughputLatency(55303, 5.3013),
- 1: ThroughputLatency(20222, 14.8907),
- 4: ThroughputLatency(6975, 43.9212),
- 7: ThroughputLatency(4211, 72.5262),
- 10: ThroughputLatency(3017, 100.9351),
+ 0: ThroughputLatency(55303, 0.0053013),
+ 1: ThroughputLatency(20283, 0.01535),
+ 4: ThroughputLatency(6975, 0.043912),
+ 7: ThroughputLatency(4211, 0.072562),
+ 10: ThroughputLatency(2914, 0.11574),
}
HS_1_SLOT = {
- 0: ThroughputLatency(55983, 5.129),
- 1: ThroughputLatency(53790, 5.4213),
- 4: ThroughputLatency(48538, 5.6162),
- 7: ThroughputLatency(42923, 5.9481),
- 10: ThroughputLatency(36705, 6.5191),
+ 0: ThroughputLatency(55983, 0.005129),
+ 1: ThroughputLatency(55617, 0.0049811),
+ 4: ThroughputLatency(48538, 0.0056162),
+ 7: ThroughputLatency(42923, 0.0059481),
+ 10: ThroughputLatency(41763, 0.00573),
}
PlaceHolder = {
diff --git a/scripts/deploy/scalability_experiment.py
b/scripts/deploy/scalability_experiment.py
index d4466411..ec751fae 100644
--- a/scripts/deploy/scalability_experiment.py
+++ b/scripts/deploy/scalability_experiment.py
@@ -20,7 +20,8 @@ def generate_config(
rollback_num = 0,
tpcc_enabled = False,
network_delay_num = 0,
- mean_network_delay = 0):
+ mean_network_delay = 0,
+ timer_length = 100):
config_dict = {
"clientBatchNum": str(clientBatchNum),
@@ -36,7 +37,8 @@ def generate_config(
"rollback_num": str(rollback_num),
"tpcc_enabled": "true" if tpcc_enabled else "false",
"network_delay_num": str(network_delay_num),
- "mean_network_delay": str(mean_network_delay)
+ "mean_network_delay": str(mean_network_delay),
+ "timer_length": str(timer_length),
}
with open(config_path, "w") as f:
diff --git a/scripts/deploy/aws_machines/start_all_instances.sh
b/scripts/deploy/start_all_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/start_all_instances.sh
rename to scripts/deploy/start_all_instances.sh
diff --git a/scripts/deploy/aws_machines/start_ap_east_1_instances.sh
b/scripts/deploy/start_ap_east_1_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/start_ap_east_1_instances.sh
rename to scripts/deploy/start_ap_east_1_instances.sh
diff --git a/scripts/deploy/aws_machines/start_eu_central_2_instances.sh
b/scripts/deploy/start_eu_central_2_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/start_eu_central_2_instances.sh
rename to scripts/deploy/start_eu_central_2_instances.sh
diff --git a/scripts/deploy/aws_machines/start_eu_west_2_instances.sh
b/scripts/deploy/start_eu_west_2_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/start_eu_west_2_instances.sh
rename to scripts/deploy/start_eu_west_2_instances.sh
diff --git a/scripts/deploy/aws_machines/start_sa_east_1_instances.sh
b/scripts/deploy/start_sa_east_1_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/start_sa_east_1_instances.sh
rename to scripts/deploy/start_sa_east_1_instances.sh
diff --git a/scripts/deploy/aws_machines/start_us_east_1_instances.sh
b/scripts/deploy/start_us_east_1_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/start_us_east_1_instances.sh
rename to scripts/deploy/start_us_east_1_instances.sh
diff --git a/scripts/deploy/aws_machines/stop_all_instances.sh
b/scripts/deploy/stop_all_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/stop_all_instances.sh
rename to scripts/deploy/stop_all_instances.sh
diff --git a/scripts/deploy/aws_machines/stop_ap_east_1_instances.sh
b/scripts/deploy/stop_ap_east_1_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/stop_ap_east_1_instances.sh
rename to scripts/deploy/stop_ap_east_1_instances.sh
diff --git a/scripts/deploy/aws_machines/stop_eu_central_2_instances.sh
b/scripts/deploy/stop_eu_central_2_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/stop_eu_central_2_instances.sh
rename to scripts/deploy/stop_eu_central_2_instances.sh
diff --git a/scripts/deploy/aws_machines/stop_eu_west_2_instances.sh
b/scripts/deploy/stop_eu_west_2_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/stop_eu_west_2_instances.sh
rename to scripts/deploy/stop_eu_west_2_instances.sh
diff --git a/scripts/deploy/aws_machines/stop_sa_east_1_instances.sh
b/scripts/deploy/stop_sa_east_1_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/stop_sa_east_1_instances.sh
rename to scripts/deploy/stop_sa_east_1_instances.sh
diff --git a/scripts/deploy/aws_machines/stop_us_east_1_instances.sh
b/scripts/deploy/stop_us_east_1_instances.sh
similarity index 100%
rename from scripts/deploy/aws_machines/stop_us_east_1_instances.sh
rename to scripts/deploy/stop_us_east_1_instances.sh
diff --git a/scripts/deploy/tail_forking_experiment.py
b/scripts/deploy/tail_forking_experiment.py
index 7bfcd7c3..4b7061e4 100644
--- a/scripts/deploy/tail_forking_experiment.py
+++ b/scripts/deploy/tail_forking_experiment.py
@@ -96,7 +96,9 @@ def main():
command = command + " ./config/performance.conf"
- generate_performance_server_conf(region_number)
+ replica_num = 31
+
+ generate_performance_server_conf(replica_num)
print(f"{command}")
diff --git a/scripts/null b/scripts/null
index e7341359..5f879988 100644
--- a/scripts/null
+++ b/scripts/null
@@ -1,2 +1 @@
-ssh: connect to host 172.31.31.131 port 22: No route to host
-lost connection
+/home/ubuntu/incubator-resilientdb/service/contract/benchmark/data/smallbank.json:
No such file or directory
