percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-21 18:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve MasterSlave::check_recursion_method() tests.

Browse Source
This commit is contained in:
Daniel Nichter
2013-10-02 11:15:58 -07:00
parent 2411cf6880
commit b0cacd15f4
2 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/MasterSlave.pm
View File

@@ -32,8 +32,18 @@ use constant PTDEBUG => $ENV{PTDEBUG} || 0;
sub check_recursion_method {
my ($methods) = @_;
if ( @$methods != 1 ) {
if ( grep({ !m/processlist|hosts/i } @$methods)
# Check that each method is valid.
foreach my $method ( @$methods ) {
die "Invalid recursion method: " . ($method || 'undef') . "\n"
unless $method && $method =~ m/^(?:processlist$|hosts$|none$|cluster|dsn=)/i;
}
# Check for invalid combination of methods.
if ( @$methods > 1 ) {
if ( grep( { m/none/ } @$methods) && grep( {! m/none/ } @$methods) ) {
die "--recursion-method=none cannot be combined with other methods\n";
}
elsif ( grep({ !m/processlist|hosts/i } @$methods)
&& $methods->[0] !~ /^dsn=/i )
{
die "Invalid combination of recursion methods: "
@@ -41,11 +51,8 @@ sub check_recursion_method {
. "Only hosts and processlist may be combined.\n"
}
}
else {
my ($method) = @$methods;
die "Invalid recursion method: " . ( $method || 'undef' )
unless $method && $method =~ m/^(?:processlist$|hosts$|none$|dsn=)/i;
}
return;
}
sub new {