From b6d5c95818cbc98b5c325df396d0092b32c87af5 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Sat, 21 May 2016 08:55:16 +0800 Subject: [PATCH] rest patch add lock protection for download repodata using multi-threads Change-Id: Iec790e275c22165108a1564131f7c74e91e29acb --- createrepomddeps | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/createrepomddeps b/createrepomddeps index 631f31e..1e9f624 100755 --- a/createrepomddeps +++ b/createrepomddeps @@ -88,16 +88,7 @@ for my $url (@ARGV) { $dir = "$cachedir/$repoid/"; $baseurl .= '/' unless $baseurl =~ /\/$/; mkpath("${dir}repodata"); - my $lock_file = $dir . 'repodata/down_repomd.lock'; - open(my $lfh, '>>', $lock_file) or die "Could not open '$lock_file' - $!"; - flock($lfh, LOCK_EX); - if (!-f "${dir}repodata/repomd.xml") { - if (system($INC[0].'/download', "${dir}repodata", "${baseurl}repodata/repomd.xml")) { - close($lfh) or die "Could not write '$lock_file' - $!"; - die("get metadata failed\n"); - } - } - close($lfh) or die "Could not write '$lock_file' - $!"; + system($INC[0].'/download', "${dir}repodata", "${baseurl}repodata/repomd.xml"); } else { $dir = $url; } @@ -121,9 +112,6 @@ for my $url (@ARGV) { utf8::downgrade($u); } my $cached; - my $lock_file = $dir . "repodata/down_primary.lock"; - open(my $lfh, '>>', $lock_file) or die "Could not open '$lock_file' - $!"; - flock($lfh, LOCK_EX); if (-e $u) { $cached = 1; $cached = 0 if exists($f->{'size'}) && $f->{'size'} != (-s _); @@ -139,7 +127,6 @@ for my $url (@ARGV) { die("inconsistent repodata in $url\n"); } } - close($lfh) or die "Could not write '$lock_file' - $!"; my $fh; open($fh, '<', $u) or die "Error opening $u: $!\n"; -- 2.7.4