[dingo-docker] update configuration and script about dingo

Author: astor194

container/docker-compose/docker-compose.local.yml

@@ -2,7 +2,7 @@
 version: '2.2'
 services:
   coordinator1:
-    image: dingodb.ubuntu:v0.3.0
+    image: dingodb.ubuntu:v0.5.0
     hostname: coordinator1
     container_name: coordinator1
     networks:
@@ -12,7 +12,7 @@ services:
       DINGO_HOSTNAME: coordinator1
 
   coordinator2:
-    image: dingodb.ubuntu:v0.3.0
+    image: dingodb.ubuntu:v0.5.0
     hostname: coordinator2
     container_name: coordinator2
     networks:
@@ -22,7 +22,7 @@ services:
       DINGO_HOSTNAME: coordinator2
 
   coordinator3:
-    image: dingodb.ubuntu:v0.3.0
+    image: dingodb.ubuntu:v0.5.0
     hostname: coordinator3
     container_name: coordinator3
     networks:
@@ -32,7 +32,7 @@ services:
       DINGO_HOSTNAME: coordinator3
 
   executor1:
-    image: dingodb.ubuntu:v0.3.0
+    image: dingodb.ubuntu:v0.5.0
     hostname: executor1
     container_name: executor1
     ports:
@@ -48,7 +48,7 @@ services:
        DINGO_HOSTNAME: executor1
 
   executor2:
-    image: dingodb.ubuntu:v0.3.0
+    image: dingodb.ubuntu:v0.5.0
     hostname: executor2
     container_name: executor2
     ports:
@@ -64,7 +64,7 @@ services:
        DINGO_HOSTNAME: executor2
 
   executor3:
-    image: dingodb.ubuntu:v0.3.0
+    image: dingodb.ubuntu:v0.5.0
     hostname: executor3
     container_name: executor3
     ports:
@@ -80,7 +80,7 @@ services:
        DINGO_HOSTNAME: executor3
 
   web:
-    image: dingodb.ubuntu:v0.3.0
+    image: dingodb.ubuntu:v0.5.0
     hostname: web
     container_name: web
     ports:

container/images/templates/bin/start-driver.sh

@@ -17,10 +17,11 @@
 
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 JAR_PATH=$(find $ROOT -name dingo-cli-*.jar)
+NET_JAR_PATH=$(find $ROOT -name dingo-net-*.jar)
 
 java ${JAVA_OPTS} \
     -Dlogback.configurationFile=file:${ROOT}/conf/logback-driver.xml \
-    -classpath ${JAR_PATH} \
+    -classpath ${JAR_PATH}:${NET_JAR_PATH} \
     io.dingodb.cli.Tools driver \
     --config ${ROOT}/conf/client.yaml \
     $@ > ${ROOT}/log/driver.out

container/images/templates/bin/start-executor.sh

@@ -19,10 +19,11 @@
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
 JAR_PATH=$(find $ROOT -name dingo-*-executor-*.jar)
 STORE_JAR_PATH=$(find $ROOT -name dingo-store*.jar)
+NET_JAR_PATH=$(find $ROOT -name dingo-net-*.jar)
 
 java ${JAVA_OPTS} \
      -Dlogback.configurationFile=file:${ROOT}/conf/logback-executor.xml \
-     -classpath ${JAR_PATH}:${STORE_JAR_PATH}  \
+     -classpath ${JAR_PATH}:${STORE_JAR_PATH}:${NET_JAR_PATH}  \
      io.dingodb.server.executor.Starter \
      --config ${ROOT}/conf/executor.yaml \
      > ${ROOT}/log/executor.out

container/images/templates/bin/start.sh

@@ -20,6 +20,7 @@ COORDINATOR_JAR_PATH=$(find $ROOT -name dingo-*-coordinator-*.jar)
 EXECUTOR_JAR_PATH=$(find $ROOT -name dingo-*-executor-*.jar)
 DRIVER_JAR_PATH=$(find $ROOT -name dingo-cli-*.jar)
 WEB_JAR_PATH=$(find $ROOT -name dingo-web*.jar)
+NET_JAR_PATH=$(find $ROOT -name dingo-net-*.jar)
 
 ROLE=$DINGO_ROLE
 HOSTNAME=$DINGO_HOSTNAME
@@ -38,7 +39,7 @@ if [[ $ROLE == "coordinator" ]]
 then
     java ${JAVA_OPTS} \
          -Dlogback.configurationFile=file:${ROOT}/conf/logback-coordinator.xml \
-         -classpath ${COORDINATOR_JAR_PATH} \
+         -classpath ${COORDINATOR_JAR_PATH}:${NET_JAR_PATH} \
          io.dingodb.server.coordinator.Starter \
          --config ${ROOT}/conf/coordinator.yaml \
          > ${ROOT}/log/coordinator.out

container/images/templates/conf/coordinator.yaml

@@ -5,8 +5,6 @@ exchange:
     port: 19181
 server:
     dataPath: /opt/dingo/coordinator
-    raft:
-        port: 9181
-        initRaftSvrList: coordinator3:9181,coordinator2:9181,coordinator1:9181
+    servers: coordinator3:19181,coordinator2:19181,coordinator1:19181
     schedule:
         autoSplit: true

container/images/templates/conf/executor.yaml

@@ -8,7 +8,4 @@ server:
     dataPath: /opt/dingo/executor/meta
 store:
     dbPath: /opt/dingo/executor/raftDb
-    raft:
-       port: 9191 
-       raftPath: /opt/dingo/executor/raftLog
     collectStatsInterval: 5

roles/dingo/templates/executor.yaml.j2

@@ -9,6 +9,8 @@ server:
     monitorPort: {{ dingo_executor_http_monitor_port }}
 store:
     dbPath: {{ dingo_executor_raft_db_path }}
+    dbRocksOptionsFile: {{ dingo_home }}/conf/db_rocks.ini
+    logRocksOptionsFile: {{ dingo_home }}/conf/log_rocks.ini
     raft:
        port: {{ dingo_executor_raft_port }}
        raftPath: {{ dingo_executor_raft_log_path }}