Skip to content

Commit edd7719

Browse files
svetasmirnovasvetasmirnova
committed
PT-1776: Adding in slave-user and slave-password for dsn table based
- Re-added option processing for recursion method dsn - Improved check for existance of the ts utility in t/pt-table-checksum/pt-2052.t
1 parent 3fae3dd commit edd7719

11 files changed

Lines changed: 51 additions & 31 deletions

File tree

‎bin/pt-archiver‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4537,13 +4537,15 @@ sub get_cxn_from_dsn_table {
45374537
foreach my $dsn_string ( @$dsn_strings ) {
45384538
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
45394539

4540-
$my_dsn = $dp->parse($dsn_string);
4540+
my $raw_dsn = $dp->parse($dsn_string);
4541+
my $dsn_defaults = $dp->parse_options($o);
4542+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
45414543

4542-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
4544+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
45434545
PTDEBUG && _d('DSN - username set from --replica-user');
45444546
$my_dsn->{u} = $o->get('replica-user');
45454547
}
4546-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
4548+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
45474549
PTDEBUG && _d('DSN - password set from --replica-password');
45484550
$my_dsn->{p} = $o->get('replica-password');
45494551
}

‎bin/pt-heartbeat‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -993,13 +993,15 @@ sub get_cxn_from_dsn_table {
993993
foreach my $dsn_string ( @$dsn_strings ) {
994994
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
995995

996-
$my_dsn = $dp->parse($dsn_string);
996+
my $raw_dsn = $dp->parse($dsn_string);
997+
my $dsn_defaults = $dp->parse_options($o);
998+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
997999

998-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
1000+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
9991001
PTDEBUG && _d('DSN - username set from --replica-user');
10001002
$my_dsn->{u} = $o->get('replica-user');
10011003
}
1002-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
1004+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
10031005
PTDEBUG && _d('DSN - password set from --replica-password');
10041006
$my_dsn->{p} = $o->get('replica-password');
10051007
}

‎bin/pt-kill‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4811,13 +4811,15 @@ sub get_cxn_from_dsn_table {
48114811
foreach my $dsn_string ( @$dsn_strings ) {
48124812
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
48134813

4814-
$my_dsn = $dp->parse($dsn_string);
4814+
my $raw_dsn = $dp->parse($dsn_string);
4815+
my $dsn_defaults = $dp->parse_options($o);
4816+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
48154817

4816-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
4818+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
48174819
PTDEBUG && _d('DSN - username set from --replica-user');
48184820
$my_dsn->{u} = $o->get('replica-user');
48194821
}
4820-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
4822+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
48214823
PTDEBUG && _d('DSN - password set from --replica-password');
48224824
$my_dsn->{p} = $o->get('replica-password');
48234825
}

‎bin/pt-online-schema-change‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5102,13 +5102,15 @@ sub get_cxn_from_dsn_table {
51025102
foreach my $dsn_string ( @$dsn_strings ) {
51035103
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
51045104

5105-
$my_dsn = $dp->parse($dsn_string);
5105+
my $raw_dsn = $dp->parse($dsn_string);
5106+
my $dsn_defaults = $dp->parse_options($o);
5107+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
51065108

5107-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
5109+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
51085110
PTDEBUG && _d('DSN - username set from --replica-user');
51095111
$my_dsn->{u} = $o->get('replica-user');
51105112
}
5111-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
5113+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
51125114
PTDEBUG && _d('DSN - password set from --replica-password');
51135115
$my_dsn->{p} = $o->get('replica-password');
51145116
}

‎bin/pt-query-digest‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11408,13 +11408,15 @@ sub get_cxn_from_dsn_table {
1140811408
foreach my $dsn_string ( @$dsn_strings ) {
1140911409
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
1141011410

11411-
$my_dsn = $dp->parse($dsn_string);
11411+
my $raw_dsn = $dp->parse($dsn_string);
11412+
my $dsn_defaults = $dp->parse_options($o);
11413+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
1141211414

11413-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
11415+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
1141411416
PTDEBUG && _d('DSN - username set from --replica-user');
1141511417
$my_dsn->{u} = $o->get('replica-user');
1141611418
}
11417-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
11419+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
1141811420
PTDEBUG && _d('DSN - password set from --replica-password');
1141911421
$my_dsn->{p} = $o->get('replica-password');
1142011422
}

‎bin/pt-replica-find‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3140,13 +3140,15 @@ sub get_cxn_from_dsn_table {
31403140
foreach my $dsn_string ( @$dsn_strings ) {
31413141
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
31423142

3143-
$my_dsn = $dp->parse($dsn_string);
3143+
my $raw_dsn = $dp->parse($dsn_string);
3144+
my $dsn_defaults = $dp->parse_options($o);
3145+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
31443146

3145-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
3147+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
31463148
PTDEBUG && _d('DSN - username set from --replica-user');
31473149
$my_dsn->{u} = $o->get('replica-user');
31483150
}
3149-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
3151+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
31503152
PTDEBUG && _d('DSN - password set from --replica-password');
31513153
$my_dsn->{p} = $o->get('replica-password');
31523154
}

‎bin/pt-replica-restart‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3554,13 +3554,15 @@ sub get_cxn_from_dsn_table {
35543554
foreach my $dsn_string ( @$dsn_strings ) {
35553555
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
35563556

3557-
$my_dsn = $dp->parse($dsn_string);
3557+
my $raw_dsn = $dp->parse($dsn_string);
3558+
my $dsn_defaults = $dp->parse_options($o);
3559+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
35583560

3559-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
3561+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
35603562
PTDEBUG && _d('DSN - username set from --replica-user');
35613563
$my_dsn->{u} = $o->get('replica-user');
35623564
}
3563-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
3565+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
35643566
PTDEBUG && _d('DSN - password set from --replica-password');
35653567
$my_dsn->{p} = $o->get('replica-password');
35663568
}

‎bin/pt-table-checksum‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6057,13 +6057,15 @@ sub get_cxn_from_dsn_table {
60576057
foreach my $dsn_string ( @$dsn_strings ) {
60586058
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
60596059

6060-
$my_dsn = $dp->parse($dsn_string);
6060+
my $raw_dsn = $dp->parse($dsn_string);
6061+
my $dsn_defaults = $dp->parse_options($o);
6062+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
60616063

6062-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
6064+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
60636065
PTDEBUG && _d('DSN - username set from --replica-user');
60646066
$my_dsn->{u} = $o->get('replica-user');
60656067
}
6066-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
6068+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
60676069
PTDEBUG && _d('DSN - password set from --replica-password');
60686070
$my_dsn->{p} = $o->get('replica-password');
60696071
}

‎bin/pt-table-sync‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7587,13 +7587,15 @@ sub get_cxn_from_dsn_table {
75877587
foreach my $dsn_string ( @$dsn_strings ) {
75887588
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
75897589

7590-
$my_dsn = $dp->parse($dsn_string);
7590+
my $raw_dsn = $dp->parse($dsn_string);
7591+
my $dsn_defaults = $dp->parse_options($o);
7592+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
75917593

7592-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
7594+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
75937595
PTDEBUG && _d('DSN - username set from --replica-user');
75947596
$my_dsn->{u} = $o->get('replica-user');
75957597
}
7596-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
7598+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
75977599
PTDEBUG && _d('DSN - password set from --replica-password');
75987600
$my_dsn->{p} = $o->get('replica-password');
75997601
}

‎lib/MasterSlave.pm‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,13 +1090,15 @@ sub get_cxn_from_dsn_table {
10901090
foreach my $dsn_string ( @$dsn_strings ) {
10911091
PTDEBUG && _d('DSN from DSN table:', $dsn_string);
10921092

1093-
$my_dsn = $dp->parse($dsn_string);
1093+
my $raw_dsn = $dp->parse($dsn_string);
1094+
my $dsn_defaults = $dp->parse_options($o);
1095+
$my_dsn = $dp->parse($dsn_string, undef, $dsn_defaults);
10941096

1095-
if ( $o->got('replica-user') && !defined $my_dsn->{u} ) {
1097+
if ( $o->got('replica-user') && !defined $raw_dsn->{u} ) {
10961098
PTDEBUG && _d('DSN - username set from --replica-user');
10971099
$my_dsn->{u} = $o->get('replica-user');
10981100
}
1099-
if ( $o->got('replica-password') && !defined $my_dsn->{p} ) {
1101+
if ( $o->got('replica-password') && !defined $raw_dsn->{p} ) {
11001102
PTDEBUG && _d('DSN - password set from --replica-password');
11011103
$my_dsn->{p} = $o->get('replica-password');
11021104
}

0 commit comments

Comments
 (0)