mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
Merge heikki@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
This commit is contained in:
commit
3e0df1999a
1 changed files with 9 additions and 1 deletions
|
@ -3501,6 +3501,8 @@ check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>§ions,
|
|||
BaseString node_group_warning, arbitration_warning;
|
||||
const char *arbit_warn_fmt=
|
||||
"\n arbitrator with id %d and db node with id %d on same host %s";
|
||||
const char *arbit_warn_fmt2=
|
||||
"\n arbitrator with id %d has no hostname specified";
|
||||
|
||||
ctx.m_userProperties.get("NoOfNodes", &n_nodes);
|
||||
for (i= 0, n= 0; n < n_nodes; i++){
|
||||
|
@ -3583,13 +3585,19 @@ check_node_vs_replicas(Vector<ConfigInfo::ConfigRuleSection>§ions,
|
|||
arbitration_warning.appfmt(arbit_warn_fmt, i, ii, host);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
arbitration_warning.appfmt(arbit_warn_fmt2, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (db_host_count > 1 && node_group_warning.length() > 0)
|
||||
ndbout_c("Cluster configuration warning:\n%s",node_group_warning.c_str());
|
||||
if (db_host_count > 1 && arbitration_warning.length() > 0)
|
||||
ndbout_c("Cluster configuration warning:%s",arbitration_warning.c_str());
|
||||
ndbout_c("Cluster configuration warning:%s%s",arbitration_warning.c_str(),
|
||||
"\n Running arbitrator on the same host as a database node may"
|
||||
"\n cause complete cluster shutdown in case of host failure.");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue