percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-12-20 02:20:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

WIP testing a patch

Browse Source
This commit is contained in:
Carlos Salguero
2019-09-19 08:25:00 -03:00
parent 636123bded
commit 4fc3d9fd1f
1 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bin/pt-online-schema-change
View File

@@ -2284,6 +2284,9 @@ sub get_cxn_params {
qw(h P)); qw(h P));
} }
else { else {
warn "A----------------------------------------------------------------------------------------------------";
warn Data::Dumper::Dumper($info);
Carp::confess('l');
$dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';' $dsn = 'DBI:mysql:' . ( $info->{D} || '' ) . ';'
. join(';', map { "$opts{$_}->{dsn}=$info->{$_}" } . join(';', map { "$opts{$_}->{dsn}=$info->{$_}" }
grep { defined $info->{$_} } grep { defined $info->{$_} }
@@ -2341,6 +2344,7 @@ sub get_dbh {
while ( !$dbh && $tries-- ) { while ( !$dbh && $tries-- ) {
PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass, PTDEBUG && _d($cxn_string, ' ', $user, ' ', $pass,
join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults )); join(', ', map { "$_=>$defaults->{$_}" } keys %$defaults ));
warn "==== $cxn_string, $user, $pass, $defaults";
$dbh = eval { DBI->connect($cxn_string, $user, $pass, $defaults) }; $dbh = eval { DBI->connect($cxn_string, $user, $pass, $defaults) };
@@ -3888,7 +3892,7 @@ sub new {
}; };
my ($dp, $o) = @args{@required_args}; my ($dp, $o) = @args{@required_args};
my $dsn_defaults = $dp->parse_options($o); my $dsn_defaults = $dp->parse_options($o);
my $prev_dsn = $args{prev_dsn}; my $prev_dsn = $args{prev_dsn};
my $dsn = $args{dsn}; my $dsn = $args{dsn};
if ( !$dsn ) { if ( !$dsn ) {
@@ -5009,7 +5013,13 @@ sub wait {
while ( $oktorun->() && @lagged_slaves ) { while ( $oktorun->() && @lagged_slaves ) {
PTDEBUG && _d('Checking slave lag'); PTDEBUG && _d('Checking slave lag');
for my $i ( 0..$#lagged_slaves ) { for my $i ( 0..$#lagged_slaves ) {
my $lag = $get_lag->($lagged_slaves[$i]->{cxn}); my $lag;
eval {
$lag = $get_lag->($lagged_slaves[$i]->{cxn});
};
if ($EVAL_ERROR) {
die $EVAL_ERROR;
}
PTDEBUG && _d($lagged_slaves[$i]->{cxn}->name(), PTDEBUG && _d($lagged_slaves[$i]->{cxn}->name(),
'slave lag:', $lag); 'slave lag:', $lag);
if ( !defined $lag || $lag > $max_lag ) { if ( !defined $lag || $lag > $max_lag ) {
@@ -8373,10 +8383,14 @@ sub main {
else { else {
# Parse DSN string and convert it to a DSN data struct. # Parse DSN string and convert it to a DSN data struct.
$dsn = $dp->parse($dsn, $dp->parse_options($o)); $dsn = $dp->parse($dsn, $dp->parse_options($o));
$dsn->{P} = $o->get('port') if $o->has('port');
$db = $dsn->{D}; $db = $dsn->{D};
$tbl = $dsn->{t}; $tbl = $dsn->{t};
} }
warn "----------------------------------------------------------------------------------------------------";
warn Data::Dumper::Dumper($dsn);
my $alter_fk_method = $o->get('alter-foreign-keys-method') || ''; my $alter_fk_method = $o->get('alter-foreign-keys-method') || '';
if ( $alter_fk_method eq 'drop_swap' ) { if ( $alter_fk_method eq 'drop_swap' ) {
$o->set('swap-tables', 0); $o->set('swap-tables', 0);
@@ -8697,6 +8711,7 @@ sub main {
PTDEBUG && _d('Will check slave lag on all slaves'); PTDEBUG && _d('Will check slave lag on all slaves');
$slave_lag_cxns = $slaves; $slave_lag_cxns = $slaves;
} }
if ( $slave_lag_cxns && scalar @$slave_lag_cxns ) { if ( $slave_lag_cxns && scalar @$slave_lag_cxns ) {
if ($o->get('skip-check-slave-lag')) { if ($o->get('skip-check-slave-lag')) {
my $slaves_to_skip = $o->get('skip-check-slave-lag'); my $slaves_to_skip = $o->get('skip-check-slave-lag');
@@ -8729,6 +8744,15 @@ sub main {
print "Not checking slave lag because no slaves were found " print "Not checking slave lag because no slaves were found "
. "and --check-slave-lag was not specified.\n"; . "and --check-slave-lag was not specified.\n";
} }
# Before starting, check the replication is not using replications channels or that --channel was specified
for my $slave (@$slave_lag_cxns) {
eval {
my $ss = $ms->get_slave_status($slave->{dbh});
};
if ($EVAL_ERROR) {
die $EVAL_ERROR;
}
}
# ##################################################################### # #####################################################################
# Check for replication filters. # Check for replication filters.
@@ -8806,6 +8830,7 @@ sub main {
#TODO REMOVE DEBUG #TODO REMOVE DEBUG
PTDEBUG && _d('2> Cannot connect to', $cxn->name(), ':', PTDEBUG && _d('2> Cannot connect to', $cxn->name(), ':',
$EVAL_ERROR); $EVAL_ERROR);
die '2> Cannot connect to '. $cxn->name() . ':' . $EVAL_ERROR;
# Make ReplicaLagWaiter::wait() report slave is stopped. # Make ReplicaLagWaiter::wait() report slave is stopped.
return undef; return undef;
} }
@@ -8815,8 +8840,8 @@ sub main {
$lag = $ms->get_slave_lag($dbh); $lag = $ms->get_slave_lag($dbh);
}; };
if ( $EVAL_ERROR ) { if ( $EVAL_ERROR ) {
PTDEBUG && _d('Cannot get lag for', $cxn->name(), ':', PTDEBUG && _d('Cannot get lag for', $cxn->name(), ':', $EVAL_ERROR);
$EVAL_ERROR); die '2> Cannot connect to '. $cxn->name() . ':' . $EVAL_ERROR;
} }
return $lag; # undef if error return $lag; # undef if error
}; };
@@ -13050,7 +13075,7 @@ If password contains commas they must be escaped with a backslash: "exam\,ple"
=item * P =item * P
dsn: port; copy: yes dsn: port; copy: no
Port number to use for connection. Port number to use for connection.