bk commit into 5.1 tree (jonas:1.2440) BUG#20185

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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@stripped, 2007-03-19 12:31:23+01:00, jonas@stripped +2 -0
  ndb - bug#20185
    Fix race in testprg...causing random TC crashes

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-03-19 12:31:21+01:00,
jonas@stripped +5 -10
    remove incorrect work-around

  storage/ndb/test/ndbapi/testNodeRestart.cpp@stripped, 2007-03-19 12:31:21+01:00,
jonas@stripped +11 -3
    Fix race in testprg...causing random TC crashes

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-telco-gca

--- 1.131/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-19 12:31:28 +01:00
+++ 1.132/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-03-19 12:31:28 +01:00
@@ -7099,20 +7099,15 @@
   for (transPtr.i = transPtrI; transPtr.i < capiConnectFilesize; transPtr.i++)
   {
     ptrCheckGuard(transPtr, capiConnectFilesize, apiConnectRecord); 
-    Uint32 state = transPtr.p->apiConnectstate;
     if (transPtr.p->m_transaction_nodes.get(failedNodeId))
     {
       jam();
       
-      // avoid assertion in timeoutfoundlab
-      if (state != CS_PREPARE_TO_COMMIT)
-      {
-	// Force timeout regardless of state      
-	c_appl_timeout_value = 1;
-	setApiConTimer(transPtr.i, TtcTimer - 2, __LINE__);
-	timeOutFoundLab(signal, transPtr.i, ZNODEFAIL_BEFORE_COMMIT);
-	c_appl_timeout_value = TapplTimeout;
-      }
+      // Force timeout regardless of state      
+      c_appl_timeout_value = 1;
+      setApiConTimer(transPtr.i, TtcTimer - 2, __LINE__);
+      timeOutFoundLab(signal, transPtr.i, ZNODEFAIL_BEFORE_COMMIT);
+      c_appl_timeout_value = TapplTimeout;
     }
     
     // Send CONTINUEB to continue later

--- 1.42/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-03-19 12:31:28 +01:00
+++ 1.43/storage/ndb/test/ndbapi/testNodeRestart.cpp	2007-03-19 12:31:28 +01:00
@@ -887,6 +887,9 @@
     return NDBT_FAILED;
   
   NdbSleep_MilliSleep(3000);
+  Vector<int> nodes;
+  for (Uint32 i = 0; i<restarter.getNumDbNodes(); i++)
+    nodes.push_back(restarter.getDbNodeId(i));
   
 retry:
   if(hugoOps.startTransaction(pNdb) != 0)
@@ -910,11 +913,16 @@
     nodeId = restarter.getDbNodeId(rand() % restarter.getNumDbNodes());
   } while (nodeId == node);
   
-  if (restarter.insertErrorInAllNodes(7030))
-    return NDBT_FAILED;
-  
+  ndbout_c("7031 to %d", nodeId);
   if (restarter.insertErrorInNode(nodeId, 7031))
     return NDBT_FAILED;
+
+  for (Uint32 i = 0; i<nodes.size(); i++)
+  {
+    if (nodes[i] != nodeId)
+      if (restarter.insertErrorInNode(nodes[i], 7030))
+	return NDBT_FAILED;
+  }
   
   NdbSleep_MilliSleep(500);