[chore][mds] Rename mdsv2 to mds.

Author: rock-git

confv2/client.conf renamed to conf/client.conf

@@ -4,7 +4,7 @@ mydir="${BASH_SOURCE%/*}"
 if [[ ! -d "$mydir" ]]; then mydir="$PWD"; fi
 . $mydir/shflags
 
-DEFINE_string role 'mdsv2' 'server role'
+DEFINE_string role 'mds' 'server role'
 
 # parse the command-line
 FLAGS "$@" || exit 1

confv2/dingo.yaml renamed to conf/dingo.yaml

@@ -4,7 +4,7 @@ mydir="${BASH_SOURCE%/*}"
 if [[ ! -d "$mydir" ]]; then mydir="$PWD"; fi
 . $mydir/shflags
 
-DEFINE_string role 'mdsv2' 'server role'
+DEFINE_string role 'mds' 'server role'
 DEFINE_boolean clean_log 1 'clean log'
 DEFINE_boolean replace_conf 0 'replace conf'
 #DEFINE_string parameters 'deploy_parameters' 'server role'
@@ -54,9 +54,9 @@ function deploy_server() {
   fi
   ln -s  "${srcpath}/build/bin/${server_name}" "${dstpath}/bin/${server_name}"
 
-  # link dingo-mdsv2-client
-  if [ "${role}" == "mdsv2" ]; then
-    client_name="dingo-mdsv2-client"
+  # link dingo-mds-client
+  if [ "${role}" == "mds" ]; then
+    client_name="dingo-mds-client"
     if [ -f "${dstpath}/bin/${client_name}" ]; then
       rm -f "${dstpath}/bin/${client_name}"
     fi
@@ -65,21 +65,15 @@ function deploy_server() {
 
   if [ "${FLAGS_replace_conf}" == "0" ]; then
     # conf file
-    dist_conf="${dstpath}/conf/${server_name}.conf"
-    cp $srcpath/confv2/${server_name}.template.conf $dist_conf
+    dist_conf="${dstpath}/conf/${role}.conf"
+    cp $srcpath/conf/${role}.template.conf $dist_conf
 
     sed  -i 's,\$INSTANCE_ID\$,'"$instance_id"',g'                  $dist_conf
     sed  -i 's,\$SERVER_HOST\$,'"$SERVER_HOST"',g'                  $dist_conf
     sed  -i 's,\$SERVER_LISTEN_HOST\$,'"$SERVER_LISTEN_HOST"',g'    $dist_conf
     sed  -i 's,\$SERVER_PORT\$,'"$server_port"',g'                  $dist_conf
     sed  -i 's,\$BASE_PATH\$,'"$dstpath"',g'                        $dist_conf
 
-    # gflags file
-    if [ -f $srcpath/conf/${server_name}.gflags ]
-    then
-        cp $srcpath/confv2/${server_name}.gflags $dstpath/conf/
-    fi
-
     # coor_list file
     coor_file="${dstpath}/conf/coor_list"
     echo $COORDINATOR_ADDR > $coor_file
@@ -93,13 +87,13 @@ function deploy_server() {
 
 program_dir=$BASE_DIR/dist/${FLAGS_role}
 
-if [ ${FLAGS_role} == "mdsv2" ]; then
-  echo "============ deploy mdsv2 ============"
+if [ ${FLAGS_role} == "mds" ]; then
+  echo "============ deploy mds ============"
   # print the parameters
   echo "FLAGS_role: ${FLAGS_role}"
   echo "BASE_DIR: ${BASE_DIR}"
   echo "program_dir: ${program_dir}"
-  echo "MDSV2_INSTANCE_START_ID: ${MDSV2_INSTANCE_START_ID}"
+  echo "MDS_INSTANCE_START_ID: ${MDS_INSTANCE_START_ID}"
   echo "SERVER_START_PORT: ${SERVER_START_PORT}"
-  deploy_server ${FLAGS_role} ${BASE_DIR} ${program_dir} ${MDSV2_INSTANCE_START_ID} ${SERVER_START_PORT}
+  deploy_server ${FLAGS_role} ${BASE_DIR} ${program_dir} ${MDS_INSTANCE_START_ID} ${SERVER_START_PORT}
 fi

confv2/dingo-mdsv2.template.conf renamed to conf/mds.template.conf

@@ -9,7 +9,7 @@ mydir="${BASH_SOURCE%/*}"
 if [[ ! -d "$mydir" ]]; then mydir="$PWD"; fi
 . $mydir/shflags
 
-DEFINE_string role 'mdsv2' 'server role'
+DEFINE_string role 'mds' 'server role'
 
 # parse the command-line
 FLAGS "$@" || exit 1
@@ -82,7 +82,7 @@ function start_server() {
   server_name="dingo-${role}"
   echo "start server: ${root_dir}/bin/${server_name}"
 
-  exec ${root_dir}/bin/${server_name} --conf=${root_dir}/conf/${server_name}.conf >> ${root_dir}/log/mdsv2.log 2>&1
+  exec ${root_dir}/bin/${server_name} --conf=${root_dir}/conf/${role}.conf >> ${root_dir}/log/mds.log 2>&1
 }
 
 

deploy-scripts/clean_start.sh

@@ -4,7 +4,7 @@ mydir="${BASH_SOURCE%/*}"
 if [[ ! -d "$mydir" ]]; then mydir="$PWD"; fi
 . $mydir/shflags
 
-DEFINE_string fsname 'mdsv2_fs_mono' 'server role'
+DEFINE_string fsname 'mds_fs_mono' 'server role'
 DEFINE_string fstype 'vfs_v2' 'fs type'
 DEFINE_string mountpoint '' 'mount point'
 

deploy-scripts/deploy.sh

@@ -4,7 +4,7 @@ mydir="${BASH_SOURCE%/*}"
 if [[ ! -d "$mydir" ]]; then mydir="$PWD"; fi
 . $mydir/shflags
 
-DEFINE_string role 'mdsv2' 'server role'
+DEFINE_string role 'mds' 'server role'
 DEFINE_integer force 0 'use kill -9 to stop'
 DEFINE_integer use_pgrep 0 'use pgrep to get pid'
 

deploy-scripts/start.sh

@@ -4,7 +4,7 @@ mydir="${BASH_SOURCE%/*}"
 if [[ ! -d "$mydir" ]]; then mydir="$PWD"; fi
 . $mydir/shflags
 
-DEFINE_string role 'mdsv2' 'server role'
+DEFINE_string role 'mds' 'server role'
 DEFINE_integer server_num 1 'server number'
 
 # parse the command-line

deploy-scripts/start_fuse.sh

@@ -4,7 +4,7 @@ mydir="${BASH_SOURCE%/*}"
 if [[ ! -d "$mydir" ]]; then mydir="$PWD"; fi
 . $mydir/shflags
 
-DEFINE_string role 'mdsv2' 'server role'
+DEFINE_string role 'mds' 'server role'
 DEFINE_integer server_num 1 'server number'
 DEFINE_boolean clean_log 1 'clean log'
 DEFINE_boolean replace_conf 0 'replace conf'
@@ -55,9 +55,9 @@ function deploy_server() {
   fi
   ln "${srcpath}/build/bin/${server_name}" "${dstpath}/bin/${server_name}"
 
-  # link dingo-mdsv2-client
-  if [ "${role}" == "mdsv2" ]; then
-    client_name="dingo-mdsv2-client"
+  # link dingo-mds-client
+  if [ "${role}" == "mds" ]; then
+    client_name="dingo-mds-client"
     if [ -f "${dstpath}/bin/${client_name}" ]; then
       rm -f "${dstpath}/bin/${client_name}"
     fi
@@ -66,8 +66,8 @@ function deploy_server() {
 
   if [ "${FLAGS_replace_conf}" == "0" ]; then
     # conf file
-    dist_conf="${dstpath}/conf/${server_name}.conf"
-    cp $srcpath/confv2/${server_name}.template.conf $dist_conf
+    dist_conf="${dstpath}/conf/${role}.conf"
+    cp $srcpath/conf/${role}.template.conf $dist_conf
 
     sed  -i 's,\$INSTANCE_ID\$,'"$instance_id"',g'                  $dist_conf
     sed  -i 's,\$SERVER_HOST\$,'"$SERVER_HOST"',g'                  $dist_conf
@@ -89,8 +89,8 @@ function deploy_server() {
 for ((i=1; i<=$FLAGS_server_num; ++i)); do
   program_dir=$BASE_DIR/dist/${FLAGS_role}-${i}
 
-  if [ ${FLAGS_role} == "mdsv2" ]; then
-    deploy_server ${FLAGS_role} ${BASE_DIR} ${program_dir} `expr ${MDSV2_INSTANCE_START_ID} + ${i}` `expr ${SERVER_START_PORT} + ${i}`
+  if [ ${FLAGS_role} == "mds" ]; then
+    deploy_server ${FLAGS_role} ${BASE_DIR} ${program_dir} `expr ${MDS_INSTANCE_START_ID} + ${i}` `expr ${SERVER_START_PORT} + ${i}`
   fi
 
 done