This is an automated email from the ASF dual-hosted git repository.
junchao pushed a commit to branch smart_contract_merge
in repository https://gitbox.apache.org/repos/asf/incubator-resilientdb.git
The following commit(s) were added to refs/heads/smart_contract_merge by this
push:
new 60e41162 merge master
60e41162 is described below
commit 60e4116233903c1dd219375e5262735823caf0e3
Author: cjcchen <[email protected]>
AuthorDate: Fri Feb 14 03:11:29 2025 +0800
merge master
---
scripts/deploy/README.md | 26 ++++++-
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/calculate_result.py | 29 ++------
.../deploy/performance/cassandra_performance.sh | 4 --
scripts/deploy/performance/fair_performance.sh | 4 --
scripts/deploy/performance/fairrl_performance.sh | 4 --
scripts/deploy/performance/hs_performance.sh | 4 --
scripts/deploy/performance/ooohs_performance.sh | 50 -------------
scripts/deploy/performance/pbft_performance.sh | 24 ++++++-
scripts/deploy/performance/poe_performance.sh | 21 +++++-
scripts/deploy/performance/rcc_performance.sh | 6 --
scripts/deploy/performance/run_performance.sh | 48 +++++++------
.../deploy/performance/simple_pbft_performance.sh | 6 --
scripts/deploy/performance/tusk_performance.sh | 5 --
scripts/deploy/performance/zzy_performance.sh | 6 --
scripts/deploy/script/deploy.sh | 78 ++++++++++++++++-----
scripts/deploy/script/env.sh | 21 +++++-
scripts/deploy/script/generate_admin_key.sh | 30 ++++++++
scripts/deploy/script/generate_config.sh | 39 ++++++-----
scripts/deploy/script/generate_key.sh | 19 ++++-
scripts/deploy/script/load_config.sh | 18 +++++
57 files changed, 263 insertions(+), 275 deletions(-)
diff --git a/scripts/deploy/README.md b/scripts/deploy/README.md
index 98a7aac5..7abab0e7 100644
--- a/scripts/deploy/README.md
+++ b/scripts/deploy/README.md
@@ -1,3 +1,22 @@
+<!--
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements. See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership. The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License. You may obtain a copy of the License at
+ -
+ - http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied. See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -->
+
This directory includes deployment scripts that help to deploy ResilientDB on
multiple machines. At present, these scripts only support deploying KV service
and KV Performance server.
# Usage
@@ -41,10 +60,11 @@ 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.
-Run Other protocol:
- POE: ./performance/run_performance.sh config/poe_performance_server.conf
+## Using non-ubuntu account ##
+The default path for the workspace to deploy the system is /home/ubuntu
+If you want to change the path, you can update ``script/env.sh``
diff --git a/scripts/deploy/data/cert/admin.key.pri
b/scripts/deploy/data/cert/admin.key.pri
deleted file mode 100644
index 7629a70a..00000000
--- a/scripts/deploy/data/cert/admin.key.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-
- �|q����uw�q&�07�!�6f���a's��|�
\ No newline at end of file
diff --git a/scripts/deploy/data/cert/admin.key.pub
b/scripts/deploy/data/cert/admin.key.pub
deleted file mode 100644
index 49248105..00000000
--- a/scripts/deploy/data/cert/admin.key.pub
+++ /dev/null
@@ -1,2 +0,0 @@
-
- u>��,����Nb+R�m����.�dQ|;V;݅
\ 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/calculate_result.py
b/scripts/deploy/performance/calculate_result.py
index e5187d06..f6892d26 100644
--- a/scripts/deploy/performance/calculate_result.py
+++ b/scripts/deploy/performance/calculate_result.py
@@ -17,7 +17,6 @@
import sys
-total = 0
def read_tps(file):
tps = []
lat = []
@@ -25,47 +24,36 @@ def read_tps(file):
for l in f.readlines():
s = l.split()
for r in s:
- try:
- if(r.split(':')[0] == 'txn'):
- tps.append(int(r.split(':')[1]))
- except:
- print("s:",s)
+ if(r.split(':')[0] == 'txn'):
+ tps.append(int(r.split(':')[1]))
if l.find("client latency") > 0:
- print("get lat:",s)
lat.append(float(s[-1].split(':')[-1]))
return tps, lat
-def cal_tps(tps, tot):
+def cal_tps(tps):
tps_sum = []
tps_max = 0
for v in tps:
if v == 0:
continue
- if v < 1000:
- continue
tps_max = max(tps_max, v)
tps_sum.append(v)
- tps_sum.sort()
- tps_sum = tps_sum[tot:-tot]
- print("tsp:",tps_sum)
print("max throughput:",tps_max)
print("average throughput:",sum(tps_sum)/len(tps_sum))
- return tps_max, sum(tps_sum)/len(tps_sum)
def cal_lat(lat):
lat_sum = []
lat_max = 0
for v in lat:
- if v <= 0:
+ if v == 0:
continue
lat_max = max(lat_max, v)
lat_sum.append(v)
print("max latency:",lat_max)
print("average latency:",sum(lat_sum)/len(lat_sum))
- return lat_max, sum(lat_sum)/len(lat_sum)
if __name__ == '__main__':
files = sys.argv[1:]
@@ -74,15 +62,10 @@ if __name__ == '__main__':
tps = []
lat = []
- total = len(files)
for f in files:
t, l=read_tps(f)
tps += t
lat += l
- max_tps, avg_tps = cal_tps(tps, len(files))
- max_lat, avg_lat = cal_lat(lat)
-
- print("max throughput:{} average throughput:{} "
- "max latency:{} average latency:{} "
- "replica num:{}".format(max_tps, avg_tps, max_lat, avg_lat, total))
+ cal_tps(tps)
+ cal_lat(lat)
diff --git a/scripts/deploy/performance/cassandra_performance.sh
b/scripts/deploy/performance/cassandra_performance.sh
deleted file mode 100755
index a461f6db..00000000
--- a/scripts/deploy/performance/cassandra_performance.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export server=//benchmark/protocols/cassandra:kv_server_performance
-export TEMPLATE_PATH=$PWD/config/cassandra.config
-
-./performance/run_performance.sh $*
diff --git a/scripts/deploy/performance/fair_performance.sh
b/scripts/deploy/performance/fair_performance.sh
deleted file mode 100755
index fb0535ef..00000000
--- a/scripts/deploy/performance/fair_performance.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export server=//benchmark/protocols/fairdag:kv_server_performance
-export TEMPLATE_PATH=$PWD/config/fair.config
-
-./performance/run_performance.sh $*
diff --git a/scripts/deploy/performance/fairrl_performance.sh
b/scripts/deploy/performance/fairrl_performance.sh
deleted file mode 100755
index 3d9da582..00000000
--- a/scripts/deploy/performance/fairrl_performance.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export server=//benchmark/protocols/fairdag_rl:kv_server_performance
-export TEMPLATE_PATH=$PWD/config/fairrl.config
-
-./performance/run_performance.sh $*
diff --git a/scripts/deploy/performance/hs_performance.sh
b/scripts/deploy/performance/hs_performance.sh
deleted file mode 100755
index 6862fdcb..00000000
--- a/scripts/deploy/performance/hs_performance.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export server=//benchmark/protocols/hs:kv_server_performance
-export TEMPLATE_PATH=$PWD/config/hs.config
-
-./performance/run_performance.sh $*
diff --git a/scripts/deploy/performance/ooohs_performance.sh
b/scripts/deploy/performance/ooohs_performance.sh
deleted file mode 100755
index a2f195b6..00000000
--- a/scripts/deploy/performance/ooohs_performance.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-export server=//benchmark/protocols/ooo_hs:kv_server_performance
-
-./script/deploy.sh $1
-
-. ./script/load_config.sh $1
-
-server_name=`echo "$server" | awk -F':' '{print $NF}'`
-server_bin=${server_name}
-
-
-bazel run //benchmark/protocols/pbft:kv_service_tools
-
-for((i=1;;i++))
-do
-config_file=$PWD/config_out/client${i}.config
-if [ ! -f "$config_file" ]; then
- break;
-fi
-echo "get cofigfile:"$config_file
-/home/ubuntu/nexres/bazel-bin/benchmark/protocols/pbft/kv_service_tools
$config_file
-done
-
-sleep 60
-
-echo "benchmark done"
-count=1
-for ip in ${iplist[@]};
-do
-`ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no ubuntu@${ip}
"killall -9 ${server_bin}"`
-((count++))
-done
-
-while [ $count -gt 0 ]; do
- wait $pids
- count=`expr $count - 1`
-done
-
-
-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`
-done
-
-python3 performance/calculate_result.py `ls result_*_log` > results.log
-
-rm -rf result_*_log
-echo "save result to results.log"
-cat results.log
diff --git a/scripts/deploy/performance/pbft_performance.sh
b/scripts/deploy/performance/pbft_performance.sh
index e1f6c20b..9796c8fc 100755
--- a/scripts/deploy/performance/pbft_performance.sh
+++ b/scripts/deploy/performance/pbft_performance.sh
@@ -1,6 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
export server=//benchmark/protocols/pbft:kv_server_performance
-export TEMPLATE_PATH=$PWD/config/pbft.config
-#export COPTS="--define enable_leveldb=True"
-#export COPTS="-pg"
+#export TEMPLATE_PATH=$PWD/config/pbft.config
+export performance=true
./performance/run_performance.sh $*
diff --git a/scripts/deploy/performance/poe_performance.sh
b/scripts/deploy/performance/poe_performance.sh
index 3fd67129..37942ca0 100755
--- a/scripts/deploy/performance/poe_performance.sh
+++ b/scripts/deploy/performance/poe_performance.sh
@@ -1,6 +1,23 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
export server=//benchmark/protocols/poe:kv_server_performance
export TEMPLATE_PATH=$PWD/config/poe.config
-#export COPTS="--define enable_leveldb=True"
-#export COPTS="-pg"
./performance/run_performance.sh $*
diff --git a/scripts/deploy/performance/rcc_performance.sh
b/scripts/deploy/performance/rcc_performance.sh
deleted file mode 100755
index 0602a8ef..00000000
--- a/scripts/deploy/performance/rcc_performance.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-export server=//benchmark/protocols/rcc:kv_server_performance
-export TEMPLATE_PATH=$PWD/config/rcc.config
-#export COPTS="--define enable_leveldb=True"
-#export COPTS="-pg"
-
-./performance/run_performance.sh $*
diff --git a/scripts/deploy/performance/run_performance.sh
b/scripts/deploy/performance/run_performance.sh
index c5fe1746..7ef2b8a7 100755
--- a/scripts/deploy/performance/run_performance.sh
+++ b/scripts/deploy/performance/run_performance.sh
@@ -1,25 +1,31 @@
-#export COPTS="--define enable_leveldb=True"
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
-. ./script/env.sh
./script/deploy.sh $1
-
. ./script/load_config.sh $1
+. ./script/env.sh
server_name=`echo "$server" | awk -F':' '{print $NF}'`
server_bin=${server_name}
-bazel run //benchmark/protocols/pbft:kv_service_tools
-
-for((i=1;;i++))
-do
-config_file=$PWD/config_out/client${i}.config
-if [ ! -f "$config_file" ]; then
- break;
-fi
-echo "get cofigfile:"$config_file
-${BAZEL_WORKSPACE_PATH}/bazel-bin/benchmark/protocols/pbft/kv_service_tools
$config_file
-done
+bazel run //benchmark/protocols/pbft:kv_service_tools --
$PWD/config_out/client.config
sleep 60
@@ -27,8 +33,8 @@ echo "benchmark done"
count=1
for ip in ${iplist[@]};
do
-echo "$ip"
-`ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no ubuntu@${ip}
"killall -9 ${server_bin}"`
+ echo "server bin:"${server_bin}
+`ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no ${user}@${ip}
"killall -9 ${server_bin}"`
((count++))
done
@@ -37,19 +43,17 @@ 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`
&
+ echo "scp -i ${key} ${user}@${ip}:${home_path}/${server_bin}.log ./${ip}_log"
+ `scp -i ${key}
${user}@${ip}:${home_path}/resilientdb_app/${idx}/${server_bin}.log
result_${ip}_log`
+ ((idx++))
done
-wait
-
python3 performance/calculate_result.py `ls result_*_log` > results.log
rm -rf result_*_log
echo "save result to results.log"
cat results.log
-echo $TEMPLATE_PATH
-cat $TEMPLATE_PATH
diff --git a/scripts/deploy/performance/simple_pbft_performance.sh
b/scripts/deploy/performance/simple_pbft_performance.sh
deleted file mode 100755
index 6766ef3d..00000000
--- a/scripts/deploy/performance/simple_pbft_performance.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-export server=//benchmark/protocols/simple_pbft:kv_server_performance
-export TEMPLATE_PATH=$PWD/config/pbft.config
-#export COPTS="--define enable_leveldb=True"
-#export COPTS="-pg"
-
-./performance/run_performance.sh $*
diff --git a/scripts/deploy/performance/tusk_performance.sh
b/scripts/deploy/performance/tusk_performance.sh
deleted file mode 100755
index 71b602e8..00000000
--- a/scripts/deploy/performance/tusk_performance.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-export server=//benchmark/protocols/tusk:kv_server_performance
-export TEMPLATE_PATH=$PWD/config/tusk.config
-
-./performance/run_performance.sh $*
-
diff --git a/scripts/deploy/performance/zzy_performance.sh
b/scripts/deploy/performance/zzy_performance.sh
deleted file mode 100755
index 73cf24ee..00000000
--- a/scripts/deploy/performance/zzy_performance.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-export server=//benchmark/protocols/zzy:kv_server_performance
-export TEMPLATE_PATH=$PWD/config/zzy.config
-#export COPTS="--define enable_leveldb=True"
-#export COPTS="-pg"
-
-./performance/run_performance.sh $*
diff --git a/scripts/deploy/script/deploy.sh b/scripts/deploy/script/deploy.sh
index 3a80447a..8bae565b 100755
--- a/scripts/deploy/script/deploy.sh
+++ b/scripts/deploy/script/deploy.sh
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
set -e
# load environment parameters
@@ -13,17 +32,13 @@ then
server=//service/kv:kv_service
fi
-if [[ -z $client_num ]];
-then
-client_num=1
-fi
-
# obtain the src path
+main_folder=resilientdb_app
server_path=`echo "$server" | sed 's/:/\//g'`
server_path=${server_path:1}
server_name=`echo "$server" | awk -F':' '{print $NF}'`
server_bin=${server_name}
-#grafna_port=8090
+grafna_port=8090
bin_path=${BAZEL_WORKSPACE_PATH}/bazel-bin/${server_path}
output_path=${script_path}/deploy/config_out
@@ -44,18 +59,18 @@ echo "server name:"${server_bin}
echo "admin config path:"${admin_key_path}
echo "output path:"${output_path}
echo "deploy to :"${deploy_iplist[@]}
-echo "client num :"${client_num}
# generate keys and certificates.
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} ${client_num}
${deploy_iplist[@]}
+deploy/script/generate_config.sh ${BAZEL_WORKSPACE_PATH} ${output_key_path}
${output_cert_path} ${output_path} ${admin_key_path} ${deploy_iplist[@]}
# build kv server
-bazel build ${server}
+bazel build ${server}
if [ $? != 0 ]
then
@@ -65,11 +80,14 @@ fi
# commands functions
function run_cmd(){
+ echo "run cmd:"$1
count=1
+ idx=1
for ip in ${deploy_iplist[@]};
do
- ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no
ubuntu@${ip} "$1" &
+ ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no
${user}@${ip} "cd ${main_folder}/$idx; $1" &
((count++))
+ ((idx++))
done
while [ $count -gt 0 ]; do
@@ -79,23 +97,46 @@ function run_cmd(){
}
function run_one_cmd(){
- ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no ubuntu@${ip}
"$1"
+ echo "run one:"$1
+ ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no ${user}@${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; rm -rf wal_log"
-#run_cmd "rm -rf ${server_bin}; rm -rf server.config;"
+if [ $performance ];
+then
+run_cmd "rm -rf ${home_path}/${main_folder}"
+fi
-sleep 1
+idx=1
+for ip in ${deploy_iplist[@]};
+do
+ run_one_cmd "mkdir -p ${home_path}/${main_folder}/$idx" &
+ folder="${home_path}/${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};"
# upload config files and binary
echo "upload configs"
+idx=1
count=0
for ip in ${deploy_iplist[@]};
do
- scp -i ${key} -r ${bin_path} ${output_path}/server.config
${output_path}/cert ubuntu@${ip}:/home/ubuntu/ > null 2>&1 &
- #scp -i ${key} -r ${bin_path} ${output_path}/server.config
ubuntu@${ip}:/home/ubuntu/ > null 2>&1 &
+ echo "scp -i ${key} -r ${bin_path} ${output_path}/server.config
${output_path}/cert ${user}@${ip}:${home_path}/${main_folder}/$idx"
+ scp -i ${key} -r ${bin_path} ${output_path}/server.config
${output_path}/cert ${user}@${ip}:${home_path}/${main_folder}/$idx &
((count++))
+ ((idx++))
done
while [ $count -gt 0 ]; do
@@ -111,9 +152,10 @@ for ip in ${deploy_iplist[@]};
do
private_key="cert/node_"${idx}".key.pri"
cert="cert/cert_"${idx}".cert"
- run_one_cmd "nohup ./${server_bin} server.config ${private_key} ${cert} >
${server_bin}.log 2>&1 &" &
+ run_one_cmd "cd ${main_folder}/$idx; nohup ./${server_bin} server.config
${private_key} ${cert} ${grafna_port} > ${server_bin}.log 2>&1 &" &
((count++))
((idx++))
+ ((grafna_port++))
done
while [ $count -gt 0 ]; do
@@ -128,7 +170,7 @@ do
resp=""
while [ "$resp" = "" ]
do
- resp=`ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no
ubuntu@${ip} "grep \"receive public size:${#iplist[@]}\" ${server_bin}.log"`
+ resp=`ssh -i ${key} -n -o BatchMode=yes -o StrictHostKeyChecking=no
${user}@${ip} "cd ${main_folder}/$idx; grep \"receive public
size:${#iplist[@]}\" ${server_bin}.log"`
if [ "$resp" = "" ]; then
sleep 1
fi
diff --git a/scripts/deploy/script/env.sh b/scripts/deploy/script/env.sh
index 8b03b76b..1eb613d3 100755
--- a/scripts/deploy/script/env.sh
+++ b/scripts/deploy/script/env.sh
@@ -1,7 +1,26 @@
-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
set +e
CURRENT_PATH=$PWD
+user=ubuntu
+home_path=/home/ubuntu
i=0
while [ ! -f "WORKSPACE" ]
diff --git a/scripts/deploy/script/generate_admin_key.sh
b/scripts/deploy/script/generate_admin_key.sh
new file mode 100755
index 00000000..d68a7793
--- /dev/null
+++ b/scripts/deploy/script/generate_admin_key.sh
@@ -0,0 +1,30 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+bazel_path=$1; shift
+output_path=$1; shift
+key_num=$1
+
+echo "generate key in:"${output_path}
+echo "key num:"$key_num
+
+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"`
diff --git a/scripts/deploy/script/generate_config.sh
b/scripts/deploy/script/generate_config.sh
index c3b35788..aa3d77d7 100755
--- a/scripts/deploy/script/generate_config.sh
+++ b/scripts/deploy/script/generate_config.sh
@@ -1,9 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
base_path=$1; shift
key_path=$1; shift
output_cert_path=$1; shift
output_path=$1; shift
admin_key_path=$1; shift
-client_num=$1; shift
+
iplist=$@
echo "generage certificates"
@@ -12,30 +30,19 @@ echo "base path:"$base_path
echo "key path:"$key_path
echo "output cert path:"$output_cert_path
echo "output path:"$output_path
-echo "admin_key_path?:"$admin_key_path
-echo "tempalte path:",${TEMPLATE_PATH}
-
-if [ "${TEMPLATE_PATH}" = "" ]
-then
- TEMPLATE_PATH="../config/template.config"
-fi
-
-echo "tempalte path:",${TEMPLATE_PATH}
+echo "admin_key_path:"$admin_key_path
cd ${output_path}
ADMIN_PRIVATE_KEY=${admin_key_path}/admin.key.pri
ADMIN_PUBLIC_KEY=${admin_key_path}/admin.key.pub
-
-
-
CERT_TOOLS_BIN=${base_path}/bazel-bin/tools/certificate_tools
CONFIG_TOOLS_BIN=${base_path}/bazel-bin/tools/generate_region_config
USERNAME=ubuntu
BASE_PORT=17000
-CLIENT_NUM=${client_num}
+CLIENT_NUM=1
echo "" > client.config
echo "" > server.config
@@ -51,7 +58,7 @@ do
done
echo "node num:"$tot
-client_idx=1
+
for ip in ${iplist[@]};
do
port=$((${BASE_PORT}+${idx}))
@@ -63,8 +70,6 @@ do
if [ $(($idx+$CLIENT_NUM)) -gt $tot ] ; then
$CERT_TOOLS_BIN ${output_cert_path} ${ADMIN_PRIVATE_KEY}
${ADMIN_PUBLIC_KEY} ${public_key} ${idx} ${ip} ${port} client
echo "${idx} ${ip} ${port}" >> client.config
- echo "${idx} ${ip} ${port}" >> client${client_idx}.config
- client_idx=$((client_idx+1))
else
$CERT_TOOLS_BIN ${output_cert_path} ${ADMIN_PRIVATE_KEY}
${ADMIN_PUBLIC_KEY} ${public_key} ${idx} ${ip} ${port} replica
echo "${idx} ${ip} ${port}" >> server.config
diff --git a/scripts/deploy/script/generate_key.sh
b/scripts/deploy/script/generate_key.sh
index 4d5b08dd..ece3e3d1 100755
--- a/scripts/deploy/script/generate_key.sh
+++ b/scripts/deploy/script/generate_key.sh
@@ -1,4 +1,21 @@
-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
bazel_path=$1; shift
output_path=$1; shift
key_num=$1
diff --git a/scripts/deploy/script/load_config.sh
b/scripts/deploy/script/load_config.sh
index 85abfddd..97b2d0ac 100755
--- a/scripts/deploy/script/load_config.sh
+++ b/scripts/deploy/script/load_config.sh
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
KEY_FILE="config/key.conf"
. $1