hhf/MySQLTuner-perl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #181 from robertalks/master

Browse source 
Fix Galera checks, make sure we dont say that Galera is enabled when …
This commit is contained in:
Jean-Marie Renouard 2016-04-06 13:55:00 +02:00
commit a2358135e9
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
mysqltuner.pl
View file

@ -931,7 +931,7 @@ sub get_all_vars {
debugprint "S: $1 = $2"; debugprint "S: $1 = $2";
} }
$myvar{'have_galera'} = "NO"; $myvar{'have_galera'} = "NO";
if (defined($myvar{'wsrep_provider_options'})) { if ( defined($myvar{'wsrep_provider_options'}) && $myvar{'wsrep_provider_options'} ne "") {
$myvar{'have_galera'} = "YES"; $myvar{'have_galera'} = "YES";
debugprint "Galera options: ". $myvar{'wsrep_provider_options'}; debugprint "Galera options: ". $myvar{'wsrep_provider_options'};
} }
@ -1477,7 +1477,7 @@ sub get_replication_status {
} }
if ( scalar( keys %myrepl ) == 0 and scalar( keys %myslaves ) == 0 ) { if ( scalar( keys %myrepl ) == 0 and scalar( keys %myslaves ) == 0 ) {
infoprint "This is a standalone server.."; infoprint "This is a standalone server.";
return; return;
} }
if ( scalar( keys %myrepl ) == 0 ) { if ( scalar( keys %myrepl ) == 0 ) {
@ -3127,21 +3127,20 @@ sub mariadb_galera {
if ( defined($myvar{'wsrep_cluster_name'}) and $myvar{'wsrep_on'} eq "ON" ) { if ( defined($myvar{'wsrep_cluster_name'}) and $myvar{'wsrep_on'} eq "ON" ) {
goodprint "Galera WsREP is enabled."; goodprint "Galera WsREP is enabled.";
if ( defined($myvar{'wsrep_cluster_address'}) and trim("$myvar{'wsrep_cluster_address'}") ne "") {
goodprint "Galera Cluster address is defined: ".$myvar{'wsrep_cluster_address'};
} else {
badprint "Galera Cluster address is undefined";
push @adjvars, "set up wsrep_cluster_address variable for Galera replication";
}
if ( defined($myvar{'wsrep_cluster_name'}) and trim($myvar{'wsrep_cluster_name'}) ne "") {
goodprint "Galera Cluster name is defined: ".$myvar{'wsrep_cluster_name'};
} else {
badprint "Galera Cluster name is undefined";
push @adjvars, "set up wsrep_cluster_name variable for Galera replication";
}
} else { } else {
badprint "Galera Wsesp is disabled"; badprint "Galera WsREP is disabled";
}
if ( defined($myvar{'wsrep_cluster_address'}) and trim("$myvar{'wsrep_cluster_address'}") ne "") {
goodprint "Galera Cluster address is defined: ".$myvar{'wsrep_cluster_address'};
} else {
badprint "Galera Cluster address is undefined";
push @adjvars, "set up wsrep_cluster_address variable for Galera replication";
}
if ( defined($myvar{'wsrep_cluster_name'}) and trim($myvar{'wsrep_cluster_name'}) ne "") {
goodprint "Galera Cluster name is defined: ".$myvar{'wsrep_cluster_name'};
} else {
badprint "Galera Cluster name is undefined";
push @adjvars, "set up wsrep_cluster_name variable for Galera replication";
} }
} }