mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-12-24 02:01:42 +08:00
Add force => ->got('version-check') to tools.
This commit is contained in:
@@ -5036,6 +5036,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [ map({ +{ dbh => $_->dbh, dsn => $_->dsn } } @cxn) ],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4017,6 +4017,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [
|
||||
{ dbh => $dbh, dsn => $source_dsn },
|
||||
($dest_dsn ? { dbh => $dest_dsn, dsn => $dest_dsn } : ()),
|
||||
|
||||
@@ -4779,7 +4779,9 @@ sub main {
|
||||
# Do the version-check
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check();
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
);
|
||||
}
|
||||
|
||||
# ########################################################################
|
||||
|
||||
@@ -4668,6 +4668,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [ {dbh => $dbh, dsn => $dsn} ],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3808,6 +3808,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [ { dbh => $dbh, dsn => $dsn } ],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3467,6 +3467,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [
|
||||
{ dbh => $dbh, dsn => $src_dsn },
|
||||
($dst_dbh ? { dbh => $dst_dbh, dsn => $dst_dsn } : ())
|
||||
|
||||
@@ -5039,6 +5039,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [ { dbh => $dbh, dsn => $dsn } ],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -6248,6 +6248,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [
|
||||
{ dbh => $dbh, dsn => $dsn },
|
||||
($res_dbh ? { dbh => $res_dbh, dsn => $res_dsn } : ())
|
||||
|
||||
@@ -6621,6 +6621,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [ ($dbh ? { dbh => $dbh, dsn => $cxn->dsn() } : ()) ],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -8225,6 +8225,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [
|
||||
map (
|
||||
{ +{ dbh => $_->dbh(), dsn => $_->dsn() } }
|
||||
|
||||
@@ -8397,6 +8397,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [
|
||||
($review_dbh ? { dbh => $review_dbh, dsn => $review_dsn } : ()),
|
||||
($dbh ? { dbh => $dbh, dsn => $dsn } : ()),
|
||||
|
||||
@@ -4055,6 +4055,7 @@ sub main {
|
||||
= $master_dsn ? $master_dsn
|
||||
: {h=>$status->{master_host}, P=>$status->{master_port}};
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [
|
||||
{ dbh => $slave_dbh, dsn => $slave_dsn },
|
||||
{ dbh => $master_dbh, dsn => $tmp_master_dsn }
|
||||
|
||||
@@ -4739,6 +4739,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [ { dbh => $dbh, dsn => $dsn }, @servers_to_watch ],
|
||||
);
|
||||
}
|
||||
|
||||
@@ -9204,6 +9204,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [
|
||||
{ dbh => $master_dbh, dsn => $master_dsn },
|
||||
map({ +{ dbh => $_->dbh(), dsn => $_->dsn() } } @$slaves)
|
||||
|
||||
@@ -9652,6 +9652,7 @@ sub main {
|
||||
} @dsns;
|
||||
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => \@instances,
|
||||
);
|
||||
|
||||
|
||||
@@ -12571,6 +12571,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [
|
||||
map(
|
||||
{ +{ dbh => $_->{dbh}, dsn => $_->{dsn} } }
|
||||
|
||||
@@ -4973,6 +4973,7 @@ sub main {
|
||||
# ########################################################################
|
||||
if ( $o->get('version-check') && (!$o->has('quiet') || !$o->get('quiet')) ) {
|
||||
VersionCheck::version_check(
|
||||
force => $o->got('version-check'),
|
||||
instances => [ ($dbh ? { dbh => $dbh, dsn => $dsn } : ()) ],
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user