Dan Kenigsberg has submitted this change and it was merged.
Change subject: logging: Improve log level alignment
......................................................................
logging: Improve log level alignment
Shorten WARNING to WARN and CRITICAL to CRIT to make log messages align
nicer.
Here is an example log:
2016-09-23 02:18:32,060 INFO (MainThread) [vds] (PID: 26597) I am the actual vdsm
4.18.999-606.gitd60b2e8.el7
voodoo6.tlv.redhat.com (3.10.0-489.el7.x86_64) (vdsm:150)
2016-09-23 02:18:32,060 INFO (MainThread) [vds] VDSM will run with cpu affinity:
frozenset([1]) (vdsm:256)
2016-09-23 02:18:32,126 INFO (MainThread) [storage.check] Starting check service
(check:91)
2016-09-23 02:18:32,130 INFO (MainThread) [storage.Dispatcher] Starting
StorageDispatcher... (dispatcher:47)
2016-09-23 02:18:32,130 INFO (check/loop) [storage.asyncevent] Starting <EventLoop
running=True closed=False at 0x33217616> (asyncevent:122)
2016-09-23 02:18:32,218 INFO (MainThread) [dispatcher] Run and protect:
registerDomainStateChangeCallback(callbackFunc=<functools.partial object at
0x2809a48>) (logUtils:49)
2016-09-23 02:18:32,218 INFO (MainThread) [dispatcher] Run and protect:
registerDomainStateChangeCallback, Return response: None (logUtils:52)
2016-09-23 02:18:32,218 INFO (MainThread) [MOM] Preparing MOM interface (momIF:49)
2016-09-23 02:18:32,219 INFO (MainThread) [MOM] Using named unix socket
/var/run/vdsm/mom-vdsm.sock (momIF:58)
2016-09-23 02:18:32,219 INFO (MainThread) [root] Unregistering all secrets (secret:91)
2016-09-23 02:18:32,224 INFO (MainThread) [vds] Setting channels' timeout to 30
seconds. (vmchannels:223)
2016-09-23 02:18:32,226 INFO (MainThread) [vds.MultiProtocolAcceptor] Listening at
:::54321 (protocoldetector:178)
2016-09-23 02:18:32,424 INFO (clientIFinit) [vds] recovery [1:1/1]: recovered domain
45b59cae-f2a0-4d83-8da8-b7c0a21fbe14 from libvirt (recovery:178)
2016-09-23 02:18:32,424 INFO (clientIFinit) [vds] recovery: waiting for 1 domains to go
up (clientIF:545)
2016-09-23 02:18:32,424 INFO (Thread-11) [virt.vm]
vmId=`45b59cae-f2a0-4d83-8da8-b7c0a21fbe14`::VM wrapper has started (vm:1751)
2016-09-23 02:18:32,425 INFO (Thread-11) [dispatcher] Run and protect:
getVolumeSize(sdUUID=u'5f35b5c0-17d7-4475-9125-e97f1cdb06f9',
spUUID=u'f9374c0e-ae24-4bc1-a596-f61d5f05bc5f',
imgUUID=u'3bdc1ff7-22f9-4263-8955-7e3bfa540edc',
volUUID=u'7e159928-0e2f-423a-a02d-3faddbf55585', options=None) (logUtils:49)
2016-09-23 02:18:33,022 ERROR (Thread-11) [storage.StorageDomainCache] looking for
unfetched domain 5f35b5c0-17d7-4475-9125-e97f1cdb06f9 (sdc:151)
2016-09-23 02:18:33,022 ERROR (Thread-11) [storage.StorageDomainCache] looking for domain
5f35b5c0-17d7-4475-9125-e97f1cdb06f9 (sdc:168)
2016-09-23 02:18:33,153 INFO (Thread-11) [storage.LVM] Refreshing lvs:
vg=5f35b5c0-17d7-4475-9125-e97f1cdb06f9 lvs=['metadata'] (lvm:1226)
2016-09-23 02:18:33,425 INFO (clientIFinit) [vds] recovery: waiting for 1 domains to go
up (clientIF:545)
2016-09-23 02:18:33,445 INFO (Thread-11) [storage.LVM] Refreshing lvs:
vg=5f35b5c0-17d7-4475-9125-e97f1cdb06f9 lvs=['ids'] (lvm:1226)
2016-09-23 02:18:33,470 INFO (hsm/init) [storage.LVM] Refreshing lvs:
vg=5f35b5c0-17d7-4475-9125-e97f1cdb06f9 lvs=['ids', 'master',
'inbox', 'metadata', 'outbox', 'leases'] (lvm:677)
2016-09-23 02:18:33,547 INFO (Thread-11) [storage.LVM] Refreshing lvs:
vg=5f35b5c0-17d7-4475-9125-e97f1cdb06f9 lvs=['leases'] (lvm:1226)
2016-09-23 02:18:33,670 INFO (Thread-11) [storage.LVM] Refreshing lvs:
vg=5f35b5c0-17d7-4475-9125-e97f1cdb06f9 lvs=['metadata', 'leases',
'ids', 'inbox', 'outbox', 'master'] (lvm:1226)
2016-09-23 02:18:33,829 INFO (Thread-11) [dispatcher] Run and protect: getVolumeSize,
Return response: {'truesize': '1073741824', 'apparentsize':
'1073741824'} (logUtils:52)
2016-09-23 02:18:33,829 INFO (Thread-11) [dispatcher] Run and protect:
getVolumeSize(sdUUID=u'5f35b5c0-17d7-4475-9125-e97f1cdb06f9',
spUUID=u'f9374c0e-ae24-4bc1-a596-f61d5f05bc5f',
imgUUID=u'65e74f9f-a41b-4636-8e72-db3dd7d73055',
volUUID=u'3a9f341b-4149-4794-88d6-4fd12ff84307', options=None) (logUtils:49)
2016-09-23 02:18:33,830 INFO (Thread-11) [dispatcher] Run and protect: getVolumeSize,
Return response: {'truesize': '7650410496', 'apparentsize':
'7650410496'} (logUtils:52)
2016-09-23 02:18:33,830 INFO (Thread-11) [dispatcher] Run and protect:
getVolumeSize(sdUUID=u'5f35b5c0-17d7-4475-9125-e97f1cdb06f9',
spUUID=u'f9374c0e-ae24-4bc1-a596-f61d5f05bc5f',
imgUUID=u'69107a7c-acd6-44b0-a481-e7ec13486847',
volUUID=u'88816475-3ea1-4d1f-ac93-7767cf9a2d2c', options=None) (logUtils:49)
2016-09-23 02:18:33,830 INFO (Thread-11) [dispatcher] Run and protect: getVolumeSize,
Return response: {'truesize': '1073741824', 'apparentsize':
'1073741824'} (logUtils:52)
2016-09-23 02:18:33,848 INFO (Thread-11) [virt.vm]
vmId=`45b59cae-f2a0-4d83-8da8-b7c0a21fbe14`::Starting connection (guestagent:234)
2016-09-23 02:18:33,849 INFO (Thread-11) [virt.vm]
vmId=`45b59cae-f2a0-4d83-8da8-b7c0a21fbe14`::CPU running: domain initialization (vm:4653)
2016-09-23 02:18:33,873 WARN (Thread-11) [vds] Not ready yet, ignoring event
u'|virt|VM_status|45b59cae-f2a0-4d83-8da8-b7c0a21fbe14'
args={u'45b59cae-f2a0-4d83-8da8-b7c0a21fbe14': {'status': 'Up',
'displayInfo': [{'tlsPort': u'5900', 'ipAddress':
'10.35.0.110', 'type': u'spice', 'port': '-1'}],
'hash': '-6596881514735067770', 'displayIp':
'10.35.0.110', 'displayPort': '-1', 'displaySecurePort':
u'5900', 'timeOffset': u'0', 'pauseCode': 'NOERR',
'vcpuQuota': '-1', 'cpuUser': '0.00',
'monitorResponse': '0', 'elapsedTime': '199491',
'displayType': 'qxl', 'cpuSys': '0.00',
'clientIp': '', 'vcpuPeriod': 100000L}} (clientIF:157)
2016-09-23 02:18:34,276 INFO (hsm/init) [storage.LVM] Refreshing lvs:
vg=bb85ee2f-d674-489f-9377-3eb1f176e8fb lvs=['metadata', 'outbox',
'ids', 'leases', 'master', 'inbox'] (lvm:677)
2016-09-23 02:18:34,320 INFO (BindingXMLRPC) [vds] XMLRPC server running
(bindingxmlrpc:63)
2016-09-23 02:18:34,321 INFO (Reactor thread) [ProtocolDetector.AcceptorImpl] Accepting
connection from ::ffff:10.35.0.102:50389 (protocoldetector:71)
2016-09-23 02:18:34,324 INFO (MainThread) [health] Starting health monitor (interval=60)
(health:64)
2016-09-23 02:18:34,333 INFO (Reactor thread) [ProtocolDetector.Detector] Detected
protocol stomp from ::ffff:10.35.0.102:50389 (protocoldetector:120)
2016-09-23 02:18:34,334 INFO (jsonrpc/0) [jsonrpc.JsonRpcServer] In recovery, ignoring
'Host.getAllVmStats' in bridge with {} (__init__:527)
2016-09-23 02:18:34,334 INFO (jsonrpc/0) [jsonrpc.JsonRpcServer] RPC call
Host.getAllVmStats failed (error 99) in 0.00 seconds (__init__:515)
2016-09-23 02:18:34,427 INFO (clientIFinit) [dispatcher] Run and protect:
getConnectedStoragePoolsList(options=None) (logUtils:49)
Change-Id: Ia18649258f145f974fd4a8f7a96b5849c4a77938
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com>
Reviewed-on:
https://gerrit.ovirt.org/64217
Continuous-Integration: Jenkins CI
Reviewed-by: Milan Zamazal <mzamazal(a)redhat.com>
Reviewed-by: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Reviewed-by: Dan Kenigsberg <danken(a)redhat.com>
---
M README.logging
M static/etc/vdsm/logger.conf.in
M tests/run_tests_local.sh.in
M vdsm/vdsm
4 files changed, 13 insertions(+), 8 deletions(-)
Approvals:
Piotr Kliczewski: Looks good to me, but someone else must approve
Nir Soffer: Verified
Jenkins CI: Passed CI tests
Dan Kenigsberg: Looks good to me, approved
Milan Zamazal: Looks good to me, but someone else must approve
--
To view, visit
https://gerrit.ovirt.org/64217
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia18649258f145f974fd4a8f7a96b5849c4a77938
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Adam Litke <alitke(a)redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com>
Gerrit-Reviewer: Edward Haas <edwardh(a)redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Milan Zamazal <mzamazal(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Yaniv Bronhaim <ybronhei(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>