Skip to content

M
mariadb
Commit 0811fd79 authored by stewart@willster.(none)'s avatar stewart@willster.(none)
Browse files
Options

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue 

into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
parents 45d7e75c 3e1a5169
Expand all Show whitespace changes
Inline Side-by-side
Showing with 541 additions and 206 deletions
storage/ndb/include/mgmapi/mgmapi.h
View file @ 0811fd79
...@@ -699,6 +699,28 @@ extern "C" { ...@@ -699,6 +699,28 @@ extern "C" {
int ndb_mgm_stop2(NdbMgmHandle handle, int no_of_nodes, int ndb_mgm_stop2(NdbMgmHandle handle, int no_of_nodes,
const int * node_list, int abort); const int * node_list, int abort);
/**
* Stops cluster nodes
*
* @param handle Management handle.
* @param no_of_nodes Number of database nodes to stop<br>
* -1: All database and management nodes<br>
* 0: All database nodes in cluster<br>
* n: Stop the <var>n</var> node(s) specified in
* the array node_list
* @param node_list List of node IDs of database nodes to be stopped
* @param abort Don't perform graceful stop,
* but rather stop immediately
* @param disconnect Returns true if you need to disconnect to apply
* the stop command (e.g. stopping the mgm server
* that handle is connected to)
*
* @return Number of nodes stopped (-1 on error).
*/
int ndb_mgm_stop3(NdbMgmHandle handle, int no_of_nodes,
const int * node_list, int abort, int *disconnect);
/** /**
* Restart database nodes * Restart database nodes
* *
...@@ -738,6 +760,31 @@ extern "C" { ...@@ -738,6 +760,31 @@ extern "C" {
const int * node_list, int initial, const int * node_list, int initial,
int nostart, int abort); int nostart, int abort);
/**
* Restart nodes
*
* @param handle Management handle.
* @param no_of_nodes Number of database nodes to be restarted:<br>
* 0: Restart all database nodes in the cluster<br>
* n: Restart the <var>n</var> node(s) specified in the
* array node_list
* @param node_list List of node IDs of database nodes to be restarted
* @param initial Remove filesystem from restarting node(s)
* @param nostart Don't actually start node(s) but leave them
* waiting for start command
* @param abort Don't perform graceful restart,
* but rather restart immediately
* @param disconnect Returns true if mgmapi client must disconnect from
* server to apply the requested operation. (e.g.
* restart the management server)
*
*
* @return Number of nodes stopped (-1 on error).
*/
int ndb_mgm_restart3(NdbMgmHandle handle, int no_of_nodes,
const int * node_list, int initial,
int nostart, int abort, int *disconnect);
/** /**
* Start database nodes * Start database nodes
* *
...@@ -1018,6 +1065,16 @@ extern "C" { ...@@ -1018,6 +1065,16 @@ extern "C" {
*/ */
Uint32 ndb_mgm_get_mgmd_nodeid(NdbMgmHandle handle); Uint32 ndb_mgm_get_mgmd_nodeid(NdbMgmHandle handle);
/**
* Get the version of the mgm server we're talking to.
* Designed to allow switching of protocol depending on version
* so that new clients can speak to old servers in a compat mode
*/
int ndb_mgm_get_version(NdbMgmHandle handle,
int *major, int *minor, int* build,
int len, char* str);
/** /**
* Config iterator * Config iterator
*/ */
......
storage/ndb/src/mgmapi/mgmapi.cpp
View file @ 0811fd79
This diff is collapsed.
storage/ndb/src/mgmclient/CommandInterpreter.cpp
View file @ 0811fd79
...@@ -155,6 +155,7 @@ private: ...@@ -155,6 +155,7 @@ private:
NdbMgmHandle m_mgmsrv; NdbMgmHandle m_mgmsrv;
NdbMgmHandle m_mgmsrv2; NdbMgmHandle m_mgmsrv2;
const char *m_constr;
bool m_connected; bool m_connected;
int m_verbose; int m_verbose;
int try_reconnect; int try_reconnect;
...@@ -335,22 +336,7 @@ convert(const char* s, int& val) { ...@@ -335,22 +336,7 @@ convert(const char* s, int& val) {
CommandInterpreter::CommandInterpreter(const char *_host,int verbose) CommandInterpreter::CommandInterpreter(const char *_host,int verbose)
: m_verbose(verbose) : m_verbose(verbose)
{ {
m_mgmsrv = ndb_mgm_create_handle(); m_constr= _host;
if(m_mgmsrv == NULL) {
ndbout_c("Cannot create handle to management server.");
exit(-1);
}
m_mgmsrv2 = ndb_mgm_create_handle();
if(m_mgmsrv2 == NULL) {
ndbout_c("Cannot create 2:nd handle to management server.");
exit(-1);
}
if (ndb_mgm_set_connectstring(m_mgmsrv, _host))
{
printError();
exit(-1);
}
m_connected= false; m_connected= false;
m_event_thread= 0; m_event_thread= 0;
try_reconnect = 0; try_reconnect = 0;
...@@ -362,8 +348,6 @@ CommandInterpreter::CommandInterpreter(const char *_host,int verbose) ...@@ -362,8 +348,6 @@ CommandInterpreter::CommandInterpreter(const char *_host,int verbose)
CommandInterpreter::~CommandInterpreter() CommandInterpreter::~CommandInterpreter()
{ {
disconnect(); disconnect();
ndb_mgm_destroy_handle(&m_mgmsrv);
ndb_mgm_destroy_handle(&m_mgmsrv2);
} }
static bool static bool
...@@ -385,15 +369,14 @@ emptyString(const char* s) ...@@ -385,15 +369,14 @@ emptyString(const char* s)
void void
CommandInterpreter::printError() CommandInterpreter::printError()
{ {
if (ndb_mgm_check_connection(m_mgmsrv))
{
m_connected= false;
disconnect();
}
ndbout_c("* %5d: %s", ndbout_c("* %5d: %s",
ndb_mgm_get_latest_error(m_mgmsrv), ndb_mgm_get_latest_error(m_mgmsrv),
ndb_mgm_get_latest_error_msg(m_mgmsrv)); ndb_mgm_get_latest_error_msg(m_mgmsrv));
ndbout_c("* %s", ndb_mgm_get_latest_error_desc(m_mgmsrv)); ndbout_c("* %s", ndb_mgm_get_latest_error_desc(m_mgmsrv));
if (ndb_mgm_check_connection(m_mgmsrv))
{
disconnect();
}
} }
//***************************************************************************** //*****************************************************************************
...@@ -440,10 +423,30 @@ bool ...@@ -440,10 +423,30 @@ bool
CommandInterpreter::connect() CommandInterpreter::connect()
{ {
DBUG_ENTER("CommandInterpreter::connect"); DBUG_ENTER("CommandInterpreter::connect");
if(!m_connected)
{ if(m_connected)
if(!ndb_mgm_connect(m_mgmsrv, try_reconnect-1, 5, 1)) DBUG_RETURN(m_connected);
m_mgmsrv = ndb_mgm_create_handle();
if(m_mgmsrv == NULL) {
ndbout_c("Cannot create handle to management server.");
exit(-1);
}
m_mgmsrv2 = ndb_mgm_create_handle();
if(m_mgmsrv2 == NULL) {
ndbout_c("Cannot create 2:nd handle to management server.");
exit(-1);
}
if (ndb_mgm_set_connectstring(m_mgmsrv, m_constr))
{ {
printError();
exit(-1);
}
if(ndb_mgm_connect(m_mgmsrv, try_reconnect-1, 5, 1))
DBUG_RETURN(m_connected); // couldn't connect, always false
const char *host= ndb_mgm_get_connected_host(m_mgmsrv); const char *host= ndb_mgm_get_connected_host(m_mgmsrv);
unsigned port= ndb_mgm_get_connected_port(m_mgmsrv); unsigned port= ndb_mgm_get_connected_port(m_mgmsrv);
BaseString constr; BaseString constr;
...@@ -507,8 +510,7 @@ CommandInterpreter::connect() ...@@ -507,8 +510,7 @@ CommandInterpreter::connect()
printf("Connected to Management Server at: %s:%d\n", printf("Connected to Management Server at: %s:%d\n",
host, port); host, port);
} }
}
}
DBUG_RETURN(m_connected); DBUG_RETURN(m_connected);
} }
...@@ -516,20 +518,18 @@ bool ...@@ -516,20 +518,18 @@ bool
CommandInterpreter::disconnect() CommandInterpreter::disconnect()
{ {
DBUG_ENTER("CommandInterpreter::disconnect"); DBUG_ENTER("CommandInterpreter::disconnect");
if (m_event_thread) { if (m_event_thread) {
void *res; void *res;
do_event_thread= 0; do_event_thread= 0;
NdbThread_WaitFor(m_event_thread, &res); NdbThread_WaitFor(m_event_thread, &res);
NdbThread_Destroy(&m_event_thread); NdbThread_Destroy(&m_event_thread);
m_event_thread= 0; m_event_thread= 0;
ndb_mgm_disconnect(m_mgmsrv2); ndb_mgm_destroy_handle(&m_mgmsrv2);
} }
if (m_connected) if (m_connected)
{ {
if (ndb_mgm_disconnect(m_mgmsrv) == -1) { ndb_mgm_destroy_handle(&m_mgmsrv);
ndbout_c("Could not disconnect from management server");
printError();
}
m_connected= false; m_connected= false;
} }
DBUG_RETURN(true); DBUG_RETURN(true);
...@@ -985,7 +985,8 @@ CommandInterpreter::executeShutdown(char* parameters) ...@@ -985,7 +985,8 @@ CommandInterpreter::executeShutdown(char* parameters)
NdbAutoPtr<char> ap1((char*)state); NdbAutoPtr<char> ap1((char*)state);
int result = 0; int result = 0;
result = ndb_mgm_stop(m_mgmsrv, 0, 0); int need_disconnect;
result = ndb_mgm_stop3(m_mgmsrv, -1, 0, 0, &need_disconnect);
if (result < 0) { if (result < 0) {
ndbout << "Shutdown of NDB Cluster node(s) failed." << endl; ndbout << "Shutdown of NDB Cluster node(s) failed." << endl;
printError(); printError();
...@@ -994,28 +995,11 @@ CommandInterpreter::executeShutdown(char* parameters) ...@@ -994,28 +995,11 @@ CommandInterpreter::executeShutdown(char* parameters)
ndbout << result << " NDB Cluster node(s) have shutdown." << endl; ndbout << result << " NDB Cluster node(s) have shutdown." << endl;
int mgm_id= 0; if(need_disconnect) {
mgm_id= ndb_mgm_get_mgmd_nodeid(m_mgmsrv); ndbout << "Disconnecting to allow management server to shutdown."
if (mgm_id == 0)
{
ndbout << "Unable to locate management server, "
<< "shutdown manually with <id> STOP"
<< endl; << endl;
return 1;
}
result = ndb_mgm_stop(m_mgmsrv, 1, &mgm_id);
if (result <= 0) {
ndbout << "Shutdown of NDB Cluster management server failed." << endl;
printError();
if (result == 0)
return 1;
return result;
}
m_connected= false;
disconnect(); disconnect();
ndbout << "NDB Cluster management server shutdown." << endl; }
return 0; return 0;
} }
...@@ -1237,12 +1221,7 @@ CommandInterpreter::executeConnect(char* parameters) ...@@ -1237,12 +1221,7 @@ CommandInterpreter::executeConnect(char* parameters)
{ {
disconnect(); disconnect();
if (!emptyString(parameters)) { if (!emptyString(parameters)) {
if (ndb_mgm_set_connectstring(m_mgmsrv, m_constr= BaseString(parameters).trim().c_str();
BaseString(parameters).trim().c_str()))
{
printError();
return;
}
} }
connect(); connect();
} }
...@@ -1407,6 +1386,7 @@ CommandInterpreter::executeStop(Vector<BaseString> &command_list, ...@@ -1407,6 +1386,7 @@ CommandInterpreter::executeStop(Vector<BaseString> &command_list,
unsigned command_pos, unsigned command_pos,
int *node_ids, int no_of_nodes) int *node_ids, int no_of_nodes)
{ {
int need_disconnect;
int abort= 0; int abort= 0;
for (; command_pos < command_list.size(); command_pos++) for (; command_pos < command_list.size(); command_pos++)
{ {
...@@ -1421,7 +1401,8 @@ CommandInterpreter::executeStop(Vector<BaseString> &command_list, ...@@ -1421,7 +1401,8 @@ CommandInterpreter::executeStop(Vector<BaseString> &command_list,
return; return;
} }
int result= ndb_mgm_stop2(m_mgmsrv, no_of_nodes, node_ids, abort); int result= ndb_mgm_stop3(m_mgmsrv, no_of_nodes, node_ids, abort,
&need_disconnect);
if (result < 0) if (result < 0)
{ {
ndbout_c("Shutdown failed."); ndbout_c("Shutdown failed.");
...@@ -1439,6 +1420,13 @@ CommandInterpreter::executeStop(Vector<BaseString> &command_list, ...@@ -1439,6 +1420,13 @@ CommandInterpreter::executeStop(Vector<BaseString> &command_list,
ndbout_c(" has shutdown."); ndbout_c(" has shutdown.");
} }
} }
if(need_disconnect)
{
ndbout << "Disconnecting to allow Management Server to shutdown" << endl;
disconnect();
}
} }
void void
...@@ -1529,6 +1517,7 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list, ...@@ -1529,6 +1517,7 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
int nostart= 0; int nostart= 0;
int initialstart= 0; int initialstart= 0;
int abort= 0; int abort= 0;
int need_disconnect= 0;
for (; command_pos < command_list.size(); command_pos++) for (; command_pos < command_list.size(); command_pos++)
{ {
...@@ -1553,8 +1542,8 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list, ...@@ -1553,8 +1542,8 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
return; return;
} }
result= ndb_mgm_restart2(m_mgmsrv, no_of_nodes, node_ids, result= ndb_mgm_restart3(m_mgmsrv, no_of_nodes, node_ids,
initialstart, nostart, abort); initialstart, nostart, abort, &need_disconnect);
if (result <= 0) { if (result <= 0) {
ndbout_c("Restart failed."); ndbout_c("Restart failed.");
...@@ -1571,6 +1560,8 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list, ...@@ -1571,6 +1560,8 @@ CommandInterpreter::executeRestart(Vector<BaseString> &command_list,
ndbout << " " << node_ids[i]; ndbout << " " << node_ids[i];
ndbout_c(" is being restarted"); ndbout_c(" is being restarted");
} }
if(need_disconnect)
disconnect();
} }
} }
......
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
View file @ 0811fd79
...@@ -60,9 +60,6 @@ ...@@ -60,9 +60,6 @@
#include <SignalSender.hpp> #include <SignalSender.hpp>
extern bool g_StopServer;
extern bool g_RestartServer;
//#define MGM_SRV_DEBUG //#define MGM_SRV_DEBUG
#ifdef MGM_SRV_DEBUG #ifdef MGM_SRV_DEBUG
#define DEBUG(x) do ndbout << x << endl; while(0) #define DEBUG(x) do ndbout << x << endl; while(0)
...@@ -937,6 +934,13 @@ int MgmtSrvr::sendStopMgmd(NodeId nodeId, ...@@ -937,6 +934,13 @@ int MgmtSrvr::sendStopMgmd(NodeId nodeId,
* client connection to that mgmd and stop it that way. * client connection to that mgmd and stop it that way.
* This allows us to stop mgm servers when there isn't any real * This allows us to stop mgm servers when there isn't any real
* distributed communication up. * distributed communication up.
*
* node_ids.size()==0 means to stop all DB nodes.
* MGM nodes will *NOT* be stopped.
*
* If we work out we should be stopping or restarting ourselves,
* we return <0 in stopSelf for restart, >0 for stop
* and 0 for do nothing.
*/ */
int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids, int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids,
...@@ -946,7 +950,8 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids, ...@@ -946,7 +950,8 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids,
bool stop, bool stop,
bool restart, bool restart,
bool nostart, bool nostart,
bool initialStart) bool initialStart,
int* stopSelf)
{ {
int error = 0; int error = 0;
DBUG_ENTER("MgmtSrvr::sendSTOP_REQ"); DBUG_ENTER("MgmtSrvr::sendSTOP_REQ");
...@@ -995,12 +1000,13 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids, ...@@ -995,12 +1000,13 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids,
NodeId nodeId= 0; NodeId nodeId= 0;
int use_master_node= 0; int use_master_node= 0;
int do_send= 0; int do_send= 0;
int do_stop_self= 0; *stopSelf= 0;
NdbNodeBitmask nodes_to_stop; NdbNodeBitmask nodes_to_stop;
{ {
for (unsigned i= 0; i < node_ids.size(); i++) for (unsigned i= 0; i < node_ids.size(); i++)
{ {
nodeId= node_ids[i]; nodeId= node_ids[i];
ndbout << "asked to stop " << nodeId << endl;
if (getNodeType(nodeId) != NDB_MGM_NODE_TYPE_MGM) if (getNodeType(nodeId) != NDB_MGM_NODE_TYPE_MGM)
nodes_to_stop.set(nodeId); nodes_to_stop.set(nodeId);
else if (nodeId != getOwnNodeId()) else if (nodeId != getOwnNodeId())
...@@ -1011,7 +1017,11 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids, ...@@ -1011,7 +1017,11 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids,
stoppedNodes.set(nodeId); stoppedNodes.set(nodeId);
} }
else else
do_stop_self= 1;; {
ndbout << "which is me" << endl;
*stopSelf= (restart)? -1 : 1;
stoppedNodes.set(nodeId);
}
} }
} }
int no_of_nodes_to_stop= nodes_to_stop.count(); int no_of_nodes_to_stop= nodes_to_stop.count();
...@@ -1044,14 +1054,6 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids, ...@@ -1044,14 +1054,6 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids,
nodes.set(nodeId); nodes.set(nodeId);
} }
} }
nodeId= 0;
while(getNextNodeId(&nodeId, NDB_MGM_NODE_TYPE_MGM))
{
if(nodeId==getOwnNodeId())
continue;
if(sendStopMgmd(nodeId, abort, stop, restart, nostart, initialStart)==0)
stoppedNodes.set(nodeId);
}
} }
// now wait for the replies // now wait for the replies
...@@ -1143,11 +1145,9 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids, ...@@ -1143,11 +1145,9 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids,
DBUG_RETURN(SEND_OR_RECEIVE_FAILED); DBUG_RETURN(SEND_OR_RECEIVE_FAILED);
} }
} }
if (!error && do_stop_self) if (error && *stopSelf)
{ {
if (restart) *stopSelf= 0;
g_RestartServer= true;
g_StopServer= true;
} }
DBUG_RETURN(error); DBUG_RETURN(error);
} }
...@@ -1157,7 +1157,7 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids, ...@@ -1157,7 +1157,7 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids,
*/ */
int MgmtSrvr::stopNodes(const Vector<NodeId> &node_ids, int MgmtSrvr::stopNodes(const Vector<NodeId> &node_ids,
int *stopCount, bool abort) int *stopCount, bool abort, int* stopSelf)
{ {
if (!abort) if (!abort)
{ {
...@@ -1179,20 +1179,46 @@ int MgmtSrvr::stopNodes(const Vector<NodeId> &node_ids, ...@@ -1179,20 +1179,46 @@ int MgmtSrvr::stopNodes(const Vector<NodeId> &node_ids,
false, false,
false, false,
false, false,
false); false,
stopSelf);
if (stopCount) if (stopCount)
*stopCount= nodes.count(); *stopCount= nodes.count();
return ret; return ret;
} }
int MgmtSrvr::shutdownMGM(int *stopCount, bool abort, int *stopSelf)
{
NodeId nodeId = 0;
int error;
while(getNextNodeId(&nodeId, NDB_MGM_NODE_TYPE_MGM))
{
if(nodeId==getOwnNodeId())
continue;
error= sendStopMgmd(nodeId, abort, true, false,
false, false);
if (error == 0)
*stopCount++;
}
*stopSelf= 1;
*stopCount++;
return 0;
}
/* /*
* Perform system shutdown * Perform DB nodes shutdown.
* MGM servers are left in their current state
*/ */
int MgmtSrvr::stop(int * stopCount, bool abort) int MgmtSrvr::shutdownDB(int * stopCount, bool abort)
{ {
NodeBitmask nodes; NodeBitmask nodes;
Vector<NodeId> node_ids; Vector<NodeId> node_ids;
int tmp;
int ret = sendSTOP_REQ(node_ids, int ret = sendSTOP_REQ(node_ids,
nodes, nodes,
0, 0,
...@@ -1200,7 +1226,8 @@ int MgmtSrvr::stop(int * stopCount, bool abort) ...@@ -1200,7 +1226,8 @@ int MgmtSrvr::stop(int * stopCount, bool abort)
true, true,
false, false,
false, false,
false); false,
&tmp);
if (stopCount) if (stopCount)
*stopCount = nodes.count(); *stopCount = nodes.count();
return ret; return ret;
...@@ -1225,6 +1252,7 @@ int MgmtSrvr::enterSingleUser(int * stopCount, Uint32 singleUserNodeId) ...@@ -1225,6 +1252,7 @@ int MgmtSrvr::enterSingleUser(int * stopCount, Uint32 singleUserNodeId)
} }
NodeBitmask nodes; NodeBitmask nodes;
Vector<NodeId> node_ids; Vector<NodeId> node_ids;
int stopSelf;
int ret = sendSTOP_REQ(node_ids, int ret = sendSTOP_REQ(node_ids,
nodes, nodes,
singleUserNodeId, singleUserNodeId,
...@@ -1232,7 +1260,8 @@ int MgmtSrvr::enterSingleUser(int * stopCount, Uint32 singleUserNodeId) ...@@ -1232,7 +1260,8 @@ int MgmtSrvr::enterSingleUser(int * stopCount, Uint32 singleUserNodeId)
false, false,
false, false,
false, false,
false); false,
&stopSelf);
if (stopCount) if (stopCount)
*stopCount = nodes.count(); *stopCount = nodes.count();
return ret; return ret;
...@@ -1244,7 +1273,8 @@ int MgmtSrvr::enterSingleUser(int * stopCount, Uint32 singleUserNodeId) ...@@ -1244,7 +1273,8 @@ int MgmtSrvr::enterSingleUser(int * stopCount, Uint32 singleUserNodeId)
int MgmtSrvr::restartNodes(const Vector<NodeId> &node_ids, int MgmtSrvr::restartNodes(const Vector<NodeId> &node_ids,
int * stopCount, bool nostart, int * stopCount, bool nostart,
bool initialStart, bool abort) bool initialStart, bool abort,
int *stopSelf)
{ {
NodeBitmask nodes; NodeBitmask nodes;
int ret= sendSTOP_REQ(node_ids, int ret= sendSTOP_REQ(node_ids,
...@@ -1254,7 +1284,8 @@ int MgmtSrvr::restartNodes(const Vector<NodeId> &node_ids, ...@@ -1254,7 +1284,8 @@ int MgmtSrvr::restartNodes(const Vector<NodeId> &node_ids,
false, false,
true, true,
true, true,
initialStart); initialStart,
stopSelf);
if (ret) if (ret)
return ret; return ret;
...@@ -1297,14 +1328,16 @@ int MgmtSrvr::restartNodes(const Vector<NodeId> &node_ids, ...@@ -1297,14 +1328,16 @@ int MgmtSrvr::restartNodes(const Vector<NodeId> &node_ids,
} }
/* /*
* Perform system restart * Perform restart of all DB nodes
*/ */
int MgmtSrvr::restart(bool nostart, bool initialStart, int MgmtSrvr::restartDB(bool nostart, bool initialStart,
bool abort, int * stopCount ) bool abort, int * stopCount)
{ {
NodeBitmask nodes; NodeBitmask nodes;
Vector<NodeId> node_ids; Vector<NodeId> node_ids;
int tmp;
int ret = sendSTOP_REQ(node_ids, int ret = sendSTOP_REQ(node_ids,
nodes, nodes,
0, 0,
...@@ -1312,7 +1345,8 @@ int MgmtSrvr::restart(bool nostart, bool initialStart, ...@@ -1312,7 +1345,8 @@ int MgmtSrvr::restart(bool nostart, bool initialStart,
true, true,
true, true,
true, true,
initialStart); initialStart,
&tmp);
if (ret) if (ret)
return ret; return ret;
......
storage/ndb/src/mgmsrv/MgmtSrvr.hpp
View file @ 0811fd79
...@@ -255,12 +255,15 @@ public: ...@@ -255,12 +255,15 @@ public:
* @param processId: Id of the DB process to stop * @param processId: Id of the DB process to stop
* @return 0 if succeeded, otherwise: as stated above, plus: * @return 0 if succeeded, otherwise: as stated above, plus:
*/ */
int stopNodes(const Vector<NodeId> &node_ids, int *stopCount, bool abort); int stopNodes(const Vector<NodeId> &node_ids, int *stopCount, bool abort,
int *stopSelf);
int shutdownMGM(int *stopCount, bool abort, int *stopSelf);
/** /**
* Stop the system * shutdown the DB nodes
*/ */
int stop(int * cnt = 0, bool abort = false); int shutdownDB(int * cnt = 0, bool abort = false);
/** /**
* print version info about a node * print version info about a node
...@@ -294,12 +297,12 @@ public: ...@@ -294,12 +297,12 @@ public:
*/ */
int restartNodes(const Vector<NodeId> &node_ids, int restartNodes(const Vector<NodeId> &node_ids,
int *stopCount, bool nostart, int *stopCount, bool nostart,
bool initialStart, bool abort); bool initialStart, bool abort, int *stopSelf);
/** /**
* Restart the system * Restart all DB nodes
*/ */
int restart(bool nostart, bool initialStart, int restartDB(bool nostart, bool initialStart,
bool abort = false, bool abort = false,
int * stopCount = 0); int * stopCount = 0);
...@@ -500,7 +503,8 @@ private: ...@@ -500,7 +503,8 @@ private:
bool stop, bool stop,
bool restart, bool restart,
bool nostart, bool nostart,
bool initialStart); bool initialStart,
int *stopSelf);
/** /**
* Check if it is possible to send a signal to a (DB) process * Check if it is possible to send a signal to a (DB) process
......
storage/ndb/src/mgmsrv/Services.cpp
View file @ 0811fd79
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <base64.h> #include <base64.h>
extern bool g_StopServer; extern bool g_StopServer;
extern bool g_RestartServer;
extern EventLogger g_eventLogger; extern EventLogger g_eventLogger;
static const unsigned int MAX_READ_TIMEOUT = 1000 ; static const unsigned int MAX_READ_TIMEOUT = 1000 ;
...@@ -144,7 +145,13 @@ ParserRow<MgmApiSession> commands[] = { ...@@ -144,7 +145,13 @@ ParserRow<MgmApiSession> commands[] = {
MGM_CMD("get info clusterlog", &MgmApiSession::getInfoClusterLog, ""), MGM_CMD("get info clusterlog", &MgmApiSession::getInfoClusterLog, ""),
MGM_CMD("restart node", &MgmApiSession::restart, ""), MGM_CMD("restart node", &MgmApiSession::restart_v1, ""),
MGM_ARG("node", String, Mandatory, "Nodes to restart"),
MGM_ARG("initialstart", Int, Optional, "Initial start"),
MGM_ARG("nostart", Int, Optional, "No start"),
MGM_ARG("abort", Int, Optional, "Abort"),
MGM_CMD("restart node v2", &MgmApiSession::restart_v2, ""),
MGM_ARG("node", String, Mandatory, "Nodes to restart"), MGM_ARG("node", String, Mandatory, "Nodes to restart"),
MGM_ARG("initialstart", Int, Optional, "Initial start"), MGM_ARG("initialstart", Int, Optional, "Initial start"),
MGM_ARG("nostart", Int, Optional, "No start"), MGM_ARG("nostart", Int, Optional, "No start"),
...@@ -185,12 +192,17 @@ ParserRow<MgmApiSession> commands[] = { ...@@ -185,12 +192,17 @@ ParserRow<MgmApiSession> commands[] = {
MGM_CMD("abort backup", &MgmApiSession::abortBackup, ""), MGM_CMD("abort backup", &MgmApiSession::abortBackup, ""),
MGM_ARG("id", Int, Mandatory, "Backup id"), MGM_ARG("id", Int, Mandatory, "Backup id"),
MGM_CMD("stop", &MgmApiSession::stop, ""), MGM_CMD("stop", &MgmApiSession::stop_v1, ""),
MGM_ARG("node", String, Mandatory, "Node"),
MGM_ARG("abort", Int, Mandatory, "Node"),
MGM_CMD("stop v2", &MgmApiSession::stop_v2, ""),
MGM_ARG("node", String, Mandatory, "Node"), MGM_ARG("node", String, Mandatory, "Node"),
MGM_ARG("abort", Int, Mandatory, "Node"), MGM_ARG("abort", Int, Mandatory, "Node"),
MGM_CMD("stop all", &MgmApiSession::stopAll, ""), MGM_CMD("stop all", &MgmApiSession::stopAll, ""),
MGM_ARG("abort", Int, Mandatory, "Node"), MGM_ARG("abort", Int, Mandatory, "Node"),
MGM_ARG("stop", String, Optional, "MGM/DB or both"),
MGM_CMD("enter single user", &MgmApiSession::enterSingleUser, ""), MGM_CMD("enter single user", &MgmApiSession::enterSingleUser, ""),
MGM_ARG("nodeId", Int, Mandatory, "Node"), MGM_ARG("nodeId", Int, Mandatory, "Node"),
...@@ -276,6 +288,7 @@ MgmApiSession::MgmApiSession(class MgmtSrvr & mgm, NDB_SOCKET_TYPE sock) ...@@ -276,6 +288,7 @@ MgmApiSession::MgmApiSession(class MgmtSrvr & mgm, NDB_SOCKET_TYPE sock)
m_output = new SocketOutputStream(sock); m_output = new SocketOutputStream(sock);
m_parser = new Parser_t(commands, *m_input, true, true, true); m_parser = new Parser_t(commands, *m_input, true, true, true);
m_allocated_resources= new MgmtSrvr::Allocated_resources(m_mgmsrv); m_allocated_resources= new MgmtSrvr::Allocated_resources(m_mgmsrv);
m_stopSelf= 0;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -295,6 +308,10 @@ MgmApiSession::~MgmApiSession() ...@@ -295,6 +308,10 @@ MgmApiSession::~MgmApiSession()
NDB_CLOSE_SOCKET(m_socket); NDB_CLOSE_SOCKET(m_socket);
m_socket= NDB_INVALID_SOCKET; m_socket= NDB_INVALID_SOCKET;
} }
if(m_stopSelf < 0)
g_RestartServer= true;
if(m_stopSelf)
g_StopServer= true;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
...@@ -875,8 +892,19 @@ MgmApiSession::stopSignalLog(Parser<MgmApiSession>::Context &, ...@@ -875,8 +892,19 @@ MgmApiSession::stopSignalLog(Parser<MgmApiSession>::Context &,
} }
void void
MgmApiSession::restart(Parser<MgmApiSession>::Context &, MgmApiSession::restart_v1(Parser<MgmApiSession>::Context &,
Properties const &args) { Properties const &args) {
restart(args,1);
}
void
MgmApiSession::restart_v2(Parser<MgmApiSession>::Context &,
Properties const &args) {
restart(args,2);
}
void
MgmApiSession::restart(Properties const &args, int version) {
Uint32 Uint32
nostart = 0, nostart = 0,
initialstart = 0, initialstart = 0,
...@@ -901,7 +929,8 @@ MgmApiSession::restart(Parser<MgmApiSession>::Context &, ...@@ -901,7 +929,8 @@ MgmApiSession::restart(Parser<MgmApiSession>::Context &,
&restarted, &restarted,
nostart != 0, nostart != 0,
initialstart != 0, initialstart != 0,
abort != 0); abort != 0,
&m_stopSelf);
m_output->println("restart reply"); m_output->println("restart reply");
if(result != 0){ if(result != 0){
...@@ -909,6 +938,8 @@ MgmApiSession::restart(Parser<MgmApiSession>::Context &, ...@@ -909,6 +938,8 @@ MgmApiSession::restart(Parser<MgmApiSession>::Context &,
} else } else
m_output->println("result: Ok"); m_output->println("result: Ok");
m_output->println("restarted: %d", restarted); m_output->println("restarted: %d", restarted);
if(version>1)
m_output->println("disconnect: %d", (m_stopSelf)?1:0);
m_output->println(""); m_output->println("");
} }
...@@ -925,7 +956,7 @@ MgmApiSession::restartAll(Parser<MgmApiSession>::Context &, ...@@ -925,7 +956,7 @@ MgmApiSession::restartAll(Parser<MgmApiSession>::Context &,
args.get("nostart", &nostart); args.get("nostart", &nostart);
int count = 0; int count = 0;
int result = m_mgmsrv.restart(nostart, initialstart, abort, &count); int result = m_mgmsrv.restartDB(nostart, initialstart, abort, &count);
m_output->println("restart reply"); m_output->println("restart reply");
if(result != 0) if(result != 0)
...@@ -1018,8 +1049,19 @@ MgmApiSession::getInfoClusterLog(Parser<MgmApiSession>::Context &, ...@@ -1018,8 +1049,19 @@ MgmApiSession::getInfoClusterLog(Parser<MgmApiSession>::Context &,
} }
void void
MgmApiSession::stop(Parser<MgmApiSession>::Context &, MgmApiSession::stop_v1(Parser<MgmApiSession>::Context &,
Properties const &args) { Properties const &args) {
stop(args,1);
}
void
MgmApiSession::stop_v2(Parser<MgmApiSession>::Context &,
Properties const &args) {
stop(args,2);
}
void
MgmApiSession::stop(Properties const &args, int version) {
Uint32 abort; Uint32 abort;
char *nodes_str; char *nodes_str;
Vector<NodeId> nodes; Vector<NodeId> nodes;
...@@ -1044,7 +1086,7 @@ MgmApiSession::stop(Parser<MgmApiSession>::Context &, ...@@ -1044,7 +1086,7 @@ MgmApiSession::stop(Parser<MgmApiSession>::Context &,
int stopped= 0; int stopped= 0;
int result= 0; int result= 0;
if (nodes.size()) if (nodes.size())
result= m_mgmsrv.stopNodes(nodes, &stopped, abort != 0); result= m_mgmsrv.stopNodes(nodes, &stopped, abort != 0, &m_stopSelf);
m_output->println("stop reply"); m_output->println("stop reply");
if(result != 0) if(result != 0)
...@@ -1052,25 +1094,41 @@ MgmApiSession::stop(Parser<MgmApiSession>::Context &, ...@@ -1052,25 +1094,41 @@ MgmApiSession::stop(Parser<MgmApiSession>::Context &,
else else
m_output->println("result: Ok"); m_output->println("result: Ok");
m_output->println("stopped: %d", stopped); m_output->println("stopped: %d", stopped);
if(version>1)
m_output->println("disconnect: %d", (m_stopSelf)?1:0);
m_output->println(""); m_output->println("");
} }
void void
MgmApiSession::stopAll(Parser<MgmApiSession>::Context &, MgmApiSession::stopAll(Parser<MgmApiSession>::Context &,
Properties const &args) { Properties const &args) {
int stopped = 0; int stopped[2] = {0,0};
Uint32 abort; Uint32 abort;
args.get("abort", &abort); args.get("abort", &abort);
int result = m_mgmsrv.stop(&stopped, abort != 0); BaseString stop;
const char* tostop= "db";
int ver=1;
if (args.get("stop", stop))
{
tostop= stop.c_str();
ver= 2;
}
int result= 0;
if(strstr(tostop,"db"))
result= m_mgmsrv.shutdownDB(&stopped[0], abort != 0);
if(!result && strstr(tostop,"mgm"))
result= m_mgmsrv.shutdownMGM(&stopped[1], abort!=0, &m_stopSelf);
m_output->println("stop reply"); m_output->println("stop reply");
if(result != 0) if(result != 0)
m_output->println("result: %s", get_error_text(result)); m_output->println("result: %s", get_error_text(result));
else else
m_output->println("result: Ok"); m_output->println("result: Ok");
m_output->println("stopped: %d", stopped); m_output->println("stopped: %d", stopped[0]+stopped[1]);
if(ver >1)
m_output->println("disconnect: %d", (m_stopSelf)?1:0);
m_output->println(""); m_output->println("");
} }
......
storage/ndb/src/mgmsrv/Services.hpp
View file @ 0811fd79
...@@ -41,6 +41,7 @@ private: ...@@ -41,6 +41,7 @@ private:
Parser_t *m_parser; Parser_t *m_parser;
MgmtSrvr::Allocated_resources *m_allocated_resources; MgmtSrvr::Allocated_resources *m_allocated_resources;
char m_err_str[1024]; char m_err_str[1024];
int m_stopSelf; // -1 is restart, 0 do nothing, 1 stop
void getConfig_common(Parser_t::Context &ctx, void getConfig_common(Parser_t::Context &ctx,
const class Properties &args, const class Properties &args,
...@@ -62,7 +63,9 @@ public: ...@@ -62,7 +63,9 @@ public:
void getVersion(Parser_t::Context &ctx, const class Properties &args); void getVersion(Parser_t::Context &ctx, const class Properties &args);
void getStatus(Parser_t::Context &ctx, const class Properties &args); void getStatus(Parser_t::Context &ctx, const class Properties &args);
void getInfoClusterLog(Parser_t::Context &ctx, const class Properties &args); void getInfoClusterLog(Parser_t::Context &ctx, const class Properties &args);
void restart(Parser_t::Context &ctx, const class Properties &args); void restart(const class Properties &args, int version);
void restart_v1(Parser_t::Context &ctx, const class Properties &args);
void restart_v2(Parser_t::Context &ctx, const class Properties &args);
void restartAll(Parser_t::Context &ctx, const class Properties &args); void restartAll(Parser_t::Context &ctx, const class Properties &args);
void insertError(Parser_t::Context &ctx, const class Properties &args); void insertError(Parser_t::Context &ctx, const class Properties &args);
void setTrace(Parser_t::Context &ctx, const class Properties &args); void setTrace(Parser_t::Context &ctx, const class Properties &args);
...@@ -74,7 +77,9 @@ public: ...@@ -74,7 +77,9 @@ public:
void abortBackup(Parser_t::Context &ctx, const class Properties &args); void abortBackup(Parser_t::Context &ctx, const class Properties &args);
void enterSingleUser(Parser_t::Context &ctx, const class Properties &args); void enterSingleUser(Parser_t::Context &ctx, const class Properties &args);
void exitSingleUser(Parser_t::Context &ctx, const class Properties &args); void exitSingleUser(Parser_t::Context &ctx, const class Properties &args);
void stop(Parser_t::Context &ctx, const class Properties &args); void stop_v1(Parser_t::Context &ctx, const class Properties &args);
void stop_v2(Parser_t::Context &ctx, const class Properties &args);
void stop(const class Properties &args, int version);
void stopAll(Parser_t::Context &ctx, const class Properties &args); void stopAll(Parser_t::Context &ctx, const class Properties &args);
void start(Parser_t::Context &ctx, const class Properties &args); void start(Parser_t::Context &ctx, const class Properties &args);
void startAll(Parser_t::Context &ctx, const class Properties &args); void startAll(Parser_t::Context &ctx, const class Properties &args);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7