bk commit into 5.0 tree (tomas:1.2408) BUG#28443

[tomas]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2007-05-30 17:25:22+02:00, tomas@stripped +6 -0
  Bug #28443
  - correction of merge error

  ndb/src/common/transporter/Packer.cpp@stripped, 2007-05-30 17:25:19+02:00,
tomas@stripped +5 -0
    Bug #28443
    - correction of merge error

  ndb/src/common/transporter/TCP_Transporter.hpp@stripped, 2007-05-30 17:25:19+02:00,
tomas@stripped +4 -0
    Bug #28443
    - correction of merge error

  ndb/src/common/transporter/TransporterRegistry.cpp@stripped, 2007-05-30 17:25:19+02:00,
tomas@stripped +22 -19
    Bug #28443
    - correction of merge error

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp@stripped, 2007-05-30 17:25:19+02:00,
tomas@stripped +17 -0
    Bug #28443
    - correction of merge error

  ndb/test/ndbapi/testNdbApi.cpp@stripped, 2007-05-30 17:25:19+02:00,
tomas@stripped +34 -0
    Bug #28443
    - correction of merge error

  ndb/test/run-test/daily-basic-tests.txt@stripped, 2007-05-30 17:25:19+02:00,
tomas@stripped +4 -0
    Bug #28443
    - correction of merge error

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.0-telco-gca

--- 1.48/ndb/test/run-test/daily-basic-tests.txt	2007-05-28 15:59:01 +02:00
+++ 1.49/ndb/test/run-test/daily-basic-tests.txt	2007-05-30 17:25:19 +02:00
@@ -617,6 +617,10 @@
 cmd: testNdbApi
 args: -n ExecuteAsynch T1
 
+max-time: 1000
+cmd: testNdbApi
+args: -n BugBug28443
+
 #max-time: 500
 #cmd: testInterpreter
 #args: T1 

--- 1.7/ndb/src/common/transporter/Packer.cpp	2006-12-23 20:04:13 +01:00
+++ 1.8/ndb/src/common/transporter/Packer.cpp	2007-05-30 17:25:19 +02:00
@@ -20,7 +20,12 @@
 #include <TransporterCallback.hpp>
 #include <RefConvert.hpp>
 
+#ifdef ERROR_INSERT
+Uint32 MAX_RECEIVED_SIGNALS = 1024;
+#else
 #define MAX_RECEIVED_SIGNALS 1024
+#endif
+
 Uint32
 TransporterRegistry::unpack(Uint32 * readPtr,
 			    Uint32 sizeOfData,

--- 1.6/ndb/src/common/transporter/TCP_Transporter.hpp	2006-12-23 20:04:14 +01:00
+++ 1.7/ndb/src/common/transporter/TCP_Transporter.hpp	2007-05-30 17:25:19 +02:00
@@ -101,6 +101,10 @@
   virtual void updateReceiveDataPtr(Uint32 bytesRead);
 
   virtual Uint32 get_free_buffer() const;
+
+  inline bool hasReceiveData () const {
+    return receiveBuffer.sizeOfData > 0;
+  }
 protected:
   /**
    * Setup client/server and perform connect/accept

--- 1.62/ndb/src/common/transporter/TransporterRegistry.cpp	2006-12-23 20:04:14 +01:00
+++ 1.63/ndb/src/common/transporter/TransporterRegistry.cpp	2007-05-30 17:25:19 +02:00
@@ -841,6 +841,7 @@
 Uint32 
 TransporterRegistry::poll_TCP(Uint32 timeOutMillis)
 {
+  bool hasdata = false;
   if (false && nTCPTransporters == 0)
   {
     tcpReadSelectReply = 0;
@@ -885,6 +886,7 @@
       // Put the connected transporters in the socket read-set 
       FD_SET(socket, &tcpReadset);
     }
+    hasdata |= t->hasReceiveData();
   }
   
   // The highest socket value plus one
@@ -901,7 +903,7 @@
   }
 #endif
   
-  return tcpReadSelectReply;
+  return tcpReadSelectReply || hasdata;
 }
 #endif
 
@@ -937,26 +939,27 @@
 #endif
 
 #ifdef NDB_TCP_TRANSPORTER
-  if(tcpReadSelectReply > 0)
+  for (int i=0; i<nTCPTransporters; i++) 
   {
-    for (int i=0; i<nTCPTransporters; i++) 
-    {
-      checkJobBuffer();
-      TCP_Transporter *t = theTCPTransporters[i];
-      const NodeId nodeId = t->getRemoteNodeId();
-      const NDB_SOCKET_TYPE socket    = t->getSocket();
-      if(is_connected(nodeId)){
-	if(t->isConnected() && FD_ISSET(socket, &tcpReadset)) 
+    checkJobBuffer();
+    TCP_Transporter *t = theTCPTransporters[i];
+    const NodeId nodeId = t->getRemoteNodeId();
+    const NDB_SOCKET_TYPE socket    = t->getSocket();
+    if(is_connected(nodeId)){
+      if(t->isConnected())
+      {
+        if (FD_ISSET(socket, &tcpReadset))
 	{
-	  const int receiveSize = t->doReceive();
-	  if(receiveSize > 0)
-	  {
-	    Uint32 * ptr;
-	    Uint32 sz = t->getReceiveData(&ptr);
-	    transporter_recv_from(callbackObj, nodeId);
-	    Uint32 szUsed = unpack(ptr, sz, nodeId, ioStates[nodeId]);
-	    t->updateReceiveDataPtr(szUsed);
-          }
+	  t->doReceive();
+        }
+
+        if (t->hasReceiveData())
+        {
+          Uint32 * ptr;
+          Uint32 sz = t->getReceiveData(&ptr);
+          transporter_recv_from(callbackObj, nodeId);
+          Uint32 szUsed = unpack(ptr, sz, nodeId, ioStates[nodeId]);
+          t->updateReceiveDataPtr(szUsed);
 	}
       } 
     }

--- 1.31/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2007-02-14 05:05:31 +01:00
+++ 1.32/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2007-05-30 17:25:19 +02:00
@@ -136,6 +136,7 @@
 
 #ifdef ERROR_INSERT
 NodeBitmask c_error_9000_nodes_mask;
+extern Uint32 MAX_RECEIVED_SIGNALS;
 #endif
 
 void Cmvmi::execNDB_TAMPER(Signal* signal) 
@@ -163,6 +164,22 @@
   if(ERROR_INSERTED(9995)){
     simulate_error_during_shutdown= SIGSEGV;
     kill(getpid(), SIGABRT);
+  }
+#endif
+
+#ifdef ERROR_INSERT
+  if (signal->theData[0] == 9003)
+  {
+    if (MAX_RECEIVED_SIGNALS < 1024)
+    {
+      MAX_RECEIVED_SIGNALS = 1024;
+    }
+    else
+    {
+      MAX_RECEIVED_SIGNALS = rand() % 128;
+    }
+    ndbout_c("MAX_RECEIVED_SIGNALS: %d", MAX_RECEIVED_SIGNALS);
+    CLEAR_ERROR_INSERT_VALUE;
   }
 #endif
 }//execNDB_TAMPER()

--- 1.24/ndb/test/ndbapi/testNdbApi.cpp	2007-04-25 09:23:26 +02:00
+++ 1.25/ndb/test/ndbapi/testNdbApi.cpp	2007-05-30 17:25:19 +02:00
@@ -1306,6 +1306,36 @@
 
 template class Vector<NdbScanOperation*>;
 
+int 
+runBug28443(NDBT_Context* ctx, NDBT_Step* step)
+{
+  int result = NDBT_OK;
+  int records = ctx->getNumRecords();
+  
+  NdbRestarter restarter;
+
+  restarter.insertErrorInAllNodes(9003);
+
+  for (Uint32 i = 0; i<ctx->getNumLoops(); i++)
+  {
+    HugoTransactions hugoTrans(*ctx->getTab());
+    if (hugoTrans.loadTable(GETNDB(step), records, 2048) != 0)
+    {
+      result = NDBT_FAILED;
+      goto done;
+    }
+    if (runClearTable(ctx, step) != 0)
+    {
+      result = NDBT_FAILED;
+      goto done;
+    }
+  }
+  
+done:
+  restarter.insertErrorInAllNodes(9003);
+
+  return result;
+}
 
 NDBT_TESTSUITE(testNdbApi);
 TESTCASE("MaxNdb", 
@@ -1391,6 +1421,10 @@
   INITIALIZER(runLoadTable);
   INITIALIZER(runScan_4006);
   FINALIZER(runClearTable);
+}
+TESTCASE("Bug28443", 
+	 ""){ 
+  INITIALIZER(runBug28443);
 }
 TESTCASE("ExecuteAsynch", 
 	 "Check that executeAsync() works (BUG#27495)\n"){