add change port

README.md

@@ -338,3 +338,20 @@ We also provide access to a [deployment script](https://github.com/resilientdb/r
    ```
 
    Verify the functionality of the service by performing set and get operations provided above [functions](README.md#functions).
+
+
+## Custom Port ##
+When starting the service locally, current services are running on 10000 port-base with 5 services where the server config is located [here](https://github.com/apache/incubator-resilientdb/blob/master/service/tools/config/server/server.config)
+
+If you want to change the setting,  you need to generate the certificates.
+
+Go the the workspace where the resilientdb repo is localted.
+
+Change the setting parameters here and run the script:
+  ./service/tools/kv/server_tools/generate_config.sh
+
+Then re-run the start script:
+  ./service/tools/kv/server_tools/start_kv_service.sh
+
+
+

scripts/deploy/script/generate_config.sh

@@ -21,6 +21,8 @@ key_path=$1; shift
 output_cert_path=$1; shift
 output_path=$1; shift
 admin_key_path=$1; shift
+client_num=$1; shift
+base_port=$1; shift
 
 iplist=$@
 
@@ -41,8 +43,9 @@ 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=1
+BASE_PORT=${base_port}
+CLIENT_NUM=${client_num}
+
 
 echo "" > client.config
 echo "" > server.config

service/tools/config/generate_config.sh

@@ -0,0 +1,92 @@
+#
+# 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
+base_port=$1; shift
+
+iplist=$@
+
+echo "generage certificates"
+
+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
+
+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=${base_port}
+CLIENT_NUM=${client_num}
+
+
+echo "" > client.config
+echo "" > server.config
+
+bazel build //tools:certificate_tools
+bazel build //tools:generate_region_config
+
+idx=1
+tot=0
+for _ in ${iplist[@]};
+do
+  tot=$(($tot+1))
+done
+
+echo $PWD
+echo "node num:"$tot
+echo "base port:"${BASE_PORT}
+echo "client num:" ${CLIENT_NUM}
+
+for ip in ${iplist[@]};
+do
+  port=$((${BASE_PORT}+${idx}))
+  public_key=${key_path}/node${idx}.key.pub 
+  echo "get ip:"${ip}
+
+  # create public key
+  # create server config
+  # create the public key and certificate
+  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
+  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
+  fi
+
+  idx=$(($idx+1))
+done
+
+python3 ${CONFIG_TOOLS_BIN} ./server.config ./server.config.json 
+mv server.config.json ${output_path}/server/server.config
+mv client.config ${output_path}/interface/service.config
+echo "config done:" ${output_path}/server/server.config
+

service/tools/config/interface/service.config

@@ -1,3 +1,2 @@
-5 127.0.0.1 10005
-
 
+5 127.0.0.1 20005

service/tools/config/server/server.config

@@ -1,36 +1,28 @@
 {
-  region : {
-    replica_info : {
-      id:1,
-      ip:"127.0.0.1",
-      port: 10001,
-    },
-    replica_info : {
-      id:2,
-      ip:"127.0.0.1",
-      port: 10002,
-    },
-    replica_info : {
-      id:3,
-      ip:"127.0.0.1",
-      port: 10003,
-    },
-    replica_info : {
-      id:4,
-      ip:"127.0.0.1",
-      port: 10004,
-    },
-    region_id: 1,
-  },
-  self_region_id:1,
-  leveldb_info : {
-    write_buffer_size_mb:128,
-    write_batch_size:1,
-  },
-  require_txn_validation:true,
-  enable_viewchange:false,
-  enable_resview:true,
-  enable_faulty_switch:false
-}
-
-
+  "region": [
+    {
+      "replicaInfo": [
+        {
+          "id": "1",
+          "ip": "127.0.0.1",
+          "port": 20001
+        },
+        {
+          "id": "2",
+          "ip": "127.0.0.1",
+          "port": 20002
+        },
+        {
+          "id": "3",
+          "ip": "127.0.0.1",
+          "port": 20003
+        },
+        {
+          "id": "4",
+          "ip": "127.0.0.1",
+          "port": 20004
+        }
+      ]
+    }
+  ]
+}

service/tools/data/cert/cert_2.cert

@@ -1,7 +1,7 @@
 
 $
- u>��,����Nb+R�m����.�dQ|;V;݅|
-6
+ u>��,����Nb+R�m����.�dQ|;V;݅}
+7
 $
- 󗑉���Ej�K'=��zp�@r����E�����"	127.0.0.1(�NB@,'�GJ�|�R;�'��m@�:�#9�ĝ�'[�J��Z}_��,��Iʟ9'n)
%�
-�n|G 
+ 󗑉���Ej�K'=��zp�@r����E�����"	127.0.0.1(��
B@Ol�
+Ɖ瀥5��&eJ
�X�B��O.kP��'y�ᆰy�:�k��I}m���=�.��5�$� 

service/tools/data/cert/cert_3.cert

@@ -1,7 +1,7 @@
 
 $
- u>��,����Nb+R�m����.�dQ|;V;݅|
-6
+ u>��,����Nb+R�m����.�dQ|;V;݅}
+7
 $
  |�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 
+��"	127.0.0.1(��
B@�X8!�$E�^ݶlR�l(I�.�ۛ]	I�D��J!LPT�3���"4��)�ЯŴ�#ޝ(��*	 

service/tools/data/cert/cert_4.cert

@@ -1,6 +1,6 @@
 
 $
- u>��,����Nb+R�m����.�dQ|;V;݅|
-6
+ u>��,����Nb+R�m����.�dQ|;V;݅}
+7
 $
- {aLx2٢�<�jQf+S�b��֐�±��2"	127.0.0.1(�NB@N�뀒�U�U����zi�W�}2Ub����X����1&�I��5�>=��y��{�֐6]g�w�� 
+ {aLx2٢�<�jQf+S�b��֐�±��2"	127.0.0.1(��
B@Y�)X��>�~l(}�Z������{���yqa���YX^���0$N'C"Tz��}��\-�� 

service/tools/data/cert/cert_5.cert

@@ -1,8 +1,7 @@
 
 $
- u>��,����Nb+R�m����.�dQ|;V;݅~
-8
+ u>��,����Nb+R�m����.�dQ|;V;݅
+9
 $
  �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� 
+1����hܘ�hT�]%%꡽ey��V
"	127.0.0.1(��
B@! VH`�	NTô0	��1�o�N9��PT�j�k��|���U�U���t��@&��n�}*�W� 

service/tools/kv/server_tools/generate_config.sh

@@ -0,0 +1,15 @@
+iplist=(
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+127.0.0.1
+)
+
+WORKSPACE=$PWD
+CERT_PATH=$PWD/service/tools/data/cert/
+CONFIG_PATH=$PWD/service/tools/config/
+PORT_BASE=20000
+CLIENT_NUM=1
+
+./service/tools/config/generate_config.sh ${WORKSPACE} ${CERT_PATH} ${CERT_PATH} ${CONFIG_PATH} ${CERT_PATH} ${CLIENT_NUM} ${PORT_BASE} ${iplist[@]}