SimCluster: setup status dir inside new

This commit is contained in:
Dietmar Maurer 2014-12-04 12:08:15 +01:00
parent 621f071e11
commit 787b66eb7b
2 changed files with 22 additions and 13 deletions

View File

@ -7,12 +7,23 @@ use Data::Dumper;
use JSON;
use IO::File;
use Fcntl qw(:DEFAULT :flock);
use File::Copy;
use File::Path qw(make_path remove_tree);
my $max_sim_time = 1000;
use PVE::HA::SimEnv;
use PVE::HA::Server;
# Status directory layout
#
# configuration
#
# $testdir/cmdlist Command list for simulation
#
# runtime status
# $testdir/status/
sub read_cluster_status_nolock {
my ($self) = @_;
@ -41,7 +52,10 @@ sub new {
my $self = bless {}, $class;
$self->{statusdir} = "$testdir/status";
my $statusdir = $self->{statusdir} = "$testdir/status";
remove_tree($statusdir);
mkdir $statusdir;
$self->{cur_time} = 0;
@ -52,6 +66,13 @@ sub new {
$self->{cmdlist} = []; # fixme: interactive mode
}
# copy initial configuartion
copy("$testdir/manager_status", "$statusdir/manager_status"); # optional
copy("$testdir/service_status", "$statusdir/service_status"); # optional
copy("$testdir/cluster_status", "$statusdir/cluster_status") ||
"Copy failed: $!";
$self->{loop_count} = 0;
my $cstatus = $self->read_cluster_status_nolock();

View File

@ -25,18 +25,6 @@ sub run_test {
$dir =~ s!/+$!!;
print "run: $dir\n";
my $statusdir = "$dir/status";
remove_tree($statusdir);
mkdir $statusdir;
if (-f "$dir/manager_status") {
system("cp $dir/manager_status $statusdir/manager_status");
}
if (-f "$dir/service_status") {
system("cp $dir/service_status $statusdir/service_status");
}
system("cp $dir/cluster_status $statusdir/cluster_status");
my $logfile = "$dir/log";
my $logexpect = "$logfile.expect";