mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

changed order of transporter_connect and closing the mgmapisession

Browse source 
ndb/src/mgmsrv/MgmtSrvr.cpp:
  removed the extra setting of connected node, not needed
This commit is contained in:
unknown 2005-03-04 12:19:53 +01:00
commit db86cb81aa
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ndb/src/mgmsrv/MgmtSrvr.cpp
View file

@ -55,7 +55,6 @@
#include <mgmapi_configuration.hpp>
#include <mgmapi_config_parameters.h>
#include <m_string.h>
#include <Transporter.hpp>
//#define MGM_SRV_DEBUG
#ifdef MGM_SRV_DEBUG
@ -2139,11 +2138,7 @@ MgmtSrvr::get_connected_nodes(NodeBitmask &connected_nodes) const
if (getNodeType(i) == NDB_MGM_NODE_TYPE_NDB)
{
const ClusterMgr::Node &node= theFacade->theClusterMgr->getNodeInfo(i);
if (theFacade->get_registry()->get_transporter(i)->isConnected())
{
connected_nodes.bitOR(node.m_state.m_connected_nodes);
connected_nodes.set(i);
}
connected_nodes.bitOR(node.m_state.m_connected_nodes);
}
}
}

10
ndb/src/mgmsrv/Services.cpp
View file

@ -1546,19 +1546,19 @@ MgmApiSession::check_connection(Parser_t::Context &ctx,
void
MgmApiSession::transporter_connect(Parser_t::Context &ctx,
Properties const &args) {
NDB_SOCKET_TYPE s= m_socket;
Properties const &args)
{
m_mgmsrv.transporter_connect(m_socket);
m_stop= true;
m_stopped= true; // force a stop (no closing socket)
m_socket= NDB_INVALID_SOCKET; // so nobody closes it
m_mgmsrv.transporter_connect(s);
}
void
MgmApiSession::get_mgmd_nodeid(Parser_t::Context &ctx,
Properties const &args) {
Properties const &args)
{
m_output->println("get mgmd nodeid reply");
m_output->println("nodeid:%u",m_mgmsrv.getOwnNodeId());
m_output->println("");