mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Forgott to update testBackuo w.r.t to ConfigRetreiver

Browse source
This commit is contained in:
joreland@mysql.com 2004-08-09 14:10:50 +02:00
parent e3ed90a1e5
commit e7d89abf33
2 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ndb/test/src/NdbBackup.cpp
View file

@ -69,17 +69,24 @@ NdbBackup::getFileSystemPathForNode(int _node_id){
/**
* Fetch configuration from management server
*/
ConfigRetriever cr;
ConfigRetriever cr(0, NODE_TYPE_API);
ndb_mgm_configuration * p;
ndb_mgm_configuration * p = cr.getConfig(host.c_str(), port, 0, NODE_TYPE_API);
if(p == 0){
const char * s = cr.getErrorString();
if(s == 0)
s = "No error given!";
BaseString tmp; tmp.assfmt("%s:%d", host.c_str(), port);
NdbMgmHandle handle = ndb_mgm_create_handle();
if(handle == 0 || ndb_mgm_connect(handle, tmp.c_str()) != 0 &&
(p = ndb_mgm_get_configuration(handle, 0)) == 0){
ndbout << "Could not fetch configuration" << endl;
ndbout << s << endl;
return NULL;
const char * s = 0;
if(p == 0 && handle != 0){
s = ndb_mgm_get_latest_error_msg(handle);
if(s == 0)
s = "No error given!";
ndbout << "Could not fetch configuration" << endl;
ndbout << s << endl;
return NULL;
}
}
/**

12
ndb/test/src/NdbRestarter.cpp
View file

@ -46,21 +46,21 @@ NdbRestarter::NdbRestarter(const char* _addr):
return;
}
if (lcfg.items == 0){
if (lcfg.ids.size() == 0){
g_err << "NdbRestarter - No management servers configured in local config file" << endl;
return;
}
for (int i = 0; i<lcfg.items; i++){
MgmtSrvrId * m = lcfg.ids[i];
for (int i = 0; i<lcfg.ids.size(); i++){
MgmtSrvrId * m = &lcfg.ids[i];
switch(m->type){
case MgmId_TCP:
char buf[255];
snprintf(buf, 255, "%s:%d", m->data.tcp.remoteHost, m->data.tcp.port);
snprintf(buf, 255, "%s:%d", m->name.c_str(), m->port);
addr.assign(buf);
host.assign(m->data.tcp.remoteHost);
port = m->data.tcp.port;
host.assign(m->name.c_str());
port = m->port;
return;
break;
case MgmId_File: