Dan Kenigsberg has posted comments on this change.
Change subject: Removing libvirt_configure from pre-start and ask for manual run
......................................................................
Patch Set 2:
(3 comments)
....................................................
File init/sysvinit/vdsmd.init.in
Line 132: shutdown_conflicting_srv "${CONFLICTING_SERVICES}"
Line 133:
Line 134: start_needed_srv "${NEEDED_SERVICES}"
Line 135:
Line 136: "${VDSMD_INIT_COMMON}" --pre-start || return 1
The alternative, of putting the following lines in an "else" block, is not
better imo.
Line 137:
Line 138: echo $"Starting up vdsm daemon: "
Line 139: NICELEVEL="${NICE_LOWEST}" daemon --user=vdsm
"@VDSMDIR@/daemonAdapter" \
Line 140: -0 /dev/null -1 /dev/null -2 /dev/null --syslog
"@VDSMDIR@/respawn" --minlifetime 10 \
....................................................
File init/vdsmd_init_common.sh.in
Line 205: case "$1" in
Line 206: --pre-start)
Line 207: run_tasks " \
Line 208: run_init_hooks gencerts check_libvirt_configure \
Line 209: reconfigure_sanlock syslog_available nwfilter dummybr \
Usually I love multiple patches, but the problem with reconfigure_sanlock is the same,
right? Let's fix it in this patch.
Line 210: load_needed_modules tune_system mkdirs test_space test_lo \
Line 211: test_conflicting_conf"
Line 212: ;;
Line 213: --post-stop)
....................................................
File lib/vdsm/tool/libvirt_configure.sh.in
Line 196: # - not configured
Line 197: #
Line 198: if [ "${force_reconfigure}" != "--force" ] && \
Line 199: ! [ -f "${FORCE_RECONFIGURE}" ] && \
Line 200: is_already_configured "${lconf}" "${qconf}"
"${ldconf}" "${glconf}"; then
q became g?
Line 201: echo "Not forcing reconfigure"
Line 202: return 0
Line 203: fi
Line 204:
--
To view, visit
http://gerrit.ovirt.org/19737
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Icf70a749454ea341d5b52220e16e9567b90431a0
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes