Skip to content

handle crash due to kill stale lock race, fixes #5828 #5829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasWaldmann merged 1 commit into from
Jun 9, 2021
Merged

handle crash due to kill stale lock race, fixes #5828 #5829

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/borg/locking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,13 @@ def by_me(self):
return os.path.exists(self.unique_name)

def kill_stale_lock(self):
for name in os.listdir(self.path):
try:
names = os.listdir(self.path)
except FileNotFoundError:
# if another borg process won the race for killing a stale lock, we get here.
return False

for name in names:
try:
host_pid, thread_str = name.rsplit('-', 1)
host, pid_str = host_pid.rsplit('.', 1)
Expand Down