bk commit into 5.1 tree (tomas:1.2081) BUG#24447

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2081 07/01/04 12:15:45 tomas@poseidon. +4 -0
   ndb - bug#24447
      api disconnect just after SCAN_TABREQ

  storage/ndb/test/run-test/daily-basic-tests.txt
    1.38 07/01/04 12:15:38 tomas@poseidon. +4 -0
        Add etstcase for bug 24447

  storage/ndb/test/ndbapi/testScan.cpp
    1.20 07/01/04 12:15:38 tomas@poseidon. +40 -1
        Add etstcase for bug 24447

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.103 07/01/04 12:15:38 tomas@poseidon. +36 -2
        1) add error insert for faking DISCONNECT of API just after SCAN_TABREQ
        2) handle error :-)
    

  storage/ndb/src/kernel/blocks/ERROR_codes.txt
    1.18 07/01/04 12:15:38 tomas@poseidon. +5 -1
       ndb -
          update error code list

# 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:	tomas
# Host:	poseidon.
# Root:	/home/tomas/mysql-5.1-wl2325-5.0

--- 1.37/storage/ndb/test/run-test/daily-basic-tests.txt	2006-11-23 14:39:10 +01:00
+++ 1.38/storage/ndb/test/run-test/daily-basic-tests.txt	2007-01-04 12:15:38 +01:00
@@ -414,6 +414,10 @@
 args: -n ScanParallelism
 
 max-time: 500
+cmd: testScan
+args: -n Bug24447 T1
+
+max-time: 500
 cmd: testNodeRestart
 args: -n Bug15587 T1
 

--- 1.17/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2006-11-23 14:39:09 +01:00
+++ 1.18/storage/ndb/src/kernel/blocks/ERROR_codes.txt	2007-01-04 12:15:38 +01:00
@@ -6,7 +6,7 @@
 Next DBLQH 5042
 Next DBDICT 6007
 Next DBDIH 7178
-Next DBTC 8037
+Next DBTC 8039
 Next CMVMI 9000
 Next BACKUP 10022
 Next DBUTIL 11002
@@ -278,6 +278,10 @@
 -----------------
 
 8032: No free TC records any more
+
+------
+
+8038 : Simulate API disconnect just after SCAN_TAB_REQ
 
 
 CMVMI

--- 1.102/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2006-10-10 16:13:27 +02:00
+++ 1.103/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2007-01-04 12:15:38 +01:00
@@ -8723,6 +8723,20 @@
    * IF ANY TO RECEIVE.
    **********************************************************/
   scanptr.p->scanState = ScanRecord::WAIT_AI;
+  
+  if (ERROR_INSERTED(8038))
+  {
+    /**
+     * Force API_FAILREQ
+     */
+    DisconnectRep * const  rep = (DisconnectRep *)signal->getDataPtrSend();
+    rep->nodeId = refToNode(apiConnectptr.p->ndbapiBlockref);
+    rep->err = 8038;
+    
+    EXECUTE_DIRECT(CMVMI, GSN_DISCONNECT_REP, signal, 2);
+    CLEAR_ERROR_INSERT_VALUE;
+  }
+  
   return;
 
  SCAN_error_check:
@@ -8812,6 +8826,7 @@
     jam();
     ScanFragRecPtr ptr;
     ndbrequire(list.seize(ptr));
+    ptr.p->scanFragState = ScanFragRec::IDLE;
     ptr.p->scanRec = scanptr.i;
     ptr.p->scanFragId = 0;
     ptr.p->m_apiPtr = cdata[i];
@@ -9604,9 +9619,17 @@
 
   ScanRecord* scanP = scanPtr.p;
   ndbrequire(scanPtr.p->scanState != ScanRecord::IDLE);  
+  ScanRecord::ScanState old = scanPtr.p->scanState;
   scanPtr.p->scanState = ScanRecord::CLOSING_SCAN;
   scanPtr.p->m_close_scan_req = req_received;
 
+  if (old == ScanRecord::WAIT_FRAGMENT_COUNT)
+  {
+    jam();
+    scanPtr.p->scanState = old;
+    return; // Will continue on execDI_FCOUNTCONF
+  }
+  
   /**
    * Queue         : Action
    * ============= : =================
@@ -9634,11 +9657,22 @@
       ScanFragRecPtr curr = ptr; // Remove while iterating...
       running.next(ptr);
 
-      if(curr.p->scanFragState == ScanFragRec::WAIT_GET_PRIMCONF){
+      switch(curr.p->scanFragState){
+      case ScanFragRec::IDLE:
+	jam(); // real early abort
+	ndbrequire(old == ScanRecord::WAIT_AI);
+	running.release(curr);
+	continue;
+      case ScanFragRec::WAIT_GET_PRIMCONF:
 	jam();
 	continue;
+      case ScanFragRec::LQH_ACTIVE:
+	jam();
+	break;
+      default:
+	jamLine(curr.p->scanFragState);
+	ndbrequire(false);
       }
-      ndbrequire(curr.p->scanFragState == ScanFragRec::LQH_ACTIVE);
       
       curr.p->startFragTimer(ctcTimer);
       curr.p->scanFragState = ScanFragRec::LQH_ACTIVE;

--- 1.19/storage/ndb/test/ndbapi/testScan.cpp	2005-05-17 10:10:43 +02:00
+++ 1.20/storage/ndb/test/ndbapi/testScan.cpp	2007-01-04 12:15:38 +01:00
@@ -630,7 +630,7 @@
     
     int nodeId = restarter.getDbNodeId(lastId);
     lastId = (lastId + 1) % restarter.getNumDbNodes();
-    if(restarter.restartOneDbNode(nodeId) != 0){
+    if(restarter.restartOneDbNode(nodeId, false, false, true) != 0){
       g_err << "Failed to restartNextDbNode" << endl;
       result = NDBT_FAILED;
       break;
@@ -1125,6 +1125,39 @@
   return NDBT_OK;
 }
 
+int 
+runBug24447(NDBT_Context* ctx, NDBT_Step* step){
+  int loops = 1; //ctx->getNumLoops();
+  int records = ctx->getNumRecords();
+  int abort = ctx->getProperty("AbortProb", 15);
+  NdbRestarter restarter;
+  HugoTransactions hugoTrans(*ctx->getTab());
+  int i = 0;
+  while (i<loops && !ctx->isTestStopped()) 
+  {
+    g_info << i++ << ": ";
+
+    int nodeId = restarter.getRandomNotMasterNodeId(rand());
+    if (nodeId == -1)
+      nodeId = restarter.getMasterNodeId();
+    if (restarter.insertErrorInNode(nodeId, 8038) != 0)
+    {
+      ndbout << "Could not insert error in node="<<nodeId<<endl;
+      return NDBT_FAILED;
+    }
+
+    for (Uint32 j = 0; i<10; i++)
+    {
+      hugoTrans.scanReadRecords(GETNDB(step), records, abort, 0, 
+				NdbOperation::LM_CommittedRead);
+    }
+
+  }
+  restarter.insertErrorInAllNodes(0);
+  
+  return NDBT_OK;
+}
+
 NDBT_TESTSUITE(testScan);
 TESTCASE("ScanRead", 
 	 "Verify scan requirement: It should be possible "\
@@ -1595,6 +1628,12 @@
 	 "Verify restart functionallity"){
   INITIALIZER(runLoadTable);
   STEP(runScanRestart);
+  FINALIZER(runClearTable);
+}
+TESTCASE("Bug24447",
+	 ""){
+  INITIALIZER(runLoadTable);
+  STEP(runBug24447);
   FINALIZER(runClearTable);
 }
 TESTCASE("ScanParallelism",