This is an automated email from the ASF dual-hosted git repository.
junchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git
The following commit(s) were added to refs/heads/master by this push:
new c4fffcdc upate
c4fffcdc is described below
commit c4fffcdc189979c9dcf4ae2fc56ab564d869e248
Author: cjcchen <[email protected]>
AuthorDate: Mon Oct 7 15:51:19 2024 +0000
upate
---
.bazelversion | 1 -
platform/consensus/ordering/pbft/commitment.cpp | 4 ++--
platform/consensus/ordering/pbft/performance_manager.cpp | 10 ++++++----
scripts/deploy/config/kv_performance_server.conf | 11 ++++++-----
scripts/deploy/config/pbft.config | 10 ++++++++++
scripts/deploy/performance/pbft_performance.sh | 2 ++
scripts/deploy/performance/run_performance.sh | 8 +++++---
scripts/deploy/script/deploy.sh | 11 ++++++++---
scripts/deploy/script/generate_config.sh | 2 +-
9 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/.bazelversion b/.bazelversion
deleted file mode 100644
index 09b254e9..00000000
--- a/.bazelversion
+++ /dev/null
@@ -1 +0,0 @@
-6.0.0
diff --git a/platform/consensus/ordering/pbft/commitment.cpp
b/platform/consensus/ordering/pbft/commitment.cpp
index 4a1aacc0..4d048331 100644
--- a/platform/consensus/ordering/pbft/commitment.cpp
+++ b/platform/consensus/ordering/pbft/commitment.cpp
@@ -245,7 +245,7 @@ int Commitment::ProcessPrepareMsg(std::unique_ptr<Context>
context,
return message_manager_->AddConsensusMsg(context->signature,
std::move(request));
}
- global_stats_->IncPrepare();
+ //global_stats_->IncPrepare();
std::unique_ptr<Request> commit_request = resdb::NewRequest(
Request::TYPE_COMMIT, *request, config_.GetSelfInfo().id());
commit_request->mutable_data_signature()->Clear();
@@ -288,7 +288,7 @@ int Commitment::ProcessCommitMsg(std::unique_ptr<Context>
context,
return message_manager_->AddConsensusMsg(context->signature,
std::move(request));
}
- global_stats_->IncCommit();
+ //global_stats_->IncCommit();
// Add request to message_manager.
// If it has received enough same requests(2f+1), message manager will
// commit the request.
diff --git a/platform/consensus/ordering/pbft/performance_manager.cpp
b/platform/consensus/ordering/pbft/performance_manager.cpp
index 26d0ebca..db985a03 100644
--- a/platform/consensus/ordering/pbft/performance_manager.cpp
+++ b/platform/consensus/ordering/pbft/performance_manager.cpp
@@ -57,6 +57,7 @@ PerformanceManager::PerformanceManager(
stop_ = false;
eval_started_ = false;
eval_ready_future_ = eval_ready_promise_.get_future();
+
if (config_.GetPublicKeyCertificateInfo()
.public_key()
.public_key_info()
@@ -74,7 +75,7 @@ PerformanceManager::PerformanceManager(
send_num_.push_back(0);
}
total_num_ = 0;
- timeout_length_ = 10000000; // 10s
+ timeout_length_ = 100000000; // 10s
}
PerformanceManager::~PerformanceManager() {
@@ -107,12 +108,12 @@ int PerformanceManager::StartEval() {
return 0;
}
eval_started_ = true;
- for (int i = 0; i < 60000000000; ++i) {
+ for (int i = 0; i < 60000000; ++i) {
std::unique_ptr<QueueItem> queue_item = std::make_unique<QueueItem>();
queue_item->context = nullptr;
queue_item->user_request = GenerateUserRequest();
batch_queue_.Push(std::move(queue_item));
- if (i == 20000000) {
+ if (i == 2000000) {
eval_ready_promise_.set_value(true);
}
}
@@ -202,6 +203,7 @@ CollectorResultCode PerformanceManager::AddResponseMsg(
uint64_t seq = batch_response->local_id();
int type = request->type();
+ seq = request->seq();
int resp_received_count = 0;
int ret = collector_pool_->GetCollector(seq)->AddRequest(
std::move(request), signature, false,
@@ -308,6 +310,7 @@ int PerformanceManager::DoBatch(
}
batch_request.set_createtime(GetCurrentTime());
+ batch_request.set_local_id(local_id_++);
batch_request.SerializeToString(new_request->mutable_data());
if (verifier_) {
auto signature_or = verifier_->SignMessage(new_request->data());
@@ -397,7 +400,6 @@ void PerformanceManager::MonitoringClientTimeOut() {
if (CheckTimeOut(client_timeout.hash)) {
auto request = GetTimeOutRequest(client_timeout.hash);
if (request) {
- LOG(ERROR) << "Client Request Timeout " << client_timeout.hash;
replica_communicator_->BroadCast(*request);
}
}
diff --git a/scripts/deploy/config/kv_performance_server.conf
b/scripts/deploy/config/kv_performance_server.conf
index af36aef8..f29dd30e 100644
--- a/scripts/deploy/config/kv_performance_server.conf
+++ b/scripts/deploy/config/kv_performance_server.conf
@@ -1,8 +1,9 @@
iplist=(
-172.31.25.224
-172.31.20.228
-172.31.18.224
-172.31.16.230
-172.31.31.229
+172.31.41.205
+172.31.43.69
+172.31.41.203
+172.31.41.181
+172.31.42.42
)
+client_num=1
diff --git a/scripts/deploy/config/pbft.config
b/scripts/deploy/config/pbft.config
new file mode 100644
index 00000000..93e2ba29
--- /dev/null
+++ b/scripts/deploy/config/pbft.config
@@ -0,0 +1,10 @@
+{
+ "clientBatchNum": 100,
+ "enable_viewchange": true,
+ "recovery_enabled": true,
+ "max_client_complaint_num":10,
+ "max_process_txn": 2048,
+ "worker_num": 2,
+ "input_worker_num": 1,
+ "output_worker_num": 10
+}
diff --git a/scripts/deploy/performance/pbft_performance.sh
b/scripts/deploy/performance/pbft_performance.sh
index ff28bd49..45cee58f 100755
--- a/scripts/deploy/performance/pbft_performance.sh
+++ b/scripts/deploy/performance/pbft_performance.sh
@@ -18,4 +18,6 @@
#
export server=//benchmark/protocols/pbft:kv_server_performance
+#export TEMPLATE_PATH=$PWD/config/pbft.config
+
./performance/run_performance.sh $*
diff --git a/scripts/deploy/performance/run_performance.sh
b/scripts/deploy/performance/run_performance.sh
index 481d2e88..12e357c7 100755
--- a/scripts/deploy/performance/run_performance.sh
+++ b/scripts/deploy/performance/run_performance.sh
@@ -17,8 +17,8 @@
# under the License.
#
-./script/deploy.sh $1
+./script/deploy.sh $1
. ./script/load_config.sh $1
server_name=`echo "$server" | awk -F':' '{print $NF}'`
@@ -32,6 +32,7 @@ echo "benchmark done"
count=1
for ip in ${iplist[@]};
do
+ echo "server bin:"${server_bin}
`ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no ubuntu@${ip}
"killall -9 ${server_bin}"`
((count++))
done
@@ -41,12 +42,13 @@ while [ $count -gt 0 ]; do
count=`expr $count - 1`
done
-
+idx=1
echo "getting results"
for ip in ${iplist[@]};
do
echo "scp -i ${key} ubuntu@${ip}:/home/ubuntu/${server_bin}.log ./${ip}_log"
- `scp -i ${key} ubuntu@${ip}:/home/ubuntu/${server_bin}.log result_${ip}_log`
+ `scp -i ${key}
ubuntu@${ip}:/home/ubuntu/resilientdb_app/${idx}/${server_bin}.log
result_${ip}_log`
+ ((idx++))
done
python3 performance/calculate_result.py `ls result_*_log` > results.log
diff --git a/scripts/deploy/script/deploy.sh b/scripts/deploy/script/deploy.sh
index 7e03c85c..cc178c7a 100755
--- a/scripts/deploy/script/deploy.sh
+++ b/scripts/deploy/script/deploy.sh
@@ -98,6 +98,10 @@ function run_one_cmd(){
ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no ubuntu@${ip}
"$1"
}
+run_cmd "killall -9 ${server_bin}"
+#run_cmd "rm -rf ${server_bin}; rm ${server_bin}*.log; rm -rf server.config;
rm -rf cert;"
+run_cmd "rm -rf /home/ubuntu/${main_folder}"
+
idx=1
for ip in ${deploy_iplist[@]};
do
@@ -106,9 +110,9 @@ do
((idx++))
done
-
-run_cmd "killall -9 ${server_bin}"
-run_cmd "rm -rf ${server_bin}; rm ${server_bin}*.log; rm -rf server.config; rm
-rf cert;"
+#run_cmd "killall -9 ${server_bin}"
+#run_cmd "rm -rf ${server_bin}; rm ${server_bin}*.log; rm -rf server.config;
rm -rf cert;"
+#run_cmd "rm -rf ${main_folder};"
sleep 1
@@ -118,6 +122,7 @@ idx=1
count=0
for ip in ${deploy_iplist[@]};
do
+ echo "scp -i ${key} -r ${bin_path} ${output_path}/server.config
${output_path}/cert ubuntu@${ip}:/home/ubuntu/${main_folder}/$idx"
scp -i ${key} -r ${bin_path} ${output_path}/server.config
${output_path}/cert ubuntu@${ip}:/home/ubuntu/${main_folder}/$idx &
((count++))
((idx++))
diff --git a/scripts/deploy/script/generate_config.sh
b/scripts/deploy/script/generate_config.sh
index 5df2396f..aa3d77d7 100755
--- a/scripts/deploy/script/generate_config.sh
+++ b/scripts/deploy/script/generate_config.sh
@@ -78,5 +78,5 @@ do
idx=$(($idx+1))
done
-python3 ${CONFIG_TOOLS_BIN} ./server.config ./server.config.json
../config/template.config
+python3 ${CONFIG_TOOLS_BIN} ./server.config ./server.config.json
${TEMPLATE_PATH}
mv server.config.json server.config
