Commit 0d4bf93e authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Bug #28443 

- correction of merge error
parent 720f56fb

ndb/src/common/transporter/Packer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -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,

ndb/src/common/transporter/TCP_Transporter.hpp

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ private: 
  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

ndb/src/common/transporter/TransporterRegistry.cpp

+22 −19
Original line number Diff line number Diff line
@@ -841,6 +841,7 @@ TransporterRegistry::poll_OSE(Uint32 timeOutMillis) 
Uint32 

TransporterRegistry::poll_TCP(Uint32 timeOutMillis)

{

  bool hasdata = false;

  if (false && nTCPTransporters == 0)

  {

    tcpReadSelectReply = 0;
@@ -885,6 +886,7 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis) 
      // 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 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis) 
  }

#endif

  

  return tcpReadSelectReply;

  return tcpReadSelectReply || hasdata;

}

#endif
@@ -937,8 +939,6 @@ TransporterRegistry::performReceive() 
#endif



#ifdef NDB_TCP_TRANSPORTER

  if(tcpReadSelectReply > 0)

  {

  for (int i=0; i<nTCPTransporters; i++) 

  {

    checkJobBuffer();
@@ -946,10 +946,14 @@ TransporterRegistry::performReceive() 
    const NodeId nodeId = t->getRemoteNodeId();

    const NDB_SOCKET_TYPE socket    = t->getSocket();

    if(is_connected(nodeId)){

	if(t->isConnected() && FD_ISSET(socket, &tcpReadset)) 

      if(t->isConnected())

      {

        if (FD_ISSET(socket, &tcpReadset))

	{

	  const int receiveSize = t->doReceive();

	  if(receiveSize > 0)

	  t->doReceive();

        }



        if (t->hasReceiveData())

        {

          Uint32 * ptr;

          Uint32 sz = t->getReceiveData(&ptr);
@@ -960,7 +964,6 @@ TransporterRegistry::performReceive() 
      } 

    }

  }

  }

#endif

  

#ifdef NDB_SCI_TRANSPORTER

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+17 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ Cmvmi::~Cmvmi() 


#ifdef ERROR_INSERT

NodeBitmask c_error_9000_nodes_mask;

extern Uint32 MAX_RECEIVED_SIGNALS;

#endif



void Cmvmi::execNDB_TAMPER(Signal* signal)
@@ -165,6 +166,22 @@ void Cmvmi::execNDB_TAMPER(Signal* signal) 
    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()



void Cmvmi::execSET_LOGLEVELORD(Signal* signal)

ndb/test/ndbapi/testNdbApi.cpp

+34 −0
Original line number Diff line number Diff line
@@ -1306,6 +1306,36 @@ int runTestExecuteAsynch(NDBT_Context* ctx, NDBT_Step* step){ 


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",
@@ -1392,6 +1422,10 @@ TESTCASE("Scan_4006", 
  INITIALIZER(runScan_4006);

  FINALIZER(runClearTable);

}

TESTCASE("Bug28443", 

	 ""){ 

  INITIALIZER(runBug28443);

}

TESTCASE("ExecuteAsynch", 

	 "Check that executeAsync() works (BUG#27495)\n"){ 

  INITIALIZER(runTestExecuteAsynch);