arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hasn- fix shared_root locking

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12923 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2012-05-24 16:58:09 +00:00
parent cfea72f1ef
commit 517a388f9f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xCAT-server/lib/xcat/plugins/aixinstall.pm
View File

@ -10224,9 +10224,10 @@ sub mkdsklsnode
# try to get a lock if this is shared_root and using
# a shared filesystem
if ($origloc && ($sharedinstall eq "sns")) {
$lockfile = "$origloc/lockfile";
open($SRlock, "<", $lockfile);
my $fl = dirname($origloc);
$lockfile = "$fl/lockfile_$imagehash{$image_name}{shared_root}";
# ex. /install/nim/shared_root/lockfile_71Dskls
open($SRlock, ">>", $lockfile);
flock($SRlock,LOCK_EX);
$locked++;
}
@ -10249,6 +10250,10 @@ sub mkdsklsnode
xCAT::MsgUtils->message("E", $rsp, $callback);
$error++;
push(@nodesfailed, $node);
if ($locked) {
flock($SRlock,LOCK_UN);
close($SRlock);
}
next;
}
@ -11784,8 +11789,10 @@ sub make_SN_resource
# need to set a lock so that some other SN doesn't
# modify anything while we're doing this
#
$lockfile = "$origloc/lockfile";
open($SRlock, "<", $lockfile);
my $fl = dirname($origloc);
$lockfile = "$fl/lockfile_$imghash{$image}{$restype}";
# ex. /install/nim/shared_root/lockfile_71Dskls
open($SRlock, ">>", $lockfile);
flock($SRlock,LOCK_EX);
$locked++;
@ -11841,8 +11848,8 @@ sub make_SN_resource
}
if ( $locked) {
flock($lockfile,LOCK_UN);
close($lockfile);
flock($SRlock,LOCK_UN);
close($SRlock);
}
}
# only make lpp_source for standalone type images