Skip to content

[RONDB-734] MTR fixes #563

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

Closed
wants to merge 1 commit into from
Closed

[RONDB-734] MTR fixes #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions mysql-test/lib/My/ConfigFactory.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ sub post_check_client_group {
sub post_check_client_groups {
my ($self, $config) = @_;

my $first_mysqld = $config->first_like('mysqld.');
my $first_mysqld = $config->first_like('mysqld\.');

return unless $first_mysqld;

Expand All @@ -494,7 +494,7 @@ sub post_check_client_groups {
$self->post_check_client_group($config, 'client', $first_mysqld->name());

# Then generate [client.<suffix>] for each [mysqld.<suffix>].
foreach my $mysqld ($config->like('mysqld.')) {
foreach my $mysqld ($config->like('mysqld\.')) {
$self->post_check_client_group($config, 'client' . $mysqld->after('mysqld'),
$mysqld->name());
}
Expand Down Expand Up @@ -545,7 +545,7 @@ sub post_fix_mysql_cluster_section {
foreach my $group ($config->like('cluster_config\.\w*$')) {
my @urls;
# Generate ndb_connectstring for this cluster
foreach my $ndb_mgmd ($config->like('cluster_config.ndb_mgmd.')) {
foreach my $ndb_mgmd ($config->like('cluster_config\.ndb_mgmd\.')) {
if ($ndb_mgmd->suffix() eq $group->suffix()) {
my $host = $ndb_mgmd->value('HostName');
my $port = $ndb_mgmd->value('PortNumber');
Expand All @@ -562,7 +562,7 @@ sub post_fix_mysql_cluster_section {

# Add ndb_connectstring to each ndbd connected to this
# cluster.
foreach my $ndbd ($config->like('cluster_config.ndbd.')) {
foreach my $ndbd ($config->like('cluster_config\.ndbd\.')) {
if ($ndbd->suffix() eq $group->suffix()) {
my $after = $ndbd->after('cluster_config.ndbd');
$config->insert("ndbd$after",
Expand All @@ -572,7 +572,7 @@ sub post_fix_mysql_cluster_section {

# Add ndb_connectstring to each ndb_mgmd connected to this
# cluster.
foreach my $ndb_mgmd ($config->like('cluster_config.ndb_mgmd.')) {
foreach my $ndb_mgmd ($config->like('cluster_config\.ndb_mgmd\.')) {
if ($ndb_mgmd->suffix() eq $group->suffix()) {
my $after = $ndb_mgmd->after('cluster_config.ndb_mgmd');
$config->insert("ndb_mgmd$after",
Expand All @@ -582,7 +582,7 @@ sub post_fix_mysql_cluster_section {

# Add ndb_connectstring to each mysqld connected to this
# cluster.
foreach my $mysqld ($config->like('cluster_config.mysqld.')) {
foreach my $mysqld ($config->like('cluster_config\.mysqld\.')) {
if ($mysqld->suffix() eq $group->suffix()) {
my $after = $mysqld->after('cluster_config.mysqld');
$config->insert("mysqld$after",
Expand Down Expand Up @@ -762,17 +762,17 @@ sub new_config {
$self->run_section_rules($config, 'cluster_config\.\w',
({ 'CODE' => \&track_allocated_nodeid }));

$self->run_section_rules($config, 'cluster_config.ndb_mgmd.',
$self->run_section_rules($config, 'cluster_config\.ndb_mgmd\.',
@ndb_mgmd_rules);

$self->run_section_rules($config, 'ndb_mgmd.',
$self->run_section_rules($config, 'ndb_mgmd\.',
({ 'cluster-config-suffix' => \&fix_cluster_config_suffix },
{ 'bind-address' => \&fix_bind_address },
));

$self->run_section_rules($config, 'cluster_config.ndbd', @ndbd_rules);
$self->run_section_rules($config, 'cluster_config\.ndbd', @ndbd_rules);

$self->run_section_rules($config, 'mysqld.', @mysqld_rules);
$self->run_section_rules($config, 'mysqld\.', @mysqld_rules);

# [mysqlbinlog] need additional settings
$self->run_rules_for_group($config, $config->insert('mysqlbinlog'),
Expand Down
10 changes: 5 additions & 5 deletions mysql-test/mysql-test-run.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,10 +379,10 @@
# Return list of specific servers
sub _like { return $config ? $config->like($_[0]) : (); }

sub mysqlds { return _like('mysqld.'); }
sub ndbds { return _like('cluster_config.ndbd.'); }
sub ndb_mgmds { return _like('cluster_config.ndb_mgmd.'); }
sub clusters { return _like('mysql_cluster.'); }
sub mysqlds { return _like('mysqld\.'); }
sub ndbds { return _like('cluster_config\.ndbd\.'); }
sub ndb_mgmds { return _like('cluster_config\.ndb_mgmd\.'); }
sub clusters { return _like('mysql_cluster\.'); }
sub all_servers { return (mysqlds(), ndb_mgmds(), ndbds()); }

# Return an object which refers to the group named '[mysqld]'
Expand Down Expand Up @@ -2618,7 +2618,7 @@ ($)
# ports_per_thread value should be 50.
# - First set of 20 ports are reserved for mysqld servers (10 each for
# standard and admin connections)
# - Second set of 10 ports are reserver for Group replication
# - Second set of 10 ports are reserved for Group replication
# - Third set of 10 ports are reserved for secondary engine plugin
# - Fourth and last set of 10 ports are reserved for X plugin
$::secondary_engine_port = $baseport + 30;
Expand Down