proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-27 06:34:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Daemon: do not wait for lock on restart

Browse Source
This commit is contained in:
Dietmar Maurer 2014-12-31 17:01:51 +01:00
parent c56111950d
commit 48876459cb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/PVE/Daemon.pm
View File

@ -65,12 +65,15 @@ my $lockpidfile = sub {
my $lkfn = $self->{pidfile} . ".lock"; my $lkfn = $self->{pidfile} . ".lock";
my $waittime = 0;
if (my $fd = $self->{env_pve_lock_fd}) { if (my $fd = $self->{env_pve_lock_fd}) {
$self->{daemon_lock_fh} = IO::Handle->new_from_fd($fd, "a"); $self->{daemon_lock_fh} = IO::Handle->new_from_fd($fd, "a");
} else { } else {
$waittime = 5;
$self->{daemon_lock_fh} = IO::File->new(">>$lkfn"); $self->{daemon_lock_fh} = IO::File->new(">>$lkfn");
} }
@ -78,7 +81,7 @@ my $lockpidfile = sub {
die "can't open lock '$lkfn' - $!\n"; die "can't open lock '$lkfn' - $!\n";
} }
for (my $i = 0; $i < 5; $i ++) { for (my $i = 0; $i < $waittime; $i ++) {
return if flock ($self->{daemon_lock_fh}, LOCK_EX|LOCK_NB); return if flock ($self->{daemon_lock_fh}, LOCK_EX|LOCK_NB);
sleep(1); sleep(1);
} }