Merge pull request #200 from vchepkov/wsrep_fix

fixed wsrep_cluster_size handling
This commit is contained in:
Jean-Marie Renouard 2016-04-28 08:50:08 +02:00
commit 8f12b640a0

View file

@ -3239,28 +3239,22 @@ sub mariadb_galera {
goodprint "Galera Cluster address is defined: " goodprint "Galera Cluster address is defined: "
. $myvar{'wsrep_cluster_address'}; . $myvar{'wsrep_cluster_address'};
my $nbNodes = scalar( split /,/, $myvar{'wsrep_cluster_address'} ); my $nbNodes = scalar( split /,/, $myvar{'wsrep_cluster_address'} );
if ( $nbNodes != 3 or $nbNodes != 5 ) { infoprint "There are $nbNodes nodes in wsrep_cluster_address";
goodprint "There are $nbNodes nodes in wsrep_cluster_address.";
}
else {
badprint
"There are $nbNodes nodes in wsrep_cluster_address. Prefer 3 or 5 nodes architecture.";
}
my $nbNodesSize = trim( $mystat{'wsrep_cluster_size'} ); my $nbNodesSize = trim( $mystat{'wsrep_cluster_size'} );
if ( $nbNodesSize != 3 or $nbNodesSize != 5 ) { if ( $nbNodesSize == 3 or $nbNodesSize == 5 ) {
goodprint "There are $nbNodes nodes in wsrep_cluster_size."; goodprint "There are $nbNodesSize nodes in wsrep_cluster_size.";
} }
else { else {
badprint badprint
"There are $nbNodes nodes in wsrep_cluster_size. Prefer 3 or 5 nodes architecture."; "There are $nbNodesSize nodes in wsrep_cluster_size. Prefer 3 or 5 nodes architecture.";
} }
# wsrep_cluster_address doesn't include garbd nodes
if ( $nbNodes != trim( $mystat{'wsrep_cluster_size'} ) ) { if ( $nbNodes > $nbNodesSize ) {
badprint badprint
"All cluster nodes are not detected. wsrep_cluster_size != information in wsrep_cluster_address"; "All cluster nodes are not detected. wsrep_cluster_size less then node count in wsrep_cluster_address";
} }
else { else {
badprint "All cluster nodes detected."; goodprint "All cluster nodes detected.";
} }
} }
else { else {