diff --git a/contrib/Joshua/scripts/bindingTestScript.sh b/contrib/Joshua/scripts/bindingTestScript.sh
index c9cd5f1a80..f4e0e8eb8b 100755
--- a/contrib/Joshua/scripts/bindingTestScript.sh
+++ b/contrib/Joshua/scripts/bindingTestScript.sh
@@ -7,7 +7,7 @@ SCRIPTID="${$}"
SAVEONERROR="${SAVEONERROR:-1}"
PYTHONDIR="${BINDIR}/tests/python"
testScript="${BINDIR}/tests/bindingtester/run_binding_tester.sh"
-VERSION="1.8"
+VERSION="1.9"
source ${SCRIPTDIR}/localClusterStart.sh
@@ -28,7 +28,7 @@ then
echo "Log dir: ${LOGDIR}"
echo "Python path: ${PYTHONDIR}"
echo "Lib dir: ${LIBDIR}"
- echo "Cluster String: ${CLUSTERSTRING}"
+ echo "Cluster String: ${FDBCLUSTERTEXT}"
echo "Script Id: ${SCRIPTID}"
echo "Version: ${VERSION}"
fi
diff --git a/contrib/Joshua/scripts/localClusterStart.sh b/contrib/Joshua/scripts/localClusterStart.sh
index de6c6b53a5..d1280267b3 100644
--- a/contrib/Joshua/scripts/localClusterStart.sh
+++ b/contrib/Joshua/scripts/localClusterStart.sh
@@ -6,6 +6,7 @@ LOGDIR="${WORKDIR}/log"
ETCDIR="${WORKDIR}/etc"
BINDIR="${BINDIR:-${SCRIPTDIR}}"
FDBPORTSTART="${FDBPORTSTART:-4000}"
+FDBPORTTOTAL="${FDBPORTTOTAL:-1000}"
SERVERCHECKS="${SERVERCHECKS:-10}"
CONFIGUREWAIT="${CONFIGUREWAIT:-240}"
FDBCONF="${ETCDIR}/fdb.cluster"
@@ -18,382 +19,384 @@ status=0
messagetime=0
messagecount=0
-# Define a random ip address and port on localhost
-if [ -z ${IPADDRESS} ]; then
- let index2="${RANDOM} % 256"
- let index3="${RANDOM} % 256"
- let index4="(${RANDOM} % 255) + 1"
- IPADDRESS="127.${index2}.${index3}.${index4}"
+# Do nothing, if cluster string is already defined
+if [ -n "${FDBCLUSTERTEXT}" ]
+then
+ :
+# Otherwise, define the cluster text
+else
+ # Define a random ip address and port on localhost
+ if [ -z "${IPADDRESS}" ]; then
+ let index2="${RANDOM} % 256"
+ let index3="${RANDOM} % 256"
+ let index4="(${RANDOM} % 255) + 1"
+ IPADDRESS="127.${index2}.${index3}.${index4}"
+ fi
+ if [ -z "${FDBPORT}" ]; then
+ let FDBPORT="(${RANDOM} % ${FDBPORTTOTAL}) + ${FDBPORTSTART}"
+ fi
+ FDBCLUSTERTEXT="${IPADDRESS}:${FDBPORT}"
fi
-if [ -z ${FDBPORT} ]; then
- let FDBPORT="(${RANDOM} % 1000) + ${FDBPORTSTART}"
-fi
-CLUSTERSTRING="${IPADDRESS}:${FDBPORT}"
-
function log
{
- local status=0
- if [ "$#" -lt 1 ]
- then
- echo "Usage: log <message> [echo]"
- echo
- echo "Logs the message and timestamp to LOGFILE (${LOGFILE}) and, if the"
- echo "second argument is either not present or is set to 1, stdout."
- let status="${status} + 1"
- else
- # Log to stdout.
- if [ "$#" -lt 2 ] || [ "${2}" -ge 1 ]
- then
- echo "${1}"
- fi
+ local status=0
+ if [ "$#" -lt 1 ]
+ then
+ echo "Usage: log <message> [echo]"
+ echo
+ echo "Logs the message and timestamp to LOGFILE (${LOGFILE}) and, if the"
+ echo "second argument is either not present or is set to 1, stdout."
+ let status="${status} + 1"
+ else
+ # Log to stdout.
+ if [ "$#" -lt 2 ] || [ "${2}" -ge 1 ]
+ then
+ echo "${1}"
+ fi
- # Log to file.
- datestr=$(date +"%Y-%m-%d %H:%M:%S (%s)")
- dir=$(dirname "${LOGFILE}")
- if ! [ -d "${dir}" ] && ! mkdir -p "${dir}"
- then
- echo "Could not create directory to log output."
- let status="${status} + 1"
- elif ! [ -f "${LOGFILE}" ] && ! touch "${LOGFILE}"
- then
- echo "Could not create file ${LOGFILE} to log output."
- let status="${status} + 1"
- elif ! echo "[ ${datestr} ] ${1}" >> "${LOGFILE}"
- then
- echo "Could not log output to ${LOGFILE}."
- let status="${status} + 1"
- fi
- fi
+ # Log to file.
+ datestr=$(date +"%Y-%m-%d %H:%M:%S (%s)")
+ dir=$(dirname "${LOGFILE}")
+ if ! [ -d "${dir}" ] && ! mkdir -p "${dir}"
+ then
+ echo "Could not create directory to log output."
+ let status="${status} + 1"
+ elif ! [ -f "${LOGFILE}" ] && ! touch "${LOGFILE}"
+ then
+ echo "Could not create file ${LOGFILE} to log output."
+ let status="${status} + 1"
+ elif ! echo "[ ${datestr} ] ${1}" >> "${LOGFILE}"
+ then
+ echo "Could not log output to ${LOGFILE}."
+ let status="${status} + 1"
+ fi
+ fi
- return "${status}"
+ return "${status}"
}
# Display a message for the user.
function displayMessage
{
- local status=0
+ local status=0
- if [ "$#" -lt 1 ]
- then
- echo "displayMessage <message>"
- let status="${status} + 1"
- elif ! log "${1}" 0
- then
- log "Could not write message to file."
- else
- # Increment the message counter
- let messagecount="${messagecount} + 1"
+ if [ "$#" -lt 1 ]
+ then
+ echo "displayMessage <message>"
+ let status="${status} + 1"
+ elif ! log "${1}" 0
+ then
+ log "Could not write message to file."
+ else
+ # Increment the message counter
+ let messagecount="${messagecount} + 1"
- # Display successful message, if previous message
- if [ "${messagecount}" -gt 1 ]
- then
- # Determine the amount of transpired time
- let timespent="${SECONDS}-${messagetime}"
+ # Display successful message, if previous message
+ if [ "${messagecount}" -gt 1 ]
+ then
+ # Determine the amount of transpired time
+ let timespent="${SECONDS}-${messagetime}"
- if [ "${DEBUGLEVEL}" -gt 0 ]; then
- printf "... done in %3d seconds\n" "${timespent}"
- fi
- fi
+ if [ "${DEBUGLEVEL}" -gt 0 ]; then
+ printf "... done in %3d seconds\n" "${timespent}"
+ fi
+ fi
- # Display message
- if [ "${DEBUGLEVEL}" -gt 0 ]; then
- printf "%-16s %-35s " "$(date "+%F %H-%M-%S")" "$1"
- fi
+ # Display message
+ if [ "${DEBUGLEVEL}" -gt 0 ]; then
+ printf "%-16s %-35s " "$(date "+%F %H-%M-%S")" "$1"
+ fi
- # Update the variables
- messagetime="${SECONDS}"
- fi
+ # Update the variables
+ messagetime="${SECONDS}"
+ fi
- return "${status}"
+ return "${status}"
}
# Create the directories used by the server.
function createDirectories
{
- local status=0
+ local status=0
- # Display user message
- if ! displayMessage "Creating directories"
- then
- echo 'Failed to display user message'
- let status="${status} + 1"
+ # Display user message
+ if ! displayMessage "Creating directories"
+ then
+ echo 'Failed to display user message'
+ let status="${status} + 1"
- elif ! mkdir -p "${LOGDIR}" "${ETCDIR}"
- then
- log "Failed to create directories"
- let status="${status} + 1"
+ elif ! mkdir -p "${LOGDIR}" "${ETCDIR}"
+ then
+ log "Failed to create directories"
+ let status="${status} + 1"
- # Display user message
- elif ! displayMessage "Setting file permissions"
- then
- log 'Failed to display user message'
- let status="${status} + 1"
+ # Display user message
+ elif ! displayMessage "Setting file permissions"
+ then
+ log 'Failed to display user message'
+ let status="${status} + 1"
- elif ! chmod 755 "${BINDIR}/fdbserver" "${BINDIR}/fdbcli"
- then
- log "Failed to set file permissions"
- let status="${status} + 1"
+ elif ! chmod 755 "${BINDIR}/fdbserver" "${BINDIR}/fdbcli"
+ then
+ log "Failed to set file permissions"
+ let status="${status} + 1"
- else
- while read filepath
- do
- if [ -f "${filepath}" ] && [ ! -x "${filepath}" ]
- then
- # if [ "${DEBUGLEVEL}" -gt 1 ]; then
- # log " Enable executable: ${filepath}"
- # fi
- log " Enable executable: ${filepath}" "${DEBUGLEVEL}"
- if ! chmod 755 "${filepath}"
- then
- log "Failed to set executable for file: ${filepath}"
- let status="${status} + 1"
- fi
- fi
- done < <(find "${BINDIR}" -iname '*.py' -o -iname '*.rb' -o -iname 'fdb_flow_tester' -o -iname '_stacktester' -o -iname '*.js' -o -iname '*.sh' -o -iname '*.ksh')
- fi
+ else
+ while read filepath
+ do
+ if [ -f "${filepath}" ] && [ ! -x "${filepath}" ]
+ then
+ # if [ "${DEBUGLEVEL}" -gt 1 ]; then
+ # log " Enable executable: ${filepath}"
+ # fi
+ log " Enable executable: ${filepath}" "${DEBUGLEVEL}"
+ if ! chmod 755 "${filepath}"
+ then
+ log "Failed to set executable for file: ${filepath}"
+ let status="${status} + 1"
+ fi
+ fi
+ done < <(find "${BINDIR}" -iname '*.py' -o -iname '*.rb' -o -iname 'fdb_flow_tester' -o -iname '_stacktester' -o -iname '*.js' -o -iname '*.sh' -o -iname '*.ksh')
+ fi
- return ${status}
+ return ${status}
}
# Create a cluster file for the local cluster.
function createClusterFile
{
- local status=0
+ local status=0
- if [ "${status}" -ne 0 ]; then
- :
- # Display user message
- elif ! displayMessage "Creating Fdb Cluster file"
- then
- log 'Failed to display user message'
- let status="${status} + 1"
- else
- description=$(LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom 2> /dev/null | head -c 8)
- random_str=$(LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom 2> /dev/null | head -c 8)
- echo "${description}:${random_str}@${CLUSTERSTRING}" > "${FDBCONF}"
- fi
+ if [ "${status}" -ne 0 ]; then
+ :
+ # Display user message
+ elif ! displayMessage "Creating Fdb Cluster file"
+ then
+ log 'Failed to display user message'
+ let status="${status} + 1"
+ else
+ description=$(LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom 2> /dev/null | head -c 8)
+ random_str=$(LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom 2> /dev/null | head -c 8)
+ echo "${description}:${random_str}@${FDBCLUSTERTEXT}" > "${FDBCONF}"
+ fi
- if [ "${status}" -ne 0 ]; then
- :
- elif ! chmod 0664 "${FDBCONF}"; then
- log "Failed to set permissions on fdbconf: ${FDBCONF}"
- let status="${status} + 1"
- fi
+ if [ "${status}" -ne 0 ]; then
+ :
+ elif ! chmod 0664 "${FDBCONF}"; then
+ log "Failed to set permissions on fdbconf: ${FDBCONF}"
+ let status="${status} + 1"
+ fi
- return ${status}
+ return ${status}
}
# Stop the Cluster from running.
function stopCluster
{
- local status=0
+ local status=0
- # Add an audit entry, if enabled
- if [ "${AUDITCLUSTER}" -gt 0 ]; then
- printf '%-15s (%6s) Stopping cluster %-20s (%6s): %s\n' "$(date +'%Y-%m-%d %H:%M:%S')" "${$}" "${CLUSTERSTRING}" "${FDBSERVERID}" >> "${AUDITLOG}"
- fi
- if [ -z "${FDBSERVERID}" ]; then
- log 'FDB Server process is not defined'
- let status="${status} + 1"
- elif ! kill -0 "${FDBSERVERID}"; then
- log "Failed to locate FDB Server process (${FDBSERVERID})"
- let status="${status} + 1"
- elif "${BINDIR}/fdbcli" -C "${FDBCONF}" --exec "kill; kill ${CLUSTERSTRING}; sleep 3" --timeout 120 &>> "${LOGDIR}/fdbcli-kill.log"
- then
- # Ensure that process is dead
- if ! kill -0 "${FDBSERVERID}" 2> /dev/null; then
- log "Killed cluster (${FDBSERVERID}) via cli"
- elif ! kill -9 "${FDBSERVERID}"; then
- log "Failed to kill FDB Server process (${FDBSERVERID}) via cli or kill command"
- let status="${status} + 1"
- else
- log "Forcibly killed FDB Server process (${FDBSERVERID}) since cli failed"
- fi
- elif ! kill -9 "${FDBSERVERID}"; then
- log "Failed to forcibly kill FDB Server process (${FDBSERVERID})"
- let status="${status} + 1"
- else
- log "Forcibly killed FDB Server process (${FDBSERVERID})"
- fi
- return "${status}"
+ # Add an audit entry, if enabled
+ if [ "${AUDITCLUSTER}" -gt 0 ]; then
+ printf '%-15s (%6s) Stopping cluster %-20s (%6s): %s\n' "$(date +'%Y-%m-%d %H:%M:%S')" "${$}" "${FDBCLUSTERTEXT}" "${FDBSERVERID}" >> "${AUDITLOG}"
+ fi
+ if [ -z "${FDBSERVERID}" ]; then
+ log 'FDB Server process is not defined'
+ let status="${status} + 1"
+ elif ! kill -0 "${FDBSERVERID}"; then
+ log "Failed to locate FDB Server process (${FDBSERVERID})"
+ let status="${status} + 1"
+ elif "${BINDIR}/fdbcli" -C "${FDBCONF}" --exec "kill; kill ${FDBCLUSTERTEXT}; sleep 3" --timeout 120 &>> "${LOGDIR}/fdbcli-kill.log"
+ then
+ # Ensure that process is dead
+ if ! kill -0 "${FDBSERVERID}" 2> /dev/null; then
+ log "Killed cluster (${FDBSERVERID}) via cli"
+ elif ! kill -9 "${FDBSERVERID}"; then
+ log "Failed to kill FDB Server process (${FDBSERVERID}) via cli or kill command"
+ let status="${status} + 1"
+ else
+ log "Forcibly killed FDB Server process (${FDBSERVERID}) since cli failed"
+ fi
+ elif ! kill -9 "${FDBSERVERID}"; then
+ log "Failed to forcibly kill FDB Server process (${FDBSERVERID})"
+ let status="${status} + 1"
+ else
+ log "Forcibly killed FDB Server process (${FDBSERVERID})"
+ fi
+ return "${status}"
}
# Start the server running.
function startFdbServer
{
- local status=0
+ local status=0
- # Add an audit entry, if enabled
- if [ "${AUDITCLUSTER}" -gt 0 ]; then
- printf '%-15s (%6s) Starting cluster %-20s\n' "$(date +'%Y-%m-%d %H:%M:%S')" "${$}" "${CLUSTERSTRING}" >> "${AUDITLOG}"
- fi
+ # Add an audit entry, if enabled
+ if [ "${AUDITCLUSTER}" -gt 0 ]; then
+ printf '%-15s (%6s) Starting cluster %-20s\n' "$(date +'%Y-%m-%d %H:%M:%S')" "${$}" "${FDBCLUSTERTEXT}" >> "${AUDITLOG}"
+ fi
- if [ "${status}" -ne 0 ]; then
- :
- elif ! displayMessage "Starting Fdb Server"
- then
- log 'Failed to display user message'
- let status="${status} + 1"
+ if ! displayMessage "Starting Fdb Server"
+ then
+ log 'Failed to display user message'
+ let status="${status} + 1"
- else
- "${BINDIR}/fdbserver" --knob_disable_posix_kernel_aio=1 -C "${FDBCONF}" -p "${CLUSTERSTRING}" -L "${LOGDIR}" -d "${WORKDIR}/fdb/${$}" &> "${LOGDIR}/fdbserver.log" &
- fdbpid=$!
- fdbrc=$?
- if [ $fdbrc -ne 0 ]
- then
- log "Failed to start FDB Server"
- let status="${status} + 1"
- else
- FDBSERVERID="${fdbpid}"
- fi
- fi
+ else
+ "${BINDIR}/fdbserver" --knob_disable_posix_kernel_aio=1 -C "${FDBCONF}" -p "${FDBCLUSTERTEXT}" -L "${LOGDIR}" -d "${WORKDIR}/fdb/${$}" &> "${LOGDIR}/fdbserver.log" &
+ if [ "${?}" -ne 0 ]
+ then
+ log "Failed to start FDB Server"
+ let status="${status} + 1"
+ else
+ FDBSERVERID="${!}"
+ fi
+ fi
- if [ -z "${FDBSERVERID}" ]; then
- log "FDB Server start failed because no process"
- let status="${status} + 1"
- elif ! kill -0 "${FDBSERVERID}" ; then
- log "FDB Server start failed because process terminated unexpectedly"
- let status="${status} + 1"
- fi
+ if [ -z "${FDBSERVERID}" ]; then
+ log "FDB Server start failed because no process"
+ let status="${status} + 1"
+ elif ! kill -0 "${FDBSERVERID}" ; then
+ log "FDB Server start failed because process terminated unexpectedly"
+ let status="${status} + 1"
+ fi
- return ${status}
+ return ${status}
}
function getStatus
{
- local status=0
+ local status=0
- if [ "${status}" -ne 0 ]; then
- :
- elif ! date &>> "${LOGDIR}/fdbclient.log"
- then
- log 'Failed to get date'
- let status="${status} + 1"
- elif ! "${BINDIR}/fdbcli" -C "${FDBCONF}" --exec 'status json' --timeout 120 &>> "${LOGDIR}/fdbclient.log"
- then
- log 'Failed to get status from fdbcli'
- let status="${status} + 1"
- elif ! date &>> "${LOGDIR}/fdbclient.log"
- then
- log 'Failed to get date'
- let status="${status} + 1"
- fi
+ if [ "${status}" -ne 0 ]; then
+ :
+ elif ! date &>> "${LOGDIR}/fdbclient.log"
+ then
+ log 'Failed to get date'
+ let status="${status} + 1"
+ elif ! "${BINDIR}/fdbcli" -C "${FDBCONF}" --exec 'status json' --timeout 120 &>> "${LOGDIR}/fdbclient.log"
+ then
+ log 'Failed to get status from fdbcli'
+ let status="${status} + 1"
+ elif ! date &>> "${LOGDIR}/fdbclient.log"
+ then
+ log 'Failed to get date'
+ let status="${status} + 1"
+ fi
- return ${status}
+ return ${status}
}
# Verify that the cluster is available.
function verifyAvailable
{
- local status=0
+ local status=0
- if [ -z "${FDBSERVERID}" ]; then
- log "FDB Server process is not defined."
- let status="${status} + 1"
- # Verify that the server is running.
- elif ! kill -0 "${FDBSERVERID}"
- then
- log "FDB server process (${FDBSERVERID}) is not running"
- let status="${status} + 1"
- # Display user message.
- elif ! displayMessage "Checking cluster availability"
- then
- log 'Failed to display user message'
- let status="${status} + 1"
- # Determine if status json says the database is available.
- else
- avail=`"${BINDIR}/fdbcli" -C "${FDBCONF}" --exec 'status json' --timeout "${SERVERCHECKS}" 2> /dev/null | grep -E '"database_available"|"available"' | grep 'true'`
- log "Avail value: ${avail}" "${DEBUGLEVEL}"
- if [[ -n "${avail}" ]] ; then
- :
- else
- let status="${status} + 1"
- fi
- fi
- return "${status}"
+ if [ -z "${FDBSERVERID}" ]; then
+ log "FDB Server process is not defined."
+ let status="${status} + 1"
+ # Verify that the server is running.
+ elif ! kill -0 "${FDBSERVERID}"
+ then
+ log "FDB server process (${FDBSERVERID}) is not running"
+ let status="${status} + 1"
+ # Display user message.
+ elif ! displayMessage "Checking cluster availability"
+ then
+ log 'Failed to display user message'
+ let status="${status} + 1"
+ # Determine if status json says the database is available.
+ else
+ avail=`"${BINDIR}/fdbcli" -C "${FDBCONF}" --exec 'status json' --timeout "${SERVERCHECKS}" 2> /dev/null | grep -E '"database_available"|"available"' | grep 'true'`
+ log "Avail value: ${avail}" "${DEBUGLEVEL}"
+ if [[ -n "${avail}" ]] ; then
+ :
+ else
+ let status="${status} + 1"
+ fi
+ fi
+ return "${status}"
}
# Configure the database on the server.
function createDatabase
{
- local status=0
+ local status=0
- if [ "${status}" -ne 0 ]; then
- :
- # Ensure that the server is running
- elif ! kill -0 "${FDBSERVERID}"
- then
- log "FDB server process: (${FDBSERVERID}) is not running"
- let status="${status} + 1"
+ if [ "${status}" -ne 0 ]; then
+ :
+ # Ensure that the server is running
+ elif ! kill -0 "${FDBSERVERID}"
+ then
+ log "FDB server process: (${FDBSERVERID}) is not running"
+ let status="${status} + 1"
- # Display user message
- elif ! displayMessage "Creating database"
- then
- log 'Failed to display user message'
- let status="${status} + 1"
- elif ! echo "Client log:" &> "${LOGDIR}/fdbclient.log"
- then
- log 'Failed to create fdbclient.log'
- let status="${status} + 1"
- elif ! getStatus
- then
- log 'Failed to get status'
- let status="${status} + 1"
+ # Display user message
+ elif ! displayMessage "Creating database"
+ then
+ log 'Failed to display user message'
+ let status="${status} + 1"
+ elif ! echo "Client log:" &> "${LOGDIR}/fdbclient.log"
+ then
+ log 'Failed to create fdbclient.log'
+ let status="${status} + 1"
+ elif ! getStatus
+ then
+ log 'Failed to get status'
+ let status="${status} + 1"
- # Configure the database.
- else
- "${BINDIR}/fdbcli" -C "${FDBCONF}" --exec 'configure new single memory; status' --timeout "${CONFIGUREWAIT}" --log --log-dir "${LOGDIR}" &>> "${LOGDIR}/fdbclient.log"
+ # Configure the database.
+ else
+ "${BINDIR}/fdbcli" -C "${FDBCONF}" --exec 'configure new single memory; status' --timeout "${CONFIGUREWAIT}" --log --log-dir "${LOGDIR}" &>> "${LOGDIR}/fdbclient.log"
- if ! displayMessage "Checking if config succeeded"
- then
- log 'Failed to display user message.'
- fi
+ if ! displayMessage "Checking if config succeeded"
+ then
+ log 'Failed to display user message.'
+ fi
- iteration=0
- while [[ "${iteration}" -lt "${SERVERCHECKS}" ]] && ! verifyAvailable
- do
- log "Database not created (iteration ${iteration})."
- let iteration="${iteration} + 1"
- done
+ iteration=0
+ while [[ "${iteration}" -lt "${SERVERCHECKS}" ]] && ! verifyAvailable
+ do
+ log "Database not created (iteration ${iteration})."
+ let iteration="${iteration} + 1"
+ done
- if ! verifyAvailable
- then
- log "Failed to create database via cli"
- getStatus
- cat "${LOGDIR}/fdbclient.log"
- log "Ignoring -- moving on"
- #let status="${status} + 1"
- fi
- fi
+ if ! verifyAvailable
+ then
+ log "Failed to create database via cli"
+ getStatus
+ cat "${LOGDIR}/fdbclient.log"
+ log "Ignoring -- moving on"
+ #let status="${status} + 1"
+ fi
+ fi
- return ${status}
+ return ${status}
}
# Begin the local cluster from scratch.
function startCluster
{
- local status=0
+ local status=0
- if [ "${status}" -ne 0 ]; then
- :
- elif ! createDirectories
- then
- log "Could not create directories."
- let status="${status} + 1"
- elif ! createClusterFile
- then
- log "Could not create cluster file."
- let status="${status} + 1"
- elif ! startFdbServer
- then
- log "Could not start FDB server."
- let status="${status} + 1"
- elif ! createDatabase
- then
- log "Could not create database."
- let status="${status} + 1"
- fi
+ if [ "${status}" -ne 0 ]; then
+ :
+ elif ! createDirectories
+ then
+ log "Could not create directories."
+ let status="${status} + 1"
+ elif ! createClusterFile
+ then
+ log "Could not create cluster file."
+ let status="${status} + 1"
+ elif ! startFdbServer
+ then
+ log "Could not start FDB server."
+ let status="${status} + 1"
+ elif ! createDatabase
+ then
+ log "Could not create database."
+ let status="${status} + 1"
+ fi
- return ${status}
+ return ${status}
}