Fix #2022, Support master and standby server on a single node

bin/common.sh

@@ -16,7 +16,8 @@
 # limitations under the License.
 #
 
-export SMART_SERVER_LOG_FILE_NAME=smartserver-$(hostname)-$(whoami).log
+export SMART_SERVER_LOG_FILE_NAME=smartserver-master-$(hostname)-$(whoami).log
+export SMART_STANDBY_LOG_FILE_NAME=smartserver-standby-$(hostname)-$(whoami).log
 export SMART_AGENT_LOG_FILE_NAME=smartagent-$(hostname)-$(whoami).log
 export SMART_LOG_FILE_NAME=${SMART_SERVER_LOG_FILE_NAME}
 
@@ -314,6 +315,20 @@ function init_command() {
       JAVA_OPST+=" ${SSM_JAVA_OPT} ${SSM_AGENT_JAVA_OPT}"
       SMART_VARGS+=" -D smart.agent.address="${SSM_EXEC_HOST}
     ;;
+    standby)
+      SMART_CLASSNAME=org.smartdata.server.SmartDaemon
+      SMART_PID_FILE=/tmp/Standby.pid
+      ALLOW_DAEMON_OPT=true
+      export SMART_LOG_FILE_NAME=${SMART_STANDBY_LOG_FILE_NAME}
+      export SMART_LOG_FILE=${SMART_LOG_DIR}/${SMART_LOG_FILE_NAME}
+      if [ $SSM_DEBUG_ENABLED == "true" ]; then
+        JAVA_OPTS+=" -Xdebug -Xrunjdwp:transport=dt_socket,address=8008,server=y,suspend=y"
+      fi
+      JAVA_OPTS+=" -Dsmart.log.file="${SMART_LOG_FILE_NAME}
+      JAVA_OPST+=" ${SSM_JAVA_OPT} ${SSM_SERVER_JAVA_OPT}"
+      SMART_VARGS+=" -D smart.agent.master.address="${SSM_EXEC_HOST}
+      reorder_lib
+    ;;
     getconf)
       SMART_CLASSNAME=org.smartdata.server.utils.tools.GetConf
     ;;

bin/start-agent.sh

@@ -54,10 +54,6 @@ while [ $# != 0 ]; do
 The default one is localhost. "
       shift
       ;;
-    "--help" | "-h")
-      echo -e "--help -h Show this usage information\n--config Specify or overwrite an configure option.\n--host Specify the host on which Smart Agent will be started by giving its hostname or IP. The default one is localhost. "
-      shift
-      ;;
     *)
       break;
       ;;

bin/start-ssm.sh

@@ -63,10 +63,6 @@ while [ $# != 0 ]; do
 -format Format the configured database."
       shift
       ;;
-    "--help" | "-h")
-      echo -e "--help -h Show this usage information\n--config Specify or overwrite an configure option.\n-format Format the configured database."
-      shift
-      ;;
     *)
       SMART_VARGS+=" $1"
       shift
@@ -119,7 +115,7 @@ if [ x"${SMARTSERVERS}" != x"" ]; then
       --config "${SMART_CONF_DIR}" \
       --hosts "${OTHER_MASTERS}" --hostsend \
       --daemon start ${DEBUG_OPT_STANDBY} \
-      smartserver $SMART_VARGS_STANDBY
+      standby $SMART_VARGS_STANDBY
   fi
 else
   echo "ERROR: No SmartServers configured in 'servers'."

bin/stop-ssm.sh

@@ -64,12 +64,23 @@ if [ -f "${SERVERS_FILE}" ]; then
 
   if [ x"${SMARTSERVERS}" != x"" ]; then
     echo "Stopping SmartServers on [${SMARTSERVERS}]"
+    FIRST_MASTER=$(echo ${SMARTSERVERS} | awk '{print $1}')
     . "${SMART_HOME}/bin/ssm" \
       --remote \
       --config "${SMART_CONF_DIR}" \
-      --hosts "${SMARTSERVERS}" --hostsend \
+      --hosts "${FIRST_MASTER}" --hostsend \
       --daemon stop ${DEBUG_OPT} \
       smartserver
+
+    if [ x"${SMARTSERVERS}" != x"${FIRST_MASTER}" ]; then
+      OTHER_MASTERS=${SMARTSERVERS/${FIRST_MASTER} /}
+      . "${SMART_HOME}/bin/ssm" \
+        --remote \
+        --config "${SMART_CONF_DIR}" \
+        --hosts "${OTHER_MASTERS}" --hostsend \
+        --daemon stop ${DEBUG_OPT} \
+        standby
+    fi
   else
     echo "No SmartServers configured in 'servers'."
   fi

docs/ssm-deployment-guide.md

@@ -80,7 +80,9 @@ SSM will fetch the whole HDFS namespace when it starts by default. If you do not
 
 ##  **Configure Smart Server**
 
-SSM supports running multiple Smart Servers for high-availability. Only one of these Smart Servers can be in active state and provide services. One of the standby Smart Servers will take its place if the active Smart Server failed.
+SSM supports running multiple Smart Servers for high-availability.  Only one of these Smart Servers can be in active state and provide services. One of the standby Smart Servers will take its place if the active Smart Server failed.
+
+SSM also supports running one standby server with master server on a single node.
 
 Open `servers` file under ${SMART_HOME}/conf, put each server's hostname or IP address line by line. Lines start with '#' are treated as comments.
 
@@ -543,7 +545,11 @@ Note: To make the scripts work, you have to set up password-less SSH connections
 
 # Trouble Shooting
 ---------------------------------------------------------------------------------
- All logs will go to smartserver-$hostname-$user.log under ${SMART_HOME}/logs directory.
+ Logs for master server will go to smartserver-master-$hostname-$user.log under ${SMART_HOME}/logs directory.
+
+ Logs for standby server will go to smartserver-standy-$hostname-$user.log under ${SMART_HOME}/logs directory.
+
+ Logs for agent will go to smartagent-$hostname-$user.log under ${SMART_HOME}/logs directory.
 
 1. Smart Server can't start successfully