Hello Dan Kenigsberg,
I'd like you to do a code review. Please visit
to review the following change.
Change subject: Changing return method from vdsmd start function ......................................................................
Changing return method from vdsmd start function
Change-Id: I24985450addd3feb26687d42be741d9f357dc8c5 Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com Reviewed-on: http://gerrit.ovirt.org/19884 Reviewed-by: Dan Kenigsberg danken@redhat.com --- M init/sysvinit/vdsmd.init.in 1 file changed, 9 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/20578/1
diff --git a/init/sysvinit/vdsmd.init.in b/init/sysvinit/vdsmd.init.in index 2fd222d..efd9c35 100755 --- a/init/sysvinit/vdsmd.init.in +++ b/init/sysvinit/vdsmd.init.in @@ -67,9 +67,11 @@ # When srv is Upstart service, status srv always returns 0 initctl stop "${srv}" || : # stop fails when already down initctl status "${srv}" | grep -q stop/waiting - else + elif [ -x "/etc/init.d/${srv}" ]; then (! service "${srv}" status >/dev/null 2>&1) || service "${srv}" stop + else + true fi fi ret_val=$? @@ -120,28 +122,22 @@ }
start() { - local ret_val - test_already_running && return 0
if [ "${is_coredump}" = "true" ]; then export DAEMON_COREFILE_LIMIT=unlimited echo "${CORE_DUMP_PATH}" > "${CORE_PATTERN}" fi - - shutdown_conflicting_srv "${CONFLICTING_SERVICES}" - - start_needed_srv "${NEEDED_SERVICES}" - - "${VDSMD_INIT_COMMON}" --pre-start + shutdown_conflicting_srv "${CONFLICTING_SERVICES}" || return 1 + start_needed_srv "${NEEDED_SERVICES}" || return 1 + "${VDSMD_INIT_COMMON}" --pre-start || return 1
echo $"Starting up vdsm daemon: " NICELEVEL="${NICE_LOWEST}" daemon --user=vdsm "@VDSMDIR@/daemonAdapter" \ -0 /dev/null -1 /dev/null -2 /dev/null --syslog "@VDSMDIR@/respawn" --minlifetime 10 \ - --daemon --masterpid "${RESPAWNPIDFILE}" "${VDSM_BIN}" --pidfile "${PIDFILE}" - RETVAL=$? - [ "$RETVAL" = 0 ] && touch "${LOCK_FILE}" - return "$RETVAL" + --daemon --masterpid "${RESPAWNPIDFILE}" "${VDSM_BIN}" --pidfile "${PIDFILE}" || return 1 + touch "${LOCK_FILE}" + return 0 }
stop() {
Yaniv Bronhaim has posted comments on this change.
Change subject: Changing return method from vdsmd start function ......................................................................
Patch Set 2: Verified+1 Code-Review+2
Yaniv Bronhaim has submitted this change and it was merged.
Change subject: Changing return method from vdsmd start function ......................................................................
Changing return method from vdsmd start function
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1019360 Change-Id: I24985450addd3feb26687d42be741d9f357dc8c5 Signed-off-by: Yaniv Bronhaim ybronhei@redhat.com Reviewed-on: http://gerrit.ovirt.org/19884 Reviewed-by: Dan Kenigsberg danken@redhat.com Reviewed-on: http://gerrit.ovirt.org/20578 --- M init/sysvinit/vdsmd.init.in 1 file changed, 9 insertions(+), 13 deletions(-)
Approvals: Yaniv Bronhaim: Verified; Looks good to me, approved
vdsm-patches@lists.fedorahosted.org