bk commit into 5.1 tree (mskold:1.2240) BUG#19645

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2240 06/07/05 15:04:47 mskold@stripped +3 -0
  Bug #19645  Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have the
same view of what API's are connected

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
    1.35 06/07/05 15:03:26 mskold@stripped +25 -0
    Bug #19645  Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have
the same view of what API's are connected

  storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
    1.11 06/07/05 15:03:26 mskold@stripped +1 -0
    Bug #19645  Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have
the same view of what API's are connected

  storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
    1.14 06/07/05 15:03:25 mskold@stripped +1 -0
    Bug #19645  Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have
the same view of what API's are connected

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/home/marty/MySQL/mysql-5.1

--- 1.13/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2006-04-06 16:25:16 +02:00
+++ 1.14/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2006-07-05 15:03:25 +02:00
@@ -248,6 +248,7 @@ private:
   void execAPI_FAILCONF(Signal* signal);
   void execREAD_NODESREQ(Signal* signal);
   void execSET_VAR_REQ(Signal* signal);
+  void execAPI_FAILREQ(Signal* signal);
 
   void execREAD_NODESREF(Signal* signal);
   void execREAD_NODESCONF(Signal* signal);

--- 1.10/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2006-04-06 12:24:09 +02:00
+++ 1.11/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2006-07-05 15:03:26 +02:00
@@ -81,6 +81,7 @@ Qmgr::Qmgr(Block_context& ctx)
   addRecSignal(GSN_API_REGREQ, &Qmgr::execAPI_REGREQ);
   addRecSignal(GSN_API_VERSION_REQ, &Qmgr::execAPI_VERSION_REQ);
   addRecSignal(GSN_DISCONNECT_REP, &Qmgr::execDISCONNECT_REP);
+  addRecSignal(GSN_API_FAILREQ, &Qmgr::execAPI_FAILREQ);
   addRecSignal(GSN_API_FAILCONF, &Qmgr::execAPI_FAILCONF);
   addRecSignal(GSN_READ_NODESREQ, &Qmgr::execREAD_NODESREQ);
   addRecSignal(GSN_SET_VAR_REQ,  &Qmgr::execSET_VAR_REQ);

--- 1.34/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-06-15 14:40:34 +02:00
+++ 1.35/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2006-07-05 15:03:26 +02:00
@@ -2338,6 +2338,8 @@ void Qmgr::sendApiFailReq(Signal* signal
   ndbrequire(failedNodePtr.p->failState == NORMAL);
   
   failedNodePtr.p->failState = WAITING_FOR_FAILCONF1;
+  NodeReceiverGroup rg(QMGR, c_clusterNodes);
+  sendSignal(rg, GSN_API_FAILREQ, signal, 2, JBA);
   sendSignal(DBTC_REF, GSN_API_FAILREQ, signal, 2, JBA);
   sendSignal(DBDICT_REF, GSN_API_FAILREQ, signal, 2, JBA);
   sendSignal(SUMA_REF, GSN_API_FAILREQ, signal, 2, JBA);
@@ -2360,6 +2362,29 @@ void Qmgr::sendApiFailReq(Signal* signal
   sendSignal(CMVMI_REF, GSN_CLOSE_COMREQ, signal, 
 	     CloseComReqConf::SignalLength, JBA);
 }//Qmgr::sendApiFailReq()
+
+void Qmgr::execAPI_FAILREQ(Signal* signal)
+{
+  jamEntry();
+  NodeRecPtr failedNodePtr;
+  failedNodePtr.i = signal->theData[0];
+  // signal->theData[1] == QMGR_REF
+  ptrCheckGuard(failedNodePtr, MAX_NODES, nodeRec);
+  
+  ndbout_c("Qmgr::execAPI_FAILREQ node %d", failedNodePtr.i);
+
+  ndbrequire(getNodeInfo(failedNodePtr.i).getType() != NodeInfo::DB);
+
+  // ignore if api not active
+  if (failedNodePtr.p->phase != ZAPI_ACTIVE)
+    return;
+
+  signal->theData[0] = NDB_LE_Disconnected;
+  signal->theData[1] = failedNodePtr.i;
+  sendSignal(CMVMI_REF, GSN_EVENT_REP, signal, 2, JBB);
+
+  node_failed(signal, failedNodePtr.i);
+}
 
 void Qmgr::execAPI_FAILCONF(Signal* signal) 
 {