summaryrefslogtreecommitdiff
path: root/ndb/src/mgmsrv
diff options
context:
space:
mode:
authorunknown <stewart@mysql.com>2005-07-07 15:19:56 +1000
committerunknown <stewart@mysql.com>2005-07-07 15:19:56 +1000
commitab0e8f2e126a7d6e69d883a083d3ceec89888aa0 (patch)
treebba93acb6ededdc2b5814d45c6d635773217ec0f /ndb/src/mgmsrv
parent98a3bae33d5d960aa045d82c02ec68312ec7d379 (diff)
downloadmariadb-git-ab0e8f2e126a7d6e69d883a083d3ceec89888aa0.tar.gz
BUG#11516 ndb_mgmd debug core on cluster shutdown with failed data nodes
Fix closing of sessions on mgm server shutdown. ndb/include/mgmcommon/ConfigRetriever.hpp: Add disconnect(); ndb/src/common/mgmcommon/ConfigRetriever.cpp: Add disconnect() call so we can disconnect from the mgm server before it shuts down (if we are a mgm server). ndb/src/mgmsrv/main.cpp: Close our ConfigRetriever connection first. Stop sessions, and wait for them to stop. (previously we didn't wait, this was causing core dumps on shutdown with failed nodes).
Diffstat (limited to 'ndb/src/mgmsrv')
-rw-r--r--ndb/src/mgmsrv/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/src/mgmsrv/main.cpp b/ndb/src/mgmsrv/main.cpp
index 3335fdc827c..c7315c61ba1 100644
--- a/ndb/src/mgmsrv/main.cpp
+++ b/ndb/src/mgmsrv/main.cpp
@@ -353,7 +353,8 @@ int main(int argc, char** argv)
g_eventLogger.info("Shutting down server...");
glob.socketServer->stopServer();
- glob.socketServer->stopSessions();
+ glob.mgmObject->get_config_retriever()->disconnect();
+ glob.socketServer->stopSessions(true);
g_eventLogger.info("Shutdown complete");
return 0;
error_end: