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 ab6dfd55 rm cert
ab6dfd55 is described below
commit ab6dfd557bb74f461f37f0f47f06a362c2a1e9b7
Author: cjcchen <[email protected]>
AuthorDate: Mon Oct 7 16:37:49 2024 +0000
rm cert
---
scripts/deploy/README.md | 2 +-
scripts/deploy/config/kv_performance_server.conf | 10 +++++-----
scripts/deploy/config/kv_server.conf | 10 +++++-----
scripts/deploy/data/cert/admin.key.pri | 2 +-
scripts/deploy/data/cert/admin.key.pub | 2 +-
scripts/deploy/data/cert/cert_1.cert | Bin 166 -> 0 bytes
scripts/deploy/data/cert/cert_2.cert | 7 -------
scripts/deploy/data/cert/cert_3.cert | 7 -------
scripts/deploy/data/cert/cert_4.cert | 6 ------
scripts/deploy/data/cert/cert_5.cert | 8 --------
scripts/deploy/data/cert/cert_6.cert | Bin 166 -> 0 bytes
scripts/deploy/data/cert/cert_7.cert | 6 ------
scripts/deploy/data/cert/cert_8.cert | Bin 166 -> 0 bytes
scripts/deploy/data/cert/cert_9.cert | 7 -------
scripts/deploy/data/cert/node1.key.pri | 2 --
scripts/deploy/data/cert/node1.key.pub | 3 ---
scripts/deploy/data/cert/node2.key.pri | 2 --
scripts/deploy/data/cert/node2.key.pub | 2 --
scripts/deploy/data/cert/node3.key.pri | Bin 36 -> 0 bytes
scripts/deploy/data/cert/node3.key.pub | 3 ---
scripts/deploy/data/cert/node4.key.pri | Bin 36 -> 0 bytes
scripts/deploy/data/cert/node4.key.pub | 2 --
scripts/deploy/data/cert/node5.key.pri | 2 --
scripts/deploy/data/cert/node5.key.pub | 3 ---
scripts/deploy/data/cert/node6.key.key.pri | 2 --
scripts/deploy/data/cert/node6.key.key.pub | 2 --
scripts/deploy/data/cert/node6.key.pri | 2 --
scripts/deploy/data/cert/node6.key.pub | 2 --
scripts/deploy/data/cert/node7.key.key.pri | 2 --
scripts/deploy/data/cert/node7.key.key.pub | 2 --
scripts/deploy/data/cert/node7.key.pri | 2 --
scripts/deploy/data/cert/node7.key.pub | 2 --
scripts/deploy/data/cert/node8.key.key.pri | 2 --
scripts/deploy/data/cert/node8.key.key.pub | 2 --
scripts/deploy/data/cert/node8.key.pri | 2 --
scripts/deploy/data/cert/node8.key.pub | 2 --
scripts/deploy/data/cert/node9.key.key.pri | 2 --
scripts/deploy/data/cert/node9.key.key.pub | 2 --
scripts/deploy/data/cert/node9.key.pri | 2 --
scripts/deploy/data/cert/node9.key.pub | 2 --
scripts/deploy/performance/pbft_performance.sh | 1 +
scripts/deploy/script/deploy.sh | 19 +++++++++++++++----
.../generate_admin_key.sh} | 13 ++++++++++---
43 files changed, 39 insertions(+), 112 deletions(-)
diff --git a/scripts/deploy/README.md b/scripts/deploy/README.md
index ee41cae3..97b25b31 100644
--- a/scripts/deploy/README.md
+++ b/scripts/deploy/README.md
@@ -60,6 +60,6 @@ Before running, place the private IP addresses of your
machines in the file ``co
Run the script:
- ./performance/run_performance.sh config/kv_performance_server.conf
+ ./performance/pbft_performance.sh config/kv_performance_server.conf
Results will be saved locally and be shown on the screen as well.
diff --git a/scripts/deploy/config/kv_performance_server.conf
b/scripts/deploy/config/kv_performance_server.conf
index f29dd30e..1fa02d13 100644
--- a/scripts/deploy/config/kv_performance_server.conf
+++ b/scripts/deploy/config/kv_performance_server.conf
@@ -1,9 +1,9 @@
iplist=(
-172.31.41.205
-172.31.43.69
-172.31.41.203
-172.31.41.181
-172.31.42.42
+172.31.25.4
+172.31.27.205
+172.31.27.141
+172.31.20.222
+172.31.28.162
)
client_num=1
diff --git a/scripts/deploy/config/kv_server.conf
b/scripts/deploy/config/kv_server.conf
index 500e34d6..833852f4 100644
--- a/scripts/deploy/config/kv_server.conf
+++ b/scripts/deploy/config/kv_server.conf
@@ -1,8 +1,8 @@
iplist=(
-172.31.57.186
-172.31.57.186
-172.31.57.186
-172.31.57.186
-172.31.57.186
+172.31.25.4
+172.31.27.205
+172.31.27.141
+172.31.20.222
+172.31.28.162
)
diff --git a/scripts/deploy/data/cert/admin.key.pri
b/scripts/deploy/data/cert/admin.key.pri
index 7629a70a..6933b7c4 100644
--- a/scripts/deploy/data/cert/admin.key.pri
+++ b/scripts/deploy/data/cert/admin.key.pri
@@ -1,2 +1,2 @@
- �|q����uw�q&�07�!�6f���a's��|�
\ No newline at end of file
+ 4B790BCC48862950DA85216F3F1335CB
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/admin.key.pub
b/scripts/deploy/data/cert/admin.key.pub
index 49248105..6933b7c4 100644
--- a/scripts/deploy/data/cert/admin.key.pub
+++ b/scripts/deploy/data/cert/admin.key.pub
@@ -1,2 +1,2 @@
- u>��,����Nb+R�m����.�dQ|;V;݅
\ No newline at end of file
+ 4B790BCC48862950DA85216F3F1335CB
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/cert_1.cert
b/scripts/deploy/data/cert/cert_1.cert
deleted file mode 100644
index cb2ffd01..00000000
Binary files a/scripts/deploy/data/cert/cert_1.cert and /dev/null differ
diff --git a/scripts/deploy/data/cert/cert_2.cert
b/scripts/deploy/data/cert/cert_2.cert
deleted file mode 100644
index 81b87435..00000000
--- a/scripts/deploy/data/cert/cert_2.cert
+++ /dev/null
@@ -1,7 +0,0 @@
-
-$
- u>��,����Nb+R�m����.�dQ|;V;݅ |
-6
-$
- ���Ej�K' =��zp�@r����E�����"
127.0.0.1(�NB@,'�GJ�|�R;�'��m@�:�#9�ĝ�'[� J��Z}_��,��Iʟ9'n)%�
-�n|G
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/cert_3.cert
b/scripts/deploy/data/cert/cert_3.cert
deleted file mode 100644
index f7f81121..00000000
--- a/scripts/deploy/data/cert/cert_3.cert
+++ /dev/null
@@ -1,7 +0,0 @@
-
-$
- u>��,����Nb+R�m����.�dQ|;V;݅ |
-6
-$
- |�a9� # ��Y��<g�6_��"g!M���
-��" 127.0.0.1(�NB@;�/��U����r1ޡ��Tf� x�Xy�Kl�V�xf��A�
��Y���N�18��-iO�N
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/cert_4.cert
b/scripts/deploy/data/cert/cert_4.cert
deleted file mode 100644
index cef16d63..00000000
--- a/scripts/deploy/data/cert/cert_4.cert
+++ /dev/null
@@ -1,6 +0,0 @@
-
-$
- u>��,����Nb+R�m����.�dQ|;V;݅ |
-6
-$
- { aLx2٢�<�jQf+S�b ���±��2"
127.0.0.1(�NB@N�뀒�U�U����zi�W�}2Ub����X� ���1&�I��5�>=��y��{�6]g�w��
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/cert_5.cert
b/scripts/deploy/data/cert/cert_5.cert
deleted file mode 100644
index b04bf7a9..00000000
--- a/scripts/deploy/data/cert/cert_5.cert
+++ /dev/null
@@ -1,8 +0,0 @@
-
-$
- u>��,����Nb+R�m����.�dQ|;V;݅ ~
-8
-$
- �H��Y
-1����hܘ�hT�]%% ey��V" 127.0.0.1(�NB@P���$4�����L
v�t��`�#�+g��X�7i
-��L]൮! ���]k!d{q�����P�
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/cert_6.cert
b/scripts/deploy/data/cert/cert_6.cert
deleted file mode 100644
index 92e27c88..00000000
Binary files a/scripts/deploy/data/cert/cert_6.cert and /dev/null differ
diff --git a/scripts/deploy/data/cert/cert_7.cert
b/scripts/deploy/data/cert/cert_7.cert
deleted file mode 100644
index 982a0b91..00000000
--- a/scripts/deploy/data/cert/cert_7.cert
+++ /dev/null
@@ -1,6 +0,0 @@
-
-$
- u>��,����Nb+R�m����.�dQ|;V;݅ |
-6
-$
- 374850F7F3BBE65DF6483A6D4D90AFAE"
127.0.0.1(�NB@\~�������n�Mm;$�i�U�B����K�Ew��c�ڃ;���G�#ӞݽQ眮���z�f6
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/cert_8.cert
b/scripts/deploy/data/cert/cert_8.cert
deleted file mode 100644
index e392ad44..00000000
Binary files a/scripts/deploy/data/cert/cert_8.cert and /dev/null differ
diff --git a/scripts/deploy/data/cert/cert_9.cert
b/scripts/deploy/data/cert/cert_9.cert
deleted file mode 100644
index feb0ef7e..00000000
--- a/scripts/deploy/data/cert/cert_9.cert
+++ /dev/null
@@ -1,7 +0,0 @@
-
-$
- u>��,����Nb+R�m����.�dQ|;V;݅ |
-6
-$
- 194BE86D2924FE3D367F164293D9EBC7 "
127.0.0.1(�NB@ �j����T���q`�z=G���_ �F.�ܒl"t��.L�t��Tj��/q�@; �"
-PJx��
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node1.key.pri
b/scripts/deploy/data/cert/node1.key.pri
deleted file mode 100644
index f6306d80..00000000
--- a/scripts/deploy/data/cert/node1.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- �%�A^f�K@���W7��c�����|K����%
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node1.key.pub
b/scripts/deploy/data/cert/node1.key.pub
deleted file mode 100644
index 583c105c..00000000
--- a/scripts/deploy/data/cert/node1.key.pub
+++ /dev/null
@@ -1,3 +0,0 @@
-
- A/��{�?"XU,����lErI
-#���A
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node2.key.pri
b/scripts/deploy/data/cert/node2.key.pri
deleted file mode 100644
index b5e05751..00000000
--- a/scripts/deploy/data/cert/node2.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- @<i��A���,p� �+��������Ԝ�q
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node2.key.pub
b/scripts/deploy/data/cert/node2.key.pub
deleted file mode 100644
index efc69d1e..00000000
--- a/scripts/deploy/data/cert/node2.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- ���Ej�K' =��zp�@r����E�����
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node3.key.pri
b/scripts/deploy/data/cert/node3.key.pri
deleted file mode 100644
index 22093e65..00000000
Binary files a/scripts/deploy/data/cert/node3.key.pri and /dev/null differ
diff --git a/scripts/deploy/data/cert/node3.key.pub
b/scripts/deploy/data/cert/node3.key.pub
deleted file mode 100644
index 1ea46470..00000000
--- a/scripts/deploy/data/cert/node3.key.pub
+++ /dev/null
@@ -1,3 +0,0 @@
-
- |�a9� # ��Y��<g�6_��"g!M���
-��
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node4.key.pri
b/scripts/deploy/data/cert/node4.key.pri
deleted file mode 100644
index 7e077cc1..00000000
Binary files a/scripts/deploy/data/cert/node4.key.pri and /dev/null differ
diff --git a/scripts/deploy/data/cert/node4.key.pub
b/scripts/deploy/data/cert/node4.key.pub
deleted file mode 100644
index 25f8b40f..00000000
--- a/scripts/deploy/data/cert/node4.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- { aLx2٢�<�jQf+S�b ���±��2
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node5.key.pri
b/scripts/deploy/data/cert/node5.key.pri
deleted file mode 100644
index 3479cd55..00000000
--- a/scripts/deploy/data/cert/node5.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- �b%z��� z��?�t�Q�}�4!c� �o �Z$:
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node5.key.pub
b/scripts/deploy/data/cert/node5.key.pub
deleted file mode 100644
index 064ec387..00000000
--- a/scripts/deploy/data/cert/node5.key.pub
+++ /dev/null
@@ -1,3 +0,0 @@
-
- �H��Y
-1����hܘ�hT�]%% ey��V
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node6.key.key.pri
b/scripts/deploy/data/cert/node6.key.key.pri
deleted file mode 100644
index c01f86d2..00000000
--- a/scripts/deploy/data/cert/node6.key.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 41D949119957B2CF7C35DA92787ECC2B
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node6.key.key.pub
b/scripts/deploy/data/cert/node6.key.key.pub
deleted file mode 100644
index c01f86d2..00000000
--- a/scripts/deploy/data/cert/node6.key.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 41D949119957B2CF7C35DA92787ECC2B
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node6.key.pri
b/scripts/deploy/data/cert/node6.key.pri
deleted file mode 100644
index d7ad5f9b..00000000
--- a/scripts/deploy/data/cert/node6.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 194BE86D2924FE3D367F164293D9EBC7
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node6.key.pub
b/scripts/deploy/data/cert/node6.key.pub
deleted file mode 100644
index d7ad5f9b..00000000
--- a/scripts/deploy/data/cert/node6.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 194BE86D2924FE3D367F164293D9EBC7
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node7.key.key.pri
b/scripts/deploy/data/cert/node7.key.key.pri
deleted file mode 100644
index ab99e615..00000000
--- a/scripts/deploy/data/cert/node7.key.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 7C5F902EFA14C0CCC7422BA995D9D84E
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node7.key.key.pub
b/scripts/deploy/data/cert/node7.key.key.pub
deleted file mode 100644
index ab99e615..00000000
--- a/scripts/deploy/data/cert/node7.key.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 7C5F902EFA14C0CCC7422BA995D9D84E
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node7.key.pri
b/scripts/deploy/data/cert/node7.key.pri
deleted file mode 100644
index 7461843d..00000000
--- a/scripts/deploy/data/cert/node7.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 374850F7F3BBE65DF6483A6D4D90AFAE
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node7.key.pub
b/scripts/deploy/data/cert/node7.key.pub
deleted file mode 100644
index 7461843d..00000000
--- a/scripts/deploy/data/cert/node7.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 374850F7F3BBE65DF6483A6D4D90AFAE
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node8.key.key.pri
b/scripts/deploy/data/cert/node8.key.key.pri
deleted file mode 100644
index 78be6b41..00000000
--- a/scripts/deploy/data/cert/node8.key.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 981F2A9FA7490D3596ACEC8AD5802D56
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node8.key.key.pub
b/scripts/deploy/data/cert/node8.key.key.pub
deleted file mode 100644
index 78be6b41..00000000
--- a/scripts/deploy/data/cert/node8.key.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 981F2A9FA7490D3596ACEC8AD5802D56
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node8.key.pri
b/scripts/deploy/data/cert/node8.key.pri
deleted file mode 100644
index 8f69c1cc..00000000
--- a/scripts/deploy/data/cert/node8.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 25D8166ED7CBE09BF490845B841D6F9E
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node8.key.pub
b/scripts/deploy/data/cert/node8.key.pub
deleted file mode 100644
index 8f69c1cc..00000000
--- a/scripts/deploy/data/cert/node8.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- 25D8166ED7CBE09BF490845B841D6F9E
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node9.key.key.pri
b/scripts/deploy/data/cert/node9.key.key.pri
deleted file mode 100644
index e1041838..00000000
--- a/scripts/deploy/data/cert/node9.key.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- B2AADAD9ADFBA8F268FDE6C6B20A8DAC
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node9.key.key.pub
b/scripts/deploy/data/cert/node9.key.key.pub
deleted file mode 100644
index e1041838..00000000
--- a/scripts/deploy/data/cert/node9.key.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- B2AADAD9ADFBA8F268FDE6C6B20A8DAC
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node9.key.pri
b/scripts/deploy/data/cert/node9.key.pri
deleted file mode 100644
index a1b0a569..00000000
--- a/scripts/deploy/data/cert/node9.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- C23AA07E78211944EBE10F54ECF2C850
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/node9.key.pub
b/scripts/deploy/data/cert/node9.key.pub
deleted file mode 100644
index a1b0a569..00000000
--- a/scripts/deploy/data/cert/node9.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- C23AA07E78211944EBE10F54ECF2C850
\ No newline at end of file
diff --git a/scripts/deploy/performance/pbft_performance.sh
b/scripts/deploy/performance/pbft_performance.sh
index 45cee58f..9796c8fc 100755
--- a/scripts/deploy/performance/pbft_performance.sh
+++ b/scripts/deploy/performance/pbft_performance.sh
@@ -19,5 +19,6 @@
export server=//benchmark/protocols/pbft:kv_server_performance
#export TEMPLATE_PATH=$PWD/config/pbft.config
+export performance=true
./performance/run_performance.sh $*
diff --git a/scripts/deploy/script/deploy.sh b/scripts/deploy/script/deploy.sh
index cc178c7a..2ad3cefa 100755
--- a/scripts/deploy/script/deploy.sh
+++ b/scripts/deploy/script/deploy.sh
@@ -65,6 +65,7 @@ echo "deploy to :"${deploy_iplist[@]}
cd ${script_path}
echo "where am i:"$PWD
+deploy/script/generate_admin_key.sh ${BAZEL_WORKSPACE_PATH} ${admin_key_path}
deploy/script/generate_key.sh ${BAZEL_WORKSPACE_PATH} ${output_key_path}
${#iplist[@]}
deploy/script/generate_config.sh ${BAZEL_WORKSPACE_PATH} ${output_key_path}
${output_cert_path} ${output_path} ${admin_key_path} ${deploy_iplist[@]}
@@ -79,6 +80,7 @@ fi
# commands functions
function run_cmd(){
+ echo "run cmd:"$1
count=1
idx=1
for ip in ${deploy_iplist[@]};
@@ -95,27 +97,36 @@ function run_cmd(){
}
function run_one_cmd(){
+ echo "run one:"$1
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;"
+if [ $performance ];
+then
run_cmd "rm -rf /home/ubuntu/${main_folder}"
+fi
idx=1
for ip in ${deploy_iplist[@]};
do
- run_one_cmd "mkdir -p ${main_folder}/$idx" &
+ run_one_cmd "mkdir -p /home/ubuntu/${main_folder}/$idx" &
+ folder="/home/ubuntu/${main_folder}/$idx"
+ run_one_cmd "rm -rf ${folder}/${server_bin}; rm
${folder}/${server_bin}*.log; rm -rf ${folder}/server.config; rm -rf
${folder}/cert;"
((count++))
((idx++))
done
+while [ $count -gt 0 ]; do
+ wait $pids
+ count=`expr $count - 1`
+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 "rm -rf ${main_folder};"
-sleep 1
-
# upload config files and binary
echo "upload configs"
idx=1
diff --git a/scripts/deploy/performance/pbft_performance.sh
b/scripts/deploy/script/generate_admin_key.sh
similarity index 73%
copy from scripts/deploy/performance/pbft_performance.sh
copy to scripts/deploy/script/generate_admin_key.sh
index 45cee58f..d68a7793 100755
--- a/scripts/deploy/performance/pbft_performance.sh
+++ b/scripts/deploy/script/generate_admin_key.sh
@@ -16,8 +16,15 @@
# specific language governing permissions and limitations
# under the License.
#
+bazel_path=$1; shift
+output_path=$1; shift
+key_num=$1
-export server=//benchmark/protocols/pbft:kv_server_performance
-#export TEMPLATE_PATH=$PWD/config/pbft.config
+echo "generate key in:"${output_path}
+echo "key num:"$key_num
-./performance/run_performance.sh $*
+bazel build //tools:key_generator_tools
+rm -rf ${output_path}
+mkdir -p ${output_path}
+
+echo `${bazel_path}/bazel-bin/tools/key_generator_tools "${output_path}/admin"
"AES"`
