1
0
Fork 0

attempt to fix --upgrade

This commit is contained in:
jsteemann 2017-01-17 09:04:21 +01:00
parent 819603b910
commit 4ffd809c41
4 changed files with 19 additions and 13 deletions

View File

@ -37,16 +37,16 @@ start () {
( cd /var/run/arangodb && chown -R arangodb:arangodb . ) || exit 1
( cd $PIDDIR && chown arangodb:arangodb . ) || exit 1
if [ "$1" = "--upgrade" ]; then
$DAEMON -c $CONF --uid arangodb --gid arangodb --server.rest-server no $@
if [ "$1" = "--database.auto-upgrade" ]; then
$DAEMON -c $CONF --uid arangodb --gid arangodb --server.rest-server false $@
RETVAL=$?
log_end_msg $RETVAL
else
$DAEMON -c $CONF --uid arangodb --gid arangodb --server.rest-server --log.foreground-tty no --database.check-version
$DAEMON -c $CONF --uid arangodb --gid arangodb --server.rest-server --log.foreground-tty false --database.check-version true
RETVAL=$?
if [ "$RETVAL" -eq 0 ]; then
$DAEMON -c $CONF --uid arangodb --gid arangodb --pid-file "$PIDFILE" --temp-path "/var/tmp/arangod" --log.foreground-tty no --supervisor $@
$DAEMON -c $CONF --uid arangodb --gid arangodb --pid-file "$PIDFILE" --temp-path "/var/tmp/arangod" --log.foreground-tty false --supervisor true $@
RETVAL=$?
log_end_msg $RETVAL
else

View File

@ -36,14 +36,16 @@ start() {
ulimit -S -n 131072 || true
if [ "$1" = "--upgrade" ]; then
$ARANGO_BIN --uid arangodb --gid arangodb $@
# remove unsupported option --upgrade but pass --database.auto-upgrade to arangod
shift
$ARANGO_BIN --uid arangodb --gid arangodb --database.auto-upgrade true $@
RETVAL=$?
else
$ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version
$ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version true
RETVAL=$?
if test $RETVAL -eq 0; then
$ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --pid-file "$pidfile" --temp.path "/var/tmp/arangod" --supervisor $@
$ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --pid-file "$pidfile" --temp.path "/var/tmp/arangod" --supervisor true $@
RETVAL=$?
else
echo "database version check failed, maybe need to run 'upgrade'?"

View File

@ -56,14 +56,16 @@ start () {
ulimit -S -n 131072 || true
if [ "$1" = "--upgrade" ]; then
$ARANGO_BIN --uid arangodb --gid arangodb $@
# remove unsupported option --upgrade but pass --database.auto-upgrade to arangod
shift
$ARANGO_BIN --uid arangodb --gid arangodb --database.auto-upgrade true $@
rc_status -v
else
$ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version
$ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version true
RETVAL=$?
if test $RETVAL -eq 0; then
startproc $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --pid-file "$ARANGO_PIDFILE" --temp.path "/var/tmp/arangod" --supervisor $@
startproc $ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --pid-file "$ARANGO_PIDFILE" --temp.path "/var/tmp/arangod" --supervisor true $@
rc_status -v
else
echo "database version check failed, maybe need to run 'upgrade'?"

View File

@ -56,14 +56,16 @@ start () {
ulimit -S -n 131072 || true
if [ "$1" = "--upgrade" ]; then
$ARANGO_BIN --uid arangodb --gid arangodb $@
# remove unsupported option --upgrade but pass --database.auto-upgrade to arangod
shift
$ARANGO_BIN --uid arangodb --gid arangodb --database.auto-upgrade true $@
rc_status -v
else
$ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version
$ARANGO_BIN --uid arangodb --gid arangodb --log.foreground-tty false --database.check-version true
RETVAL=$?
if test $RETVAL -eq 0; then
startproc $ARANGO_BIN --uid arangodb --gid arangodb --pid-file "$ARANGO_PIDFILE" --temp.path "/var/tmp/arangod" --log.foreground-tty false --supervisor $@
startproc $ARANGO_BIN --uid arangodb --gid arangodb --pid-file "$ARANGO_PIDFILE" --temp.path "/var/tmp/arangod" --log.foreground-tty false --supervisor true $@
rc_status -v
else
echo "database version check failed, maybe need to run 'upgrade'?"