From f2460699ab7f972b1981d072164a04820c52b0c6 Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Thu, 28 Oct 2010 15:19:14 +0100 Subject: Ensure atomic creation of a cached appliance Cached appliances are discovered by their predictable path. Previously we were creating a cached appliance directly in this predictable path. This had at least 2 undesirable effects: * Interrupting appliance creation would leave a corrupt appliance * 2 processes could simultaneously attempt to create the same appliance, causing corruption. This patch causes the cached appliance to be created in a temporary directory, and then renamed to the predictable path. As rename is an atomic operation, this makes the whole creation atomic. This patch also changes the predictable path to have a prefix of 'guestfs.'. This will make it simpler for system administrators to clean up old cached appliances. This patch resolves RHBZ#639405 --- regressions/Makefile.am | 1 + regressions/test-launch-race.pl | 60 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100755 regressions/test-launch-race.pl (limited to 'regressions') diff --git a/regressions/Makefile.am b/regressions/Makefile.am index b7e28161..c9156f99 100644 --- a/regressions/Makefile.am +++ b/regressions/Makefile.am @@ -38,6 +38,7 @@ TESTS = \ test-find0.sh \ test-guestfish-a.sh \ test-guestfish-d.sh \ + test-launch-race.pl \ test-luks.sh \ test-lvm-filtering.sh \ test-lvm-mapping.pl \ diff --git a/regressions/test-launch-race.pl b/regressions/test-launch-race.pl new file mode 100755 index 00000000..941eff6c --- /dev/null +++ b/regressions/test-launch-race.pl @@ -0,0 +1,60 @@ +#!/usr/bin/perl +# Copyright (C) 2010 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# Test that 2 simultaneous launches in a clean cache directory will both succeed + +use strict; +use warnings; + +use File::Temp qw(tempdir); +use POSIX; + +use Sys::Guestfs; + +# Use a temporary TMPDIR to ensure it's clean +my $tmpdir = tempdir (CLEANUP => 1); +$ENV{TMPDIR} = $tmpdir; + +my $testimg = $tmpdir.'/test.img'; +system ("touch $testimg"); + +my $pid = fork(); +die ("fork failed: $!") if ($pid < 0); + +if ($pid == 0) { + my $g = Sys::Guestfs->new (); + $g->add_drive ($testimg); + $g->launch (); + _exit (0); +} + +my $g = Sys::Guestfs->new (); +$g->add_drive ($testimg); +$g->launch (); +$g = undef; + +waitpid ($pid, 0) or die ("waitpid: $!"); +die ("child failed") unless ($? == 0); + +# Check that only 1 temporary cache directory was created +my $dh; +opendir ($dh, $tmpdir) or die ("Failed to open $tmpdir: $!"); +my @cachedirs = grep { /^guestfs\./ } readdir ($dh); +closedir ($dh) or die ("Failed to close $tmpdir: $!"); + +my $ncachedirs = scalar(@cachedirs); +die ("Expected 1 cachedir, found $ncachedirs") unless ($ncachedirs == 1); -- cgit