Skip to content

PT-1776: Adding in slave-user and slave-password for dsn table based … #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: 3.0
Choose a base branch
from
+37 −0
Open

PT-1776: Adding in slave-user and slave-password for dsn table based … #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f9ba2a
PT-1776: Adding in slave-user and slave-password for dsn table based …
mbenshoof Oct 25, 2019
f4d102d
Moving slave-password and slave-user logic into MasterSlave lib. Als…
mbenshoof Dec 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/pt-table-checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5888,6 +5888,7 @@ sub get_cxn_from_dsn_table {
PTDEBUG && _d($sql);
my $dsn_strings = $dbh->selectcol_arrayref($sql);
my @cxn;

if ( $dsn_strings ) {
foreach my $dsn_string ( @$dsn_strings ) {
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
Expand Down
2 changes: 2 additions & 0 deletions bin/pt-table-sync
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7418,12 +7418,14 @@ sub get_cxn_from_dsn_table {
PTDEBUG && _d($sql);
my $dsn_strings = $dbh->selectcol_arrayref($sql);
my @cxn;

if ( $dsn_strings ) {
foreach my $dsn_string ( @$dsn_strings ) {
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
push @cxn, $make_cxn->(dsn_string => $dsn_string);
}
}

return \@cxn;
}

Expand Down
34 changes: 34 additions & 0 deletions lib/MasterSlave.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,9 +978,43 @@ sub get_cxn_from_dsn_table {
PTDEBUG && _d($sql);
my $dsn_strings = $dbh->selectcol_arrayref($sql);
my @cxn;
my $o = $self->{OptionParser};

if ( $dsn_strings ) {
foreach my $dsn_string ( @$dsn_strings ) {
PTDEBUG && _d('DSN from DSN table:', $dsn_string);

my $dsn_tmp = $dp->parse($dsn_string);

my $slave_user = '';
my $dsn_user = $dsn_tmp->{u};

if (!defined $dsn_user) {
if ($o->got('slave-user')) {
my $slave_user_raw = $o->get('slave-user');
$slave_user = "u=$slave_user_raw,";
PTDEBUG && _d('DSN - username set from --slave-user: ', $slave_user);
} else{
PTDEBUG && _d('DSN - Try to use an old username from prior DSN');
}
}

my $slave_pass = '';
my $dsn_pass = $dsn_tmp->{p};

if (!defined $dsn_pass) {
if ($o->got('slave-password')) {
my $slave_pass_raw = $o->get('slave-password');
$slave_pass = "p=$slave_pass_raw,";
PTDEBUG && _d('DSN - password set from --slave-password: ', $slave_pass);
} else{
PTDEBUG && _d('DSN - Try to use an old password from prior DSN');
}
}

$dsn_string = "$slave_user$slave_pass$dsn_string";
PTDEBUG && _d('DSN : Finalized DSN connection string:', $dsn_string);

push @cxn, $make_cxn->(dsn_string => $dsn_string);
}
}
Expand Down