diff options
| -rw-r--r-- | ndb/src/kernel/blocks/qmgr/QmgrMain.cpp | 10 | ||||
| -rw-r--r-- | ndb/test/src/NdbRestarts.cpp | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp b/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp index 30e7f3f36a7..991e60a3efd 100644 --- a/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp +++ b/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp @@ -848,10 +848,12 @@ check_reply: goto die_direct; } - return false; + return true; die_direct: ndbout_c(buf); + CRASH_INSERTION(932); + progError(__LINE__, ERR_ARBIT_SHUTDOWN, buf); @@ -2082,9 +2084,13 @@ void Qmgr::execDISCONNECT_REP(Signal* signal) case ZFAIL_CLOSING: case ZAPI_ACTIVE: case ZAPI_INACTIVE: + { + char buf[100]; + BaseString::snprintf(buf, 100, "Node %u disconected", nodeId); + progError(__LINE__, ERR_SR_OTHERNODEFAILED, buf); ndbrequire(false); } - + } node_failed(signal, nodeId); }//DISCONNECT_REP diff --git a/ndb/test/src/NdbRestarts.cpp b/ndb/test/src/NdbRestarts.cpp index eea4af437c4..8465caaab48 100644 --- a/ndb/test/src/NdbRestarts.cpp +++ b/ndb/test/src/NdbRestarts.cpp @@ -445,8 +445,7 @@ int twoNodeFailure(NdbRestarter& _restarter, << ") secs " << endl; NdbSleep_SecSleep(seconds); - randomId = (rand() % _restarter.getNumDbNodes()); - nodeId = _restarter.getDbNodeId(randomId); + nodeId = _restarter.getRandomNodeOtherNodeGroup(nodeId, rand()); g_info << _restart->m_name << ": node = "<< nodeId << endl; CHECK(_restarter.insertErrorInNode(nodeId, 9999) == 0, |