proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-09 15:51:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Output also lockname if it cannot be acquired

Browse Source 
If we can't acquire the lock in lock_file_full and get interrupted
by a signal inqeual to EINTR (e.g. SIGTERM), output also it's name
in the error message to allow better debugging.

Also fix a typo.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2015-12-16 10:38:20 +01:00 committed by Dietmar Maurer
parent e4a1d8e240
commit b148e99f3f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PVE/Tools.pm
View File

@ -131,7 +131,7 @@ sub lock_file_full {
} }
if (!flock ($lock_handles->{$$}->{$filename}, $mode|LOCK_NB)) { if (!flock ($lock_handles->{$$}->{$filename}, $mode|LOCK_NB)) {
print STDERR "trying to aquire lock..."; print STDERR "trying to acquire lock...";
my $success; my $success;
while(1) { while(1) {
$success = flock($lock_handles->{$$}->{$filename}, $mode); $success = flock($lock_handles->{$$}->{$filename}, $mode);
@ -142,7 +142,7 @@ sub lock_file_full {
} }
if (!$success) { if (!$success) {
print STDERR " failed\n"; print STDERR " failed\n";
die "can't aquire lock - $!\n"; die "can't acquire lock '$filename' - $!\n";
} }
print STDERR " OK\n"; print STDERR " OK\n";
} }