mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
6293a2ea93
Error log gets truncated when mysqld is restarted by MTR mysql-test/include/check-warnings.test: Since server doesn't have log-error, get it from env. var. set by MTR mysql-test/lib/My/ConfigFactory.pm: "Hide" log-error in a comment mysql-test/mysql-test-run.pl: "Hide" log-error in my.cnf by comment add --console to arguments on Windows Move .err file to var/log
655 lines
15 KiB
Perl
655 lines
15 KiB
Perl
# -*- cperl -*-
|
|
package My::ConfigFactory;
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Carp;
|
|
|
|
use My::Config;
|
|
use My::Find;
|
|
|
|
use File::Basename;
|
|
|
|
|
|
#
|
|
# Rules to run first of all
|
|
#
|
|
my @pre_rules=
|
|
(
|
|
);
|
|
|
|
|
|
my @share_locations= ("share/mysql", "sql/share", "share");
|
|
|
|
|
|
sub get_basedir {
|
|
my ($self, $group)= @_;
|
|
my $basedir= $group->if_exist('basedir') ||
|
|
$self->{ARGS}->{basedir};
|
|
return $basedir;
|
|
}
|
|
|
|
|
|
sub fix_charset_dir {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
return my_find_dir($self->get_basedir($group),
|
|
\@share_locations, "charsets");
|
|
}
|
|
|
|
sub fix_language {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
return my_find_dir($self->get_basedir($group),
|
|
\@share_locations, "english");
|
|
}
|
|
|
|
sub fix_datadir {
|
|
my ($self, $config, $group_name)= @_;
|
|
my $vardir= $self->{ARGS}->{vardir};
|
|
return "$vardir/$group_name/data";
|
|
}
|
|
|
|
sub fix_pidfile {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $vardir= $self->{ARGS}->{vardir};
|
|
return "$vardir/run/$group_name.pid";
|
|
}
|
|
|
|
sub fix_port {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $hostname= $group->value('#host');
|
|
return $self->{HOSTS}->{$hostname}++;
|
|
}
|
|
|
|
sub fix_host {
|
|
my ($self)= @_;
|
|
# Get next host from HOSTS array
|
|
my @hosts= keys(%{$self->{HOSTS}});;
|
|
my $host_no= $self->{NEXT_HOST}++ % @hosts;
|
|
return $hosts[$host_no];
|
|
}
|
|
|
|
sub is_unique {
|
|
my ($config, $name, $value)= @_;
|
|
|
|
foreach my $group ( $config->groups() ) {
|
|
if ($group->option($name)) {
|
|
if ($group->value($name) eq $value){
|
|
return 0;
|
|
}
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
sub fix_server_id {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
#define in the order that mysqlds are listed in my.cnf
|
|
|
|
my $server_id= $group->if_exist('server-id');
|
|
if (defined $server_id){
|
|
if (!is_unique($config, 'server-id', $server_id)) {
|
|
croak "The server-id($server_id) for '$group_name' is not unique";
|
|
}
|
|
return $server_id;
|
|
}
|
|
|
|
do {
|
|
$server_id= $self->{SERVER_ID}++;
|
|
} while(!is_unique($config, 'server-id', $server_id));
|
|
|
|
#print "$group_name: server_id: $server_id\n";
|
|
return $server_id;
|
|
}
|
|
|
|
sub fix_socket {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
# Put socket file in tmpdir
|
|
my $dir= $self->{ARGS}->{tmpdir};
|
|
return "$dir/$group_name.sock";
|
|
}
|
|
|
|
sub fix_tmpdir {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $dir= $self->{ARGS}->{tmpdir};
|
|
return "$dir/$group_name";
|
|
}
|
|
|
|
sub fix_log_error {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $dir= $self->{ARGS}->{vardir};
|
|
return "$dir/log/$group_name.err";
|
|
}
|
|
|
|
sub fix_log {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $dir= dirname($group->value('datadir'));
|
|
return "$dir/mysqld.log";
|
|
}
|
|
|
|
sub fix_log_slow_queries {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $dir= dirname($group->value('datadir'));
|
|
return "$dir/mysqld-slow.log";
|
|
}
|
|
|
|
sub fix_secure_file_priv {
|
|
my ($self)= @_;
|
|
my $vardir= $self->{ARGS}->{vardir};
|
|
# By default, prevent the started mysqld to access files outside of vardir
|
|
return $vardir;
|
|
}
|
|
|
|
sub fix_std_data {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $basedir= $self->get_basedir($group);
|
|
return "$basedir/mysql-test/std_data";
|
|
}
|
|
|
|
sub ssl_supported {
|
|
my ($self)= @_;
|
|
return $self->{ARGS}->{ssl};
|
|
}
|
|
|
|
sub fix_skip_ssl {
|
|
return if !ssl_supported(@_);
|
|
# Add skip-ssl if ssl is supported to avoid
|
|
# that mysqltest connects with SSL by default
|
|
return 1;
|
|
}
|
|
|
|
sub fix_ssl_ca {
|
|
return if !ssl_supported(@_);
|
|
my $std_data= fix_std_data(@_);
|
|
return "$std_data/cacert.pem"
|
|
}
|
|
|
|
sub fix_ssl_server_cert {
|
|
return if !ssl_supported(@_);
|
|
my $std_data= fix_std_data(@_);
|
|
return "$std_data/server-cert.pem"
|
|
}
|
|
|
|
sub fix_ssl_client_cert {
|
|
return if !ssl_supported(@_);
|
|
my $std_data= fix_std_data(@_);
|
|
return "$std_data/client-cert.pem"
|
|
}
|
|
|
|
sub fix_ssl_server_key {
|
|
return if !ssl_supported(@_);
|
|
my $std_data= fix_std_data(@_);
|
|
return "$std_data/server-key.pem"
|
|
}
|
|
|
|
sub fix_ssl_client_key {
|
|
return if !ssl_supported(@_);
|
|
my $std_data= fix_std_data(@_);
|
|
return "$std_data/client-key.pem"
|
|
}
|
|
|
|
|
|
#
|
|
# Rules to run for each mysqld in the config
|
|
# - will be run in order listed here
|
|
#
|
|
my @mysqld_rules=
|
|
(
|
|
{ 'basedir' => sub { return shift->{ARGS}->{basedir}; } },
|
|
{ 'tmpdir' => \&fix_tmpdir },
|
|
{ 'character-sets-dir' => \&fix_charset_dir },
|
|
{ 'language' => \&fix_language },
|
|
{ 'datadir' => \&fix_datadir },
|
|
{ 'pid-file' => \&fix_pidfile },
|
|
{ '#host' => \&fix_host },
|
|
{ 'port' => \&fix_port },
|
|
{ 'socket' => \&fix_socket },
|
|
{ '#log-error' => \&fix_log_error },
|
|
{ 'log' => \&fix_log },
|
|
{ 'log-slow-queries' => \&fix_log_slow_queries },
|
|
{ '#user' => sub { return shift->{ARGS}->{user} || ""; } },
|
|
{ '#password' => sub { return shift->{ARGS}->{password} || ""; } },
|
|
{ 'server-id' => \&fix_server_id, },
|
|
# By default, prevent the started mysqld to access files outside of vardir
|
|
{ 'secure-file-priv' => sub { return shift->{ARGS}->{vardir}; } },
|
|
{ 'ssl-ca' => \&fix_ssl_ca },
|
|
{ 'ssl-cert' => \&fix_ssl_server_cert },
|
|
{ 'ssl-key' => \&fix_ssl_server_key },
|
|
);
|
|
|
|
|
|
sub fix_ndb_mgmd_port {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $hostname= $group->value('HostName');
|
|
return $self->{HOSTS}->{$hostname}++;
|
|
}
|
|
|
|
|
|
sub fix_cluster_dir {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $vardir= $self->{ARGS}->{vardir};
|
|
my (undef, $process_type, $idx, $suffix)= split(/\./, $group_name);
|
|
return "$vardir/mysql_cluster.$suffix/$process_type.$idx";
|
|
}
|
|
|
|
|
|
sub fix_cluster_backup_dir {
|
|
my ($self, $config, $group_name, $group)= @_;
|
|
my $vardir= $self->{ARGS}->{vardir};
|
|
my (undef, $process_type, $idx, $suffix)= split(/\./, $group_name);
|
|
return "$vardir/mysql_cluster.$suffix/";
|
|
}
|
|
|
|
|
|
#
|
|
# Rules to run for each ndb_mgmd in the config
|
|
# - will be run in order listed here
|
|
#
|
|
my @ndb_mgmd_rules=
|
|
(
|
|
{ 'PortNumber' => \&fix_ndb_mgmd_port },
|
|
{ 'DataDir' => \&fix_cluster_dir },
|
|
);
|
|
|
|
|
|
#
|
|
# Rules to run for each ndbd in the config
|
|
# - will be run in order listed here
|
|
#
|
|
my @ndbd_rules=
|
|
(
|
|
{ 'HostName' => \&fix_host },
|
|
{ 'DataDir' => \&fix_cluster_dir },
|
|
{ 'BackupDataDir' => \&fix_cluster_backup_dir },
|
|
);
|
|
|
|
|
|
#
|
|
# Rules to run for each cluster_config section
|
|
# - will be run in order listed here
|
|
#
|
|
my @cluster_config_rules=
|
|
(
|
|
{ 'ndb_mgmd' => \&fix_host },
|
|
{ 'ndbd' => \&fix_host },
|
|
{ 'mysqld' => \&fix_host },
|
|
{ 'ndbapi' => \&fix_host },
|
|
);
|
|
|
|
|
|
#
|
|
# Rules to run for [client] section
|
|
# - will be run in order listed here
|
|
#
|
|
my @client_rules=
|
|
(
|
|
);
|
|
|
|
|
|
#
|
|
# Rules to run for [mysqltest] section
|
|
# - will be run in order listed here
|
|
#
|
|
my @mysqltest_rules=
|
|
(
|
|
{ 'ssl-ca' => \&fix_ssl_ca },
|
|
{ 'ssl-cert' => \&fix_ssl_client_cert },
|
|
{ 'ssl-key' => \&fix_ssl_client_key },
|
|
{ 'skip-ssl' => \&fix_skip_ssl },
|
|
);
|
|
|
|
|
|
#
|
|
# Rules to run for [mysqlbinlog] section
|
|
# - will be run in order listed here
|
|
#
|
|
my @mysqlbinlog_rules=
|
|
(
|
|
{ 'character-sets-dir' => \&fix_charset_dir },
|
|
);
|
|
|
|
|
|
#
|
|
# Rules to run for [mysql_upgrade] section
|
|
# - will be run in order listed here
|
|
#
|
|
my @mysql_upgrade_rules=
|
|
(
|
|
{ 'tmpdir' => sub { return shift->{ARGS}->{tmpdir}; } },
|
|
);
|
|
|
|
|
|
#
|
|
# Generate a [client.<suffix>] group to be
|
|
# used for connecting to [mysqld.<suffix>]
|
|
#
|
|
sub post_check_client_group {
|
|
my ($self, $config, $client_group_name, $mysqld_group_name)= @_;
|
|
|
|
# Settings needed for client, copied from its "mysqld"
|
|
my %client_needs=
|
|
(
|
|
port => 'port',
|
|
socket => 'socket',
|
|
host => '#host',
|
|
user => '#user',
|
|
password => '#password',
|
|
);
|
|
|
|
my $group_to_copy_from= $config->group($mysqld_group_name);
|
|
while (my ($name_to, $name_from)= each( %client_needs )) {
|
|
my $option= $group_to_copy_from->option($name_from);
|
|
|
|
if (! defined $option){
|
|
#print $config;
|
|
croak "Could not get value for '$name_from'";
|
|
}
|
|
$config->insert($client_group_name, $name_to, $option->value())
|
|
}
|
|
}
|
|
|
|
|
|
sub post_check_client_groups {
|
|
my ($self, $config)= @_;
|
|
|
|
my $first_mysqld= $config->first_like('mysqld.');
|
|
|
|
return unless $first_mysqld;
|
|
|
|
# Always generate [client] pointing to the first
|
|
# [mysqld.<suffix>]
|
|
$self->post_check_client_group($config,
|
|
'client',
|
|
$first_mysqld->name());
|
|
|
|
# Then generate [client.<suffix>] for each [mysqld.<suffix>]
|
|
foreach my $mysqld ( $config->like('mysqld.') ) {
|
|
$self->post_check_client_group($config,
|
|
'client'.$mysqld->after('mysqld'),
|
|
$mysqld->name())
|
|
}
|
|
|
|
}
|
|
|
|
|
|
#
|
|
# Generate [embedded] by copying the values
|
|
# needed from the default [mysqld] section
|
|
# and from first [mysqld.<suffix>]
|
|
#
|
|
sub post_check_embedded_group {
|
|
my ($self, $config)= @_;
|
|
|
|
return unless $self->{ARGS}->{embedded};
|
|
|
|
my $mysqld= $config->group('mysqld') or
|
|
croak "Can't run with embedded, config has no default mysqld section";
|
|
|
|
my $first_mysqld= $config->first_like('mysqld.') or
|
|
croak "Can't run with embedded, config has no mysqld";
|
|
|
|
my @no_copy =
|
|
(
|
|
'#log-error', # Embedded server writes stderr to mysqltest's log file
|
|
'slave-net-timeout', # Embedded server are not build with replication
|
|
);
|
|
|
|
foreach my $option ( $mysqld->options(), $first_mysqld->options() ) {
|
|
# Don't copy options whose name is in "no_copy" list
|
|
next if grep ( $option->name() eq $_, @no_copy);
|
|
|
|
$config->insert('embedded', $option->name(), $option->value())
|
|
}
|
|
|
|
}
|
|
|
|
|
|
sub resolve_at_variable {
|
|
my ($self, $config, $group, $option)= @_;
|
|
|
|
# Split the options value on last .
|
|
my @parts= split(/\./, $option->value());
|
|
my $option_name= pop(@parts);
|
|
my $group_name= join('.', @parts);
|
|
|
|
$group_name =~ s/^\@//; # Remove at
|
|
|
|
my $from_group= $config->group($group_name)
|
|
or croak "There is no group named '$group_name' that ",
|
|
"can be used to resolve '$option_name'";
|
|
|
|
my $from= $from_group->value($option_name);
|
|
$config->insert($group->name(), $option->name(), $from)
|
|
}
|
|
|
|
|
|
sub post_fix_resolve_at_variables {
|
|
my ($self, $config)= @_;
|
|
|
|
foreach my $group ( $config->groups() ) {
|
|
foreach my $option ( $group->options()) {
|
|
next unless defined $option->value();
|
|
|
|
$self->resolve_at_variable($config, $group, $option)
|
|
if ($option->value() =~ /^\@/);
|
|
}
|
|
}
|
|
}
|
|
|
|
sub post_fix_mysql_cluster_section {
|
|
my ($self, $config)= @_;
|
|
|
|
# Add a [mysl_cluster.<suffix>] section for each
|
|
# defined [cluster_config.<suffix>] 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.')) {
|
|
if ($ndb_mgmd->suffix() eq $group->suffix()) {
|
|
my $host= $ndb_mgmd->value('HostName');
|
|
my $port= $ndb_mgmd->value('PortNumber');
|
|
push(@urls, "$host:$port");
|
|
}
|
|
}
|
|
croak "Could not generate valid ndb_connectstring for '$group'"
|
|
unless @urls > 0;
|
|
my $ndb_connectstring= join(";", @urls);
|
|
|
|
# Add ndb_connectstring to [mysql_cluster.<suffix>]
|
|
$config->insert('mysql_cluster'.$group->suffix(),
|
|
'ndb_connectstring', $ndb_connectstring);
|
|
|
|
# Add ndb_connectstring to each mysqld connected to this
|
|
# cluster
|
|
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",
|
|
'ndb_connectstring', $ndb_connectstring);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#
|
|
# Rules to run last of all
|
|
#
|
|
my @post_rules=
|
|
(
|
|
\&post_check_client_groups,
|
|
\&post_fix_mysql_cluster_section,
|
|
\&post_fix_resolve_at_variables,
|
|
\&post_check_embedded_group,
|
|
);
|
|
|
|
|
|
sub run_rules_for_group {
|
|
my ($self, $config, $group, @rules)= @_;
|
|
foreach my $hash ( @rules ) {
|
|
while (my ($option, $rule)= each( %{$hash} )) {
|
|
# Only run this rule if the value is not already defined
|
|
if (!$config->exists($group->name(), $option)) {
|
|
my $value;
|
|
if (ref $rule eq "CODE") {
|
|
# Call the rule function
|
|
$value= &$rule($self, $config, $group->name(),
|
|
$config->group($group->name()));
|
|
} else {
|
|
$value= $rule;
|
|
}
|
|
if (defined $value) {
|
|
$config->insert($group->name(), $option, $value, 1);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
sub run_section_rules {
|
|
my ($self, $config, $name, @rules)= @_;
|
|
|
|
foreach my $group ( $config->like($name) ) {
|
|
$self->run_rules_for_group($config, $group, @rules);
|
|
}
|
|
}
|
|
|
|
|
|
sub run_generate_sections_from_cluster_config {
|
|
my ($self, $config)= @_;
|
|
|
|
my @options= ('ndb_mgmd', 'ndbd',
|
|
'mysqld', 'ndbapi');
|
|
|
|
foreach my $group ( $config->like('cluster_config\.\w*$') ) {
|
|
|
|
# Keep track of current index per process type
|
|
my %idxes;
|
|
map { $idxes{$_}= 1; } @options;
|
|
|
|
foreach my $option_name ( @options ) {
|
|
my $value= $group->value($option_name);
|
|
my @hosts= split(/,/, $value, -1); # -1 => return also empty strings
|
|
|
|
# Add at least one host
|
|
push(@hosts, undef) unless scalar(@hosts);
|
|
|
|
# Assign hosts unless already fixed
|
|
@hosts= map { $self->fix_host() unless $_; } @hosts;
|
|
|
|
# Write the hosts value back
|
|
$group->insert($option_name, join(",", @hosts));
|
|
|
|
# Generate sections for each host
|
|
foreach my $host ( @hosts ){
|
|
my $idx= $idxes{$option_name}++;
|
|
|
|
my $suffix= $group->suffix();
|
|
# Generate a section for ndb_mgmd to read
|
|
$config->insert("cluster_config.$option_name.$idx$suffix",
|
|
"HostName", $host);
|
|
|
|
if ($option_name eq 'mysqld'){
|
|
my $datadir=
|
|
$self->fix_cluster_dir($config,
|
|
"cluster_config.mysqld.$idx$suffix",
|
|
$group);
|
|
$config->insert("mysqld.$idx$suffix",
|
|
'datadir', "$datadir/data");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
sub new_config {
|
|
my ($class, $args)= @_;
|
|
|
|
my @required_args= ('basedir', 'baseport', 'vardir', 'template_path');
|
|
|
|
foreach my $required ( @required_args ) {
|
|
croak "you must pass '$required'" unless defined $args->{$required};
|
|
}
|
|
|
|
# Fill in hosts/port hash
|
|
my $hosts= {};
|
|
my $baseport= $args->{baseport};
|
|
$args->{hosts}= [ 'localhost' ] unless exists($args->{hosts});
|
|
foreach my $host ( @{$args->{hosts}} ) {
|
|
$hosts->{$host}= $baseport;
|
|
}
|
|
|
|
# Open the config template
|
|
my $config= My::Config->new($args->{'template_path'});
|
|
my $extra_template_path= $args->{'extra_template_path'};
|
|
if ($extra_template_path){
|
|
$config->append(My::Config->new($extra_template_path));
|
|
}
|
|
my $self= bless {
|
|
CONFIG => $config,
|
|
ARGS => $args,
|
|
HOSTS => $hosts,
|
|
NEXT_HOST => 0,
|
|
SERVER_ID => 1,
|
|
}, $class;
|
|
|
|
|
|
{
|
|
# Run pre rules
|
|
foreach my $rule ( @pre_rules ) {
|
|
&$rule($self, $config);
|
|
}
|
|
}
|
|
|
|
|
|
$self->run_section_rules($config,
|
|
'cluster_config\.\w*$',
|
|
@cluster_config_rules);
|
|
$self->run_generate_sections_from_cluster_config($config);
|
|
|
|
$self->run_section_rules($config,
|
|
'cluster_config.ndb_mgmd.',
|
|
@ndb_mgmd_rules);
|
|
$self->run_section_rules($config,
|
|
'cluster_config.ndbd',
|
|
@ndbd_rules);
|
|
|
|
$self->run_section_rules($config,
|
|
'mysqld.',
|
|
@mysqld_rules);
|
|
|
|
# [mysqlbinlog] need additional settings
|
|
$self->run_rules_for_group($config,
|
|
$config->insert('mysqlbinlog'),
|
|
@mysqlbinlog_rules);
|
|
|
|
# [mysql_upgrade] need additional settings
|
|
$self->run_rules_for_group($config,
|
|
$config->insert('mysql_upgrade'),
|
|
@mysql_upgrade_rules);
|
|
|
|
# Additional rules required for [client]
|
|
$self->run_rules_for_group($config,
|
|
$config->insert('client'),
|
|
@client_rules);
|
|
|
|
|
|
# Additional rules required for [mysqltest]
|
|
$self->run_rules_for_group($config,
|
|
$config->insert('mysqltest'),
|
|
@mysqltest_rules);
|
|
|
|
{
|
|
# Run post rules
|
|
foreach my $rule ( @post_rules ) {
|
|
&$rule($self, $config);
|
|
}
|
|
}
|
|
|
|
return $config;
|
|
}
|
|
|
|
|
|
1;
|
|
|