mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
wl1292 - workaround for mgmsrv node id problems
ndb/src/cw/cpcd/Makefile.am: Put cpcd in libexec ndb/src/cw/cpcd/Process.cpp: Fixed reverse check with ulimit ndb/test/run-test/main.cpp: Restart mgm server aswell on test failure. Removes problems with nodeid
This commit is contained in:
@ -106,13 +106,6 @@ main(int argc, const char ** argv){
|
||||
if(!setup_hosts(g_config))
|
||||
goto end;
|
||||
|
||||
if(!start_processes(g_config, atrt_process::NDB_MGM))
|
||||
goto end;
|
||||
|
||||
if(!connect_ndb_mgm(g_config)){
|
||||
goto end;
|
||||
}
|
||||
|
||||
/**
|
||||
* Main loop
|
||||
*/
|
||||
@ -122,25 +115,32 @@ main(int argc, const char ** argv){
|
||||
*/
|
||||
if(restart){
|
||||
g_logger.info("(Re)starting ndb processes");
|
||||
if(!stop_processes(g_config, atrt_process::NDB_MGM))
|
||||
goto end;
|
||||
|
||||
if(!stop_processes(g_config, atrt_process::NDB_DB))
|
||||
goto end;
|
||||
|
||||
if(!wait_ndb(g_config, NDB_MGM_NODE_STATUS_NO_CONTACT))
|
||||
if(!start_processes(g_config, atrt_process::NDB_MGM))
|
||||
goto end;
|
||||
|
||||
if(!connect_ndb_mgm(g_config)){
|
||||
goto end;
|
||||
}
|
||||
|
||||
if(!start_processes(g_config, atrt_process::NDB_DB))
|
||||
goto end;
|
||||
|
||||
|
||||
if(!wait_ndb(g_config, NDB_MGM_NODE_STATUS_NOT_STARTED))
|
||||
goto end;
|
||||
|
||||
|
||||
for(Uint32 i = 0; i<3; i++)
|
||||
if(wait_ndb(g_config, NDB_MGM_NODE_STATUS_STARTED))
|
||||
goto started;
|
||||
|
||||
|
||||
goto end;
|
||||
|
||||
started:
|
||||
|
||||
started:
|
||||
g_logger.info("Ndb start completed");
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user