Change in vdsm[master]: Extend vdsm-tool: moving configure libvirt to external shell...

zhshzhou at linux.vnet.ibm.com zhshzhou at linux.vnet.ibm.com
Mon Jul 1 07:53:32 UTC 2013


Zhou Zheng Sheng has posted comments on this change.

Change subject: Extend vdsm-tool: moving configure libvirt to external shell script
......................................................................


Patch Set 12: I would prefer that you didn't submit this

(2 inline comments)

I think there maybe a rebase problem.

....................................................
File lib/vdsm/tool/libvirt_configure.sh.in
Line 217:     set_if_default $ldconf LIBVIRTD_ARGS --listen
Line 218:     set_if_default $ldconf DAEMON_COREFILE_LIMIT unlimited
Line 219:     set_if_default $qconf save_image_format \"lzop\"
Line 220:     # FIXME until we are confident with libvirt integration, let us have a verbose log
Line 221:     set_if_default $lconf log_outputs \"1:file:/var/log/libvirtd.log\"
Did you get any conflicts when rebasing to the lastest master? In fe01963f8 "vdsmd.init: ajust libvirt log file", this line in vdsmd.init.in is changed to follow.

 -    set_if_default $lconf log_outputs \"1:file:/var/log/libvirtd.log\"
 +    set_if_default $lconf log_outputs \"1:file:/var/log/libvirt/libvirtd.log\"

And in this patch we move this piece to another place. git should report a conflict in vdsmd.init.in . The correct solution in this patch is update the above line with it's new version from vdsmd.init.in.
Line 222:     set_if_default $lconf log_filters "\"3:virobject 3:virfile 2:virnetlink \
Line 223:     3:cgroup 3:event 3:json 1:libvirt 1:util 1:qemu\""
Line 224: 
Line 225:     # If the ssl flag is set, update the libvirt and qemu configuration files


Line 259:     local llogr=/etc/logrotate.d/libvirtd
Line 260:     local stanza=`mktemp`
Line 261:     /bin/cat > "$stanza" <<EOF
Line 262: # vdsm
Line 263: /var/log/libvirtd.log {
Same as line 221.
Line 264:     rotate 100
Line 265:     missingok
Line 266:     copytruncate
Line 267:     size 15M


-- 
To view, visit http://gerrit.ovirt.org/15216
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Id58b129afbf141a47a85b421961bf5b1776b41e4
Gerrit-PatchSet: 12
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Bala.FA <barumuga at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Giuseppe Vallarelli <gvallare at redhat.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei at redhat.com>
Gerrit-Reviewer: Zhou Zheng Sheng <zhshzhou at linux.vnet.ibm.com>
Gerrit-Reviewer: oVirt Jenkins CI Server


More information about the vdsm-patches mailing list