New subject: Change in vdsm[master]: logging: Use 'Storage' log handler for logging storage reports

Thursday, 30 January 2014

Nir Soffer has uploaded a new change for review.

Change subject: logging: Enable all storage loggers
......................................................................

logging: Enable all storage loggers

Only loggers mentioned in logger.conf, or their child loggers are used
by the logging system. This make debugging the code much harder.

This patch enable 23 storage loggers by making them child loggers of the
Storage logger.

If we want to disable some loggers, the proper place to do it is in
logger.conf.

Change-Id: I1dd8cd29377b12dc290f90b7c6bf314d5624a830
Signed-off-by: Nir Soffer <nsoffer(a)redhat.com&gt;
---
M vdsm/storage/blockSD.py
M vdsm/storage/clusterlock.py
M vdsm/storage/fileSD.py
M vdsm/storage/misc.py
M vdsm/storage/remoteFileHandler.py
M vdsm/storage/resourceManager.py
M vdsm/storage/storageServer.py
M vdsm/storage/task.py
M vdsm/storage/taskManager.py
M vdsm/storage/threadPool.py
10 files changed, 23 insertions(+), 23 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/23924/1

diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 55bd796..35c4f45 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -277,7 +277,7 @@
 
 
 class VGTagMetadataRW(object):
-    log = logging.getLogger("storage.Metadata.VGTagMetadataRW")
+    log = logging.getLogger("Storage.Metadata.VGTagMetadataRW")
     METADATA_TAG_PREFIX = "MDT_"
     METADATA_TAG_PREFIX_LEN = len(METADATA_TAG_PREFIX)
 
@@ -320,7 +320,7 @@
     """
     Block Storage Domain metadata implementation
     """
-    log = logging.getLogger("storage.Metadata.LvMetadataRW")
+    log = logging.getLogger("Storage.Metadata.LvMetadataRW")
 
     def __init__(self, vgName, lvName, offset, size):
         self._size = size
diff --git a/vdsm/storage/clusterlock.py b/vdsm/storage/clusterlock.py
index f7e7fb6..83b2b9f 100644
--- a/vdsm/storage/clusterlock.py
+++ b/vdsm/storage/clusterlock.py
@@ -47,7 +47,7 @@
 
 
 class SafeLease(object):
-    log = logging.getLogger("SafeLease")
+    log = logging.getLogger("Storage.SafeLease")
 
     lockUtilPath = config.get('irs', 'lock_util_path')
     lockCmd = config.get('irs', 'lock_cmd')
@@ -137,7 +137,7 @@
             self.log.debug("Cluster lock released successfully")
 
 
-initSANLockLog = logging.getLogger("initSANLock")
+initSANLockLog = logging.getLogger("Storage.initSANLock")
 
 
 def initSANLock(sdUUID, idsPath, leasesPath):
@@ -154,7 +154,7 @@
 
 
 class SANLock(object):
-    log = logging.getLogger("SANLock")
+    log = logging.getLogger("Storage.SANLock")
 
     _sanlock_fd = None
     _sanlock_lock = threading.Lock()
@@ -290,7 +290,7 @@
 
 
 class LocalLock(object):
-    log = logging.getLogger("LocalLock")
+    log = logging.getLogger("Storage.LocalLock")
 
     LVER = 0
 
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index 180a43f..98bb909 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -616,7 +616,7 @@
 
 
 def scanDomains(pattern="*"):
-    log = logging.getLogger("scanDomains")
+    log = logging.getLogger("Storage.scanDomains")
 
     mntList = getMountsList(pattern)
 
diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py
index 2c06af3..e464dcd 100644
--- a/vdsm/storage/misc.py
+++ b/vdsm/storage/misc.py
@@ -736,7 +736,7 @@
     Supporting parameters or exception passing to all functions would
     make the code much more complex for no reason.
     """
-    _log = logging.getLogger("SamplingMethod")
+    _log = logging.getLogger("Storage.SamplingMethod")
 
     def __init__(self, func):
         self.__func = func
@@ -866,7 +866,7 @@
 
 class Event(object):
     def __init__(self, name, sync=False):
-        self._log = logging.getLogger("Event.%s" % name)
+        self._log = logging.getLogger("Storage.Event.%s" % name)
         self.name = name
         self._syncRoot = threading.Lock()
         self._registrar = {}
@@ -910,7 +910,7 @@
 
 
 class OperationMutex(object):
-    log = enableLogSkip(logging.getLogger("OperationMutex"),
+    log = enableLogSkip(logging.getLogger("Storage.OperationMutex"),
                         ignoreSourceFiles=[__file__, contextlib.__file__])
 
     def __init__(self):
diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py
index cacafbf..d5a4ff7 100644
--- a/vdsm/storage/remoteFileHandler.py
+++ b/vdsm/storage/remoteFileHandler.py
@@ -217,7 +217,7 @@
 
 
 class PoolHandler(object):
-    log = logging.getLogger("RepoFileHelper.PoolHandler")
+    log = logging.getLogger("Storage.RepoFileHelper.PoolHandler")
 
     def __init__(self):
         myRead, hisWrite = os.pipe()
diff --git a/vdsm/storage/resourceManager.py b/vdsm/storage/resourceManager.py
index 1be1450..64a5e86 100644
--- a/vdsm/storage/resourceManager.py
+++ b/vdsm/storage/resourceManager.py
@@ -168,7 +168,7 @@
     """
     Internal request object, don't use directly
     """
-    _log = logging.getLogger("ResourceManager.Request")
+    _log = logging.getLogger("Storage.ResourceManager.Request")
     namespace = property(lambda self: self._namespace)
     name = property(lambda self: self._name)
     fullName = property(lambda self: "%s.%s" % (self._namespace, self._name))
@@ -190,7 +190,7 @@
 
         # Because findCaller is expensive. We make sure it wll be printed
         # before calculating it
-        if logging.getLogger("ResourceManager.ResourceRef").\
+        if logging.getLogger("Storage.ResourceManager.ResourceRef").\
                 isEnabledFor(logging.WARN):
             createdAt = misc.findCaller(ignoreSourceFiles=[__file__],
                                         logSkipName="ResourceManager")
@@ -266,7 +266,7 @@
     This object will auto release the referenced resource unless autorelease
     is set to `False`
     """
-    _log = logging.getLogger("ResourceManager.ResourceRef")
+    _log = logging.getLogger("Storage.ResourceManager.ResourceRef")
     namespace = property(lambda self: self._namespace)
     name = property(lambda self: self._name)
     fullName = property(lambda self: "%s.%s" % (self._namespace, self._name))
@@ -354,7 +354,7 @@
 
     This class is a singleton. use `getInstance()` to get the global instance
     """
-    _log = logging.getLogger("ResourceManager")
+    _log = logging.getLogger("Storage.ResourceManager")
     _namespaceValidator = re.compile(r"^[\w\d_-]+$")
     _resourceNameValidator = re.compile(r"^[^\s.]+$")
 
@@ -721,7 +721,7 @@
 
 
 class Owner(object):
-    log = logging.getLogger('ResourceManager.Owner')
+    log = logging.getLogger('Storage.ResourceManager.Owner')
 
     def __init__(self, ownerobject, raiseonfailure=False):
         self.ownerobject = ownerobject
diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py
index 786fba4..669dbd0 100644
--- a/vdsm/storage/storageServer.py
+++ b/vdsm/storage/storageServer.py
@@ -163,7 +163,7 @@
 
 
 class MountConnection(object):
-    log = logging.getLogger("StorageServer.MountConnection")
+    log = logging.getLogger("Storage.StorageServer.MountConnection")
     localPathBase = "/tmp"
 
     @property
@@ -514,7 +514,7 @@
 
 
 class ConnectionAliasRegistrar(object):
-    log = logging.getLogger("StorageServer.ConnectionAliasRegistrar")
+    log = logging.getLogger("Storage.StorageServer.ConnectionAliasRegistrar")
 
     def __init__(self, persistDir):
         self._aliases = {}
@@ -616,7 +616,7 @@
 
 
 class ConnectionMonitor(object):
-    _log = logging.getLogger("ConnectionMonitor")
+    _log = logging.getLogger("Storage.ConnectionMonitor")
 
     TAG = "managed"
 
diff --git a/vdsm/storage/task.py b/vdsm/storage/task.py
index 4eff5c1..2837aa8 100644
--- a/vdsm/storage/task.py
+++ b/vdsm/storage/task.py
@@ -440,7 +440,7 @@
         "metadataVersion": int
     }
 
-    log = logging.getLogger('TaskManager.Task')
+    log = logging.getLogger('Storage.TaskManager.Task')
 
     def __init__(self, id, name="", tag="",
                  recovery=TaskRecoveryType.none,
diff --git a/vdsm/storage/taskManager.py b/vdsm/storage/taskManager.py
index ab7f898..0c54426 100644
--- a/vdsm/storage/taskManager.py
+++ b/vdsm/storage/taskManager.py
@@ -28,7 +28,7 @@
 
 
 class TaskManager:
-    log = logging.getLogger('TaskManager')
+    log = logging.getLogger('Storage.TaskManager')
 
     def __init__(self,
                  tpSize=config.getfloat('irs', 'thread_pool_size'),
diff --git a/vdsm/storage/threadPool.py b/vdsm/storage/threadPool.py
index 2eb255e..f59b25c 100644
--- a/vdsm/storage/threadPool.py
+++ b/vdsm/storage/threadPool.py
@@ -25,7 +25,7 @@
     accepts tasks that will be dispatched to the next available
     thread."""
 
-    log = logging.getLogger('Misc.ThreadPool')
+    log = logging.getLogger('Storage.ThreadPool')
 
     def __init__(self, numThreads, waitTimeout=3, maxTasks=100):
 
@@ -175,7 +175,7 @@
 
     """ Pooled thread class. """
 
-    log = logging.getLogger('Misc.ThreadPool.WorkerThread')
+    log = logging.getLogger('Storage.ThreadPool.WorkerThread')
 
     def __init__(self, pool):
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dd8cd29377b12dc290f90b7c6bf314d5624a830
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com&gt;

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Change in vdsm[master]: logging: Enable all storage loggers