mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
Use the mgm connection used for fetching configuration as a transporter.
ndb/include/mgmapi/mgmapi.h: Add mgmapi call: ndb_mgm_get_mgmd_nodeid() - returns the node id that the handle is connected to. - returns 0 on error. ndb/include/transporter/TransporterRegistry.hpp: Add TransporterRegistry::connect_client(NdbMgmHandle h) - uses a connected NdbMgmHandle to connect to the mgm server as a client. - sets up a transporter connection - used to transform the initial mgm connection (used for fetching configuration) into a transporter connection Added connect_ndb_mgmd(NdbMgmHandle h) - turn the supplied mgm connection into a transporter connection - return the socket Improve comments on connect_ndb_mgmd(SocketClient) ndb/src/common/transporter/Transporter.cpp: Add Transporter::connect_client(NDB_SOCKET_TYPE) - use an existing socket to make a transporter connection ndb/src/common/transporter/Transporter.hpp: Add connect_client(NDB_SOCKET_TYPE) ndb/src/common/transporter/TransporterRegistry.cpp: Add TransporterRegistry::connect_client(NdbMgmHandle) - use an existing mgm connection to connect a transporter - used to change the mgm connection used for fetching configuration into a transporter Add connect_ndb_mgmd(NdbMgmHandle) - use existing NdbMgmHandle - convert to transporter - return socket ndb/src/kernel/vm/Configuration.cpp: After fetching configuration, use the mgm connection as a transporter. Fail fatally if this fails. ndb/src/mgmapi/mgmapi.cpp: Add ndb_mgm_get_mgmd_nodeid(h) - returns the node id of the mgm server you're connected to. ndb/src/mgmsrv/Services.cpp: Add "get mgmd nodeid" mgmd call returns 'nodeid' - the node id of the mgm server your connected to ndb/src/mgmsrv/Services.hpp: add prototype for get_mgmd_nodeid
This commit is contained in:
parent
3bd6f299fc
commit
bb5a2f280f
9 changed files with 123 additions and 18 deletions
|
@ -996,6 +996,10 @@ extern "C" {
|
|||
*/
|
||||
NDB_SOCKET_TYPE ndb_mgm_convert_to_transporter(NdbMgmHandle handle);
|
||||
|
||||
/**
|
||||
* Get the node id of the mgm server we're connected to
|
||||
*/
|
||||
Uint32 ndb_mgm_get_mgmd_nodeid(NdbMgmHandle handle);
|
||||
|
||||
/**
|
||||
* Config iterator
|
||||
|
|
|
@ -116,11 +116,20 @@ public:
|
|||
*/
|
||||
bool connect_server(NDB_SOCKET_TYPE sockfd);
|
||||
|
||||
int TransporterRegistry::connect_client(NdbMgmHandle h);
|
||||
|
||||
/**
|
||||
* use a mgmd connection to connect as a transporter
|
||||
* Given a SocketClient, creates a NdbMgmHandle, turns it into a transporter
|
||||
* and returns the socket.
|
||||
*/
|
||||
NDB_SOCKET_TYPE connect_ndb_mgmd(SocketClient *sc);
|
||||
|
||||
/**
|
||||
* Given a connected NdbMgmHandle, turns it into a transporter
|
||||
* and returns the socket.
|
||||
*/
|
||||
NDB_SOCKET_TYPE connect_ndb_mgmd(NdbMgmHandle h);
|
||||
|
||||
/**
|
||||
* Remove all transporters
|
||||
*/
|
||||
|
|
|
@ -124,6 +124,15 @@ Transporter::connect_client() {
|
|||
else
|
||||
sockfd= m_socket_client->connect();
|
||||
|
||||
connect_client(sockfd);
|
||||
}
|
||||
|
||||
bool
|
||||
Transporter::connect_client(NDB_SOCKET_TYPE sockfd) {
|
||||
|
||||
if(m_connected)
|
||||
return true;
|
||||
|
||||
if (sockfd == NDB_INVALID_SOCKET)
|
||||
return false;
|
||||
|
||||
|
|
|
@ -44,6 +44,7 @@ public:
|
|||
* Use isConnected() to check status
|
||||
*/
|
||||
bool connect_client();
|
||||
bool connect_client(NDB_SOCKET_TYPE sockfd);
|
||||
bool connect_server(NDB_SOCKET_TYPE socket);
|
||||
|
||||
/**
|
||||
|
|
|
@ -1521,10 +1521,61 @@ TransporterRegistry::get_transporter(NodeId nodeId) {
|
|||
return theTransporters[nodeId];
|
||||
}
|
||||
|
||||
int TransporterRegistry::connect_client(NdbMgmHandle h)
|
||||
{
|
||||
DBUG_ENTER("TransporterRegistry::connect_client(NdbMgmHandle)");
|
||||
|
||||
Uint32 mgm_nodeid= ndb_mgm_get_mgmd_nodeid(h);
|
||||
|
||||
Transporter * t = theTransporters[mgm_nodeid];
|
||||
if (!t)
|
||||
return -1;
|
||||
|
||||
DBUG_RETURN(t->connect_client(connect_ndb_mgmd(h)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Given a connected NdbMgmHandle, turns it into a transporter
|
||||
* and returns the socket.
|
||||
*/
|
||||
NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(NdbMgmHandle h)
|
||||
{
|
||||
struct ndb_mgm_reply mgm_reply;
|
||||
|
||||
if ( h == NULL )
|
||||
{
|
||||
return NDB_INVALID_SOCKET;
|
||||
}
|
||||
|
||||
for(unsigned int i=0;i < m_transporter_interface.size();i++)
|
||||
if (ndb_mgm_set_connection_int_parameter(h,
|
||||
get_localNodeId(),
|
||||
m_transporter_interface[i].m_remote_nodeId,
|
||||
CFG_CONNECTION_SERVER_PORT,
|
||||
m_transporter_interface[i].m_s_service_port,
|
||||
&mgm_reply) < 0)
|
||||
{
|
||||
ndb_mgm_destroy_handle(&h);
|
||||
return NDB_INVALID_SOCKET;
|
||||
}
|
||||
|
||||
/**
|
||||
* convert_to_transporter also disposes of the handle (i.e. we don't leak
|
||||
* memory here.
|
||||
*/
|
||||
NDB_SOCKET_TYPE sockfd= ndb_mgm_convert_to_transporter(h);
|
||||
if ( sockfd == NDB_INVALID_SOCKET)
|
||||
ndb_mgm_destroy_handle(&h);
|
||||
return sockfd;
|
||||
}
|
||||
|
||||
/**
|
||||
* Given a SocketClient, creates a NdbMgmHandle, turns it into a transporter
|
||||
* and returns the socket.
|
||||
*/
|
||||
NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(SocketClient *sc)
|
||||
{
|
||||
NdbMgmHandle h= ndb_mgm_create_handle();
|
||||
struct ndb_mgm_reply mgm_reply;
|
||||
|
||||
if ( h == NULL )
|
||||
{
|
||||
|
@ -1562,22 +1613,7 @@ NDB_SOCKET_TYPE TransporterRegistry::connect_ndb_mgmd(SocketClient *sc)
|
|||
return NDB_INVALID_SOCKET;
|
||||
}
|
||||
|
||||
for(unsigned int i=0;i < m_transporter_interface.size();i++)
|
||||
if (ndb_mgm_set_connection_int_parameter(h,
|
||||
get_localNodeId(),
|
||||
m_transporter_interface[i].m_remote_nodeId,
|
||||
CFG_CONNECTION_SERVER_PORT,
|
||||
m_transporter_interface[i].m_s_service_port,
|
||||
&mgm_reply) < 0)
|
||||
{
|
||||
ndb_mgm_destroy_handle(&h);
|
||||
return NDB_INVALID_SOCKET;
|
||||
}
|
||||
|
||||
NDB_SOCKET_TYPE sockfd= ndb_mgm_convert_to_transporter(h);
|
||||
if ( sockfd == NDB_INVALID_SOCKET)
|
||||
ndb_mgm_destroy_handle(&h);
|
||||
return sockfd;
|
||||
return connect_ndb_mgmd(h);
|
||||
}
|
||||
|
||||
template class Vector<TransporterRegistry::Transporter_interface>;
|
||||
|
|
|
@ -313,6 +313,9 @@ Configuration::setupConfiguration(){
|
|||
ERROR_SET(fatal, ERR_INVALID_CONFIG, "Invalid configuration fetched",
|
||||
"No transporters configured");
|
||||
}
|
||||
if(!globalTransporterRegistry.connect_client(m_config_retriever->get_mgmHandle()))
|
||||
ERROR_SET(fatal, ERR_INVALID_CONFIG, "Connection to mgmd terminated before setup was complete",
|
||||
"StopOnError missing");
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -2208,4 +2208,35 @@ ndb_mgm_convert_to_transporter(NdbMgmHandle handle)
|
|||
return s;
|
||||
}
|
||||
|
||||
extern "C"
|
||||
Uint32
|
||||
ndb_mgm_get_mgmd_nodeid(NdbMgmHandle handle)
|
||||
{
|
||||
Uint32 nodeid=0;
|
||||
|
||||
DBUG_ENTER("ndb_mgm_get_mgmd_nodeid");
|
||||
CHECK_HANDLE(handle, 0);
|
||||
CHECK_CONNECTED(handle, 0);
|
||||
|
||||
Properties args;
|
||||
|
||||
const ParserRow<ParserDummy> reply[]= {
|
||||
MGM_CMD("get mgmd nodeid reply", NULL, ""),
|
||||
MGM_ARG("nodeid", Int, Mandatory, "Node ID"),
|
||||
MGM_END()
|
||||
};
|
||||
|
||||
const Properties *prop;
|
||||
prop = ndb_mgm_call(handle, reply, "get mgmd nodeid", &args);
|
||||
CHECK_REPLY(prop, 0);
|
||||
|
||||
if(!prop->get("nodeid",&nodeid)){
|
||||
ndbout_c("Unable to get value");
|
||||
return 0;
|
||||
}
|
||||
|
||||
delete prop;
|
||||
DBUG_RETURN(nodeid);
|
||||
}
|
||||
|
||||
template class Vector<const ParserRow<ParserDummy>*>;
|
||||
|
|
|
@ -266,6 +266,8 @@ ParserRow<MgmApiSession> commands[] = {
|
|||
|
||||
MGM_CMD("transporter connect", &MgmApiSession::transporter_connect, ""),
|
||||
|
||||
MGM_CMD("get mgmd nodeid", &MgmApiSession::get_mgmd_nodeid, ""),
|
||||
|
||||
MGM_END()
|
||||
};
|
||||
|
||||
|
@ -1554,5 +1556,13 @@ MgmApiSession::transporter_connect(Parser_t::Context &ctx,
|
|||
m_mgmsrv.transporter_connect(s);
|
||||
}
|
||||
|
||||
void
|
||||
MgmApiSession::get_mgmd_nodeid(Parser_t::Context &ctx,
|
||||
Properties const &args) {
|
||||
m_output->println("get mgmd nodeid reply");
|
||||
m_output->println("nodeid:%u",m_mgmsrv.getOwnNodeId());
|
||||
m_output->println("");
|
||||
}
|
||||
|
||||
template class MutexVector<int>;
|
||||
template class Vector<ParserRow<MgmApiSession> const*>;
|
||||
|
|
|
@ -99,6 +99,8 @@ public:
|
|||
void check_connection(Parser_t::Context &ctx, const class Properties &args);
|
||||
|
||||
void transporter_connect(Parser_t::Context &ctx, Properties const &args);
|
||||
|
||||
void get_mgmd_nodeid(Parser_t::Context &ctx, Properties const &args);
|
||||
|
||||
void repCommand(Parser_t::Context &ctx, const class Properties &args);
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue