Commit 3dc85819 authored by unknown's avatar unknown

Removed unused "#!remove_datadir"

Cleanup BACKUP dir from clusters datadir in case of test failure
parent b56daa95
...@@ -2573,13 +2573,15 @@ sub after_test_failure ($) { ...@@ -2573,13 +2573,15 @@ sub after_test_failure ($) {
{ {
foreach my $ndbd ( ndbds($cluster) ) foreach my $ndbd ( ndbds($cluster) )
{ {
my $datadir= $ndbd->value('DataDir'); my $data_dir= $ndbd->value('DataDir');
foreach my $fs_dir ( glob("$datadir/ndb_*_fs") ) { foreach my $fs_dir ( glob("$data_dir/ndb_*_fs") ) {
if (-d $fs_dir) { rmtree($fs_dir);
rmtree($fs_dir); mtr_debug("Removing '$fs_dir'");
mtr_debug("Removing '$fs_dir'");
}
} }
my $backup_dir= $ndbd->value('BackupDataDir');
rmtree("$backup_dir/BACKUP");
mtr_debug("Removing '$backup_dir'");
} }
} }
} }
...@@ -3009,14 +3011,6 @@ sub stop_servers($$) { ...@@ -3009,14 +3011,6 @@ sub stop_servers($$) {
foreach my $server (@servers) foreach my $server (@servers)
{ {
# Remove datadir
if ( $server->option('#!remove-datadir') )
{
my $datadir= $server->value('datadir');
mtr_debug("Removing '$datadir'");
rmtree($datadir);
}
# Mark server as stopped # Mark server as stopped
$server->{proc}= undef; $server->{proc}= undef;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment