Commit a38d713f authored by joreland@mysql.com's avatar joreland@mysql.com

ndb - fix rare 4012 which was nodefailrep before disconnect

parent fd0b4699
...@@ -429,7 +429,6 @@ ClusterMgr::reportDisconnected(NodeId nodeId){ ...@@ -429,7 +429,6 @@ ClusterMgr::reportDisconnected(NodeId nodeId){
noOfConnectedNodes--; noOfConnectedNodes--;
theNodes[nodeId].connected = false; theNodes[nodeId].connected = false;
theNodes[nodeId].m_info.m_connectCount ++;
reportNodeFailed(nodeId); reportNodeFailed(nodeId);
} }
...@@ -439,18 +438,22 @@ ClusterMgr::reportNodeFailed(NodeId nodeId){ ...@@ -439,18 +438,22 @@ ClusterMgr::reportNodeFailed(NodeId nodeId){
Node & theNode = theNodes[nodeId]; Node & theNode = theNodes[nodeId];
theNode.m_alive = false; theNode.m_alive = false;
theNode.m_info.m_connectCount ++;
if(theNode.connected) if(theNode.connected)
{
theFacade.doDisconnect(nodeId); theFacade.doDisconnect(nodeId);
}
const bool report = (theNode.m_state.startLevel != NodeState::SL_NOTHING); const bool report = (theNode.m_state.startLevel != NodeState::SL_NOTHING);
theNode.m_state.startLevel = NodeState::SL_NOTHING; theNode.m_state.startLevel = NodeState::SL_NOTHING;
if(report){ if(report)
{
theFacade.ReportNodeDead(nodeId); theFacade.ReportNodeDead(nodeId);
} }
theNode.nfCompleteRep = false; theNode.nfCompleteRep = false;
if(noOfConnectedNodes == 0){ if(noOfConnectedNodes == 0){
NFCompleteRep rep; NFCompleteRep rep;
for(Uint32 i = 1; i<MAX_NODES; i++){ for(Uint32 i = 1; i<MAX_NODES; i++){
......
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