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

Daemon: try harder (up to 5 times) to get lock

Browse Source
This commit is contained in:
Dietmar Maurer 2014-12-31 10:07:24 +01:00
parent b192b93018
commit 3206cdf677
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data/PVE/Daemon.pm
View File

@ -35,19 +35,32 @@ $ENV{'PATH'} = '/sbin:/bin:/usr/sbin:/usr/bin';
my $daemon_initialized = 0; # we only allow one instance my $daemon_initialized = 0; # we only allow one instance
my $close_daemon_lock = sub {
my ($self) = @_;
close $self->{daemon_lock_fh};
delete $self->{daemon_lock_fh};
};
my $lockpidfile = sub { my $lockpidfile = sub {
my ($self) = @_; my ($self) = @_;
my $lkfn = $self->{pidfile} . ".lock"; my $lkfn = $self->{pidfile} . ".lock";
if (!open (FLCK, ">>$lkfn")) { $self->{daemon_lock_fh} = IO::File->new(">>$lkfn");
if (!$self->{daemon_lock_fh}) {
my $msg = "can't aquire lock on file '$lkfn' - $!"; my $msg = "can't aquire lock on file '$lkfn' - $!";
syslog ('err', $msg); syslog ('err', $msg);
die "ERROR: $msg\n"; die "ERROR: $msg\n";
} }
if (!flock (FLCK, LOCK_EX|LOCK_NB)) { for (my $i = 0; $i < 5; $i ++) {
close (FLCK); return if flock ($self->{daemon_lock_fh}, LOCK_EX|LOCK_NB);
sleep(1);
}
if (!flock ($self->{daemon_lock_fh}, LOCK_EX|LOCK_NB)) {
&$close_daemon_lock($self);
my $msg = "can't aquire lock '$lkfn' - $!"; my $msg = "can't aquire lock '$lkfn' - $!";
syslog ('err', $msg); syslog ('err', $msg);
die "ERROR: $msg\n"; die "ERROR: $msg\n";
@ -116,7 +129,7 @@ my $start_workers = sub {
} else { } else {
$0 = "$self->{name} worker"; $0 = "$self->{name} worker";
close(FLCK); &$close_daemon_lock($self);
PVE::INotify::inotify_close(); PVE::INotify::inotify_close();