mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-22 06:01:54 +00:00
Code Issues Releases Wiki Activity

locking: more logging

Browse source 
(cherry picked from commit f86bf8a0a8)
This commit is contained in:
Thomas Waldmann 2018-07-15 15:58:15 +02:00
parent a51fca49bf
commit 3417de85e0
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/borg/locking.py
View file

@ -1,3 +1,4 @@
import errno
import json import json
import os import os
import time import time
@ -163,7 +164,7 @@ def kill_stale_lock(self):
thread = int(thread_str) thread = int(thread_str)
except ValueError: except ValueError:
# Malformed lock name? Or just some new format we don't understand? # Malformed lock name? Or just some new format we don't understand?
# It's safer to just exit. logger.error("Found malformed lock %s in %s. Please check/fix manually.", name, self.path)
return False return False
if platform.process_alive(host, pid, thread): if platform.process_alive(host, pid, thread):
@ -172,7 +173,7 @@ def kill_stale_lock(self):
if not self.kill_stale_locks: if not self.kill_stale_locks:
if not self.stale_warning_printed: if not self.stale_warning_printed:
# Log this at warning level to hint the user at the ability # Log this at warning level to hint the user at the ability
logger.warning("Found stale lock %s, but not deleting because BORG_HOSTNAME_IS_UNIQUE is not set.", name) logger.warning("Found stale lock %s, but not deleting because BORG_HOSTNAME_IS_UNIQUE is False.", name)
self.stale_warning_printed = True self.stale_warning_printed = True
return False return False
@ -188,10 +189,12 @@ def kill_stale_lock(self):
try: try:
os.rmdir(self.path) os.rmdir(self.path)
except OSError: except OSError as err:
# Directory is not empty = we lost the race to somebody else if err.errno == errno.ENOTEMPTY:
# Permission denied = we cannot operate anyway # Directory is not empty = we lost the race to somebody else
# other error like EIO = we cannot operate and it's unsafe too. return False
# EACCES or EIO or ... = we cannot operate anyway
logger.error('Failed to remove lock dir: %s', str(err))
return False return False
return True return True
@ -242,7 +245,8 @@ def load(self):
if platform.process_alive(host, pid, thread): if platform.process_alive(host, pid, thread):
elements.add((host, pid, thread)) elements.add((host, pid, thread))
else: else:
logger.warning('Removed stale %s roster lock for pid %d.', key, pid) logger.warning('Removed stale %s roster lock for host %s pid %d thread %d.',
key, host, pid, thread)
data[key] = list(elements) data[key] = list(elements)
except (FileNotFoundError, ValueError): except (FileNotFoundError, ValueError):
# no or corrupt/empty roster file? # no or corrupt/empty roster file?