4 Dec
2018
4 Dec
'18
3:11 p.m.
Module: check_mk
Branch: master
Commit: 9c19e2473d44961f6279562063a4a87b605f01da
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9c19e2473d4496…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 4 14:03:43 2018 +0100
Add debug log entries for file locking logic
Change-Id: I5cf8fc5da1eca139edfa2b158aa1fcc58b8ffd3b
---
cmk/store.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/cmk/store.py b/cmk/store.py
index 9634c12..3b53c23 100644
--- a/cmk/store.py
+++ b/cmk/store.py
@@ -36,9 +36,12 @@ import time
import pathlib2 as pathlib
+import cmk.log
from cmk.exceptions import MKGeneralException, MKTimeout
from cmk.i18n import _
+logger = cmk.log.get_logger("store")
+
# TODO: Make all methods handle paths the same way. e.g. mkdir() and makedirs()
# care about encoding a path to UTF-8. The others don't to that.
@@ -274,6 +277,8 @@ def aquire_lock(path, blocking=True):
if path in g_locked_paths:
return True # No recursive locking
+ logger.debug("Try aquire lock on %s", path)
+
# Create file (and base dir) for locking if not existant yet
if not os.path.exists(os.path.dirname(path)):
os.makedirs(os.path.dirname(path), mode=0770)
@@ -295,6 +300,8 @@ def aquire_lock(path, blocking=True):
os.close(fd)
fd = fd_new
+ logger.debug("Got lock on %s", path)
+
g_aquired_locks.append((path, fd))
g_locked_paths.append(path)
@@ -314,6 +321,8 @@ def release_lock(path):
if path not in g_locked_paths:
return # no unlocking needed
+ logger.debug("Releasing lock on %s", path)
+
for lock_path, fd in g_aquired_locks:
if lock_path != path:
continue
@@ -330,6 +339,7 @@ def release_lock(path):
break
g_locked_paths.remove(path)
+ logger.debug("Released lock on %s", path)
def have_lock(path):
@@ -338,6 +348,9 @@ def have_lock(path):
def release_all_locks():
global g_aquired_locks, g_locked_paths
+ logger.debug("Releasing all locks")
+ logger.debug("g_aquired_locks: %r", g_aquired_locks)
+ logger.debug("g_locked_paths: %r", g_locked_paths)
for path, _unused_fd in g_aquired_locks:
release_lock(path)