Skip to content

Commit ab6dfd5

Browse files
committed
rm cert
1 parent c4fffcd commit ab6dfd5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+59
-109
lines changed

scripts/deploy/README.md

Lines changed: 1 addition & 1 deletion
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
iplist=(
2-
172.31.41.205
3-
172.31.43.69
4-
172.31.41.203
5-
172.31.41.181
6-
172.31.42.42
2+
172.31.25.4
3+
172.31.27.205
4+
172.31.27.141
5+
172.31.20.222
6+
172.31.28.162
77
)
88

99
client_num=1

scripts/deploy/config/kv_server.conf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
iplist=(
2-
172.31.57.186
3-
172.31.57.186
4-
172.31.57.186
5-
172.31.57.186
6-
172.31.57.186
2+
172.31.25.4
3+
172.31.27.205
4+
172.31.27.141
5+
172.31.20.222
6+
172.31.28.162
77
)
88

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
ë|q¸‰àõuw™q&‹07®!6f°áùa's˜»|ñ
2+
4B790BCC48862950DA85216F3F1335CB
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11

2-
u>��,����Nb+R�m����.�dQ|;V;݅ 
2+
4B790BCC48862950DA85216F3F1335CB

scripts/deploy/data/cert/cert_1.cert

-166 Bytes
Binary file not shown.

scripts/deploy/data/cert/cert_2.cert

Lines changed: 0 additions & 7 deletions
This file was deleted.

scripts/deploy/data/cert/cert_3.cert

Lines changed: 0 additions & 7 deletions
This file was deleted.

scripts/deploy/data/cert/cert_4.cert

Lines changed: 0 additions & 6 deletions
This file was deleted.

scripts/deploy/data/cert/cert_5.cert

Lines changed: 0 additions & 8 deletions
This file was deleted.

scripts/deploy/data/cert/cert_6.cert

-166 Bytes
Binary file not shown.

scripts/deploy/data/cert/cert_7.cert

Lines changed: 0 additions & 6 deletions
This file was deleted.

scripts/deploy/data/cert/cert_8.cert

-166 Bytes
Binary file not shown.

scripts/deploy/data/cert/cert_9.cert

Lines changed: 0 additions & 7 deletions
This file was deleted.

scripts/deploy/data/cert/node1.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node1.key.pub

Lines changed: 0 additions & 3 deletions
This file was deleted.

scripts/deploy/data/cert/node2.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node2.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.
-36 Bytes
Binary file not shown.

scripts/deploy/data/cert/node3.key.pub

Lines changed: 0 additions & 3 deletions
This file was deleted.
-36 Bytes
Binary file not shown.

scripts/deploy/data/cert/node4.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node5.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node5.key.pub

Lines changed: 0 additions & 3 deletions
This file was deleted.

scripts/deploy/data/cert/node6.key.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node6.key.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node6.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node6.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node7.key.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node7.key.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node7.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node7.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node8.key.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node8.key.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node8.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node8.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node9.key.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node9.key.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node9.key.pri

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/data/cert/node9.key.pub

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/deploy/performance/pbft_performance.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919

2020
export server=//benchmark/protocols/pbft:kv_server_performance
2121
#export TEMPLATE_PATH=$PWD/config/pbft.config
22+
export performance=true
2223

2324
./performance/run_performance.sh $*

scripts/deploy/script/deploy.sh

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ echo "deploy to :"${deploy_iplist[@]}
6565
cd ${script_path}
6666
echo "where am i:"$PWD
6767

68+
deploy/script/generate_admin_key.sh ${BAZEL_WORKSPACE_PATH} ${admin_key_path}
6869
deploy/script/generate_key.sh ${BAZEL_WORKSPACE_PATH} ${output_key_path} ${#iplist[@]}
6970
deploy/script/generate_config.sh ${BAZEL_WORKSPACE_PATH} ${output_key_path} ${output_cert_path} ${output_path} ${admin_key_path} ${deploy_iplist[@]}
7071

@@ -79,6 +80,7 @@ fi
7980

8081
# commands functions
8182
function run_cmd(){
83+
echo "run cmd:"$1
8284
count=1
8385
idx=1
8486
for ip in ${deploy_iplist[@]};
@@ -95,27 +97,36 @@ function run_cmd(){
9597
}
9698

9799
function run_one_cmd(){
100+
echo "run one:"$1
98101
ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no ubuntu@${ip} "$1"
99102
}
100103

101104
run_cmd "killall -9 ${server_bin}"
102-
#run_cmd "rm -rf ${server_bin}; rm ${server_bin}*.log; rm -rf server.config; rm -rf cert;"
105+
if [ $performance ];
106+
then
103107
run_cmd "rm -rf /home/ubuntu/${main_folder}"
108+
fi
104109

105110
idx=1
106111
for ip in ${deploy_iplist[@]};
107112
do
108-
run_one_cmd "mkdir -p ${main_folder}/$idx" &
113+
run_one_cmd "mkdir -p /home/ubuntu/${main_folder}/$idx" &
114+
folder="/home/ubuntu/${main_folder}/$idx"
115+
run_one_cmd "rm -rf ${folder}/${server_bin}; rm ${folder}/${server_bin}*.log; rm -rf ${folder}/server.config; rm -rf ${folder}/cert;"
109116
((count++))
110117
((idx++))
111118
done
112119

120+
while [ $count -gt 0 ]; do
121+
wait $pids
122+
count=`expr $count - 1`
123+
done
124+
125+
113126
#run_cmd "killall -9 ${server_bin}"
114127
#run_cmd "rm -rf ${server_bin}; rm ${server_bin}*.log; rm -rf server.config; rm -rf cert;"
115128
#run_cmd "rm -rf ${main_folder};"
116129

117-
sleep 1
118-
119130
# upload config files and binary
120131
echo "upload configs"
121132
idx=1
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
bazel_path=$1; shift
20+
output_path=$1; shift
21+
key_num=$1
22+
23+
echo "generate key in:"${output_path}
24+
echo "key num:"$key_num
25+
26+
bazel build //tools:key_generator_tools
27+
rm -rf ${output_path}
28+
mkdir -p ${output_path}
29+
30+
echo `${bazel_path}/bazel-bin/tools/key_generator_tools "${output_path}/admin" "AES"`

0 commit comments

Comments
 (0)