Commit 68b5382a authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

ndb - bug#34005 

  make sure whole send buffer is flushed, even when wrapping around end
parent 88dc7e9d

ndb/src/common/transporter/TCP_Transporter.cpp

+16 −6
Original line number Diff line number Diff line
@@ -330,22 +330,32 @@ TCP_Transporter::doSend() { 


  // Empty the SendBuffers

  

  bool sent_any = true;

  while (m_sendBuffer.dataSize > 0)

  {

    const char * const sendPtr = m_sendBuffer.sendPtr;

    const Uint32 sizeToSend    = m_sendBuffer.sendDataSize;

  if (sizeToSend > 0){

    const int nBytesSent = inet_send(theSocket, sendPtr, sizeToSend, 0);

    

    if (nBytesSent > 0) {

    if (nBytesSent > 0) 

    {

      sent_any = true;

      m_sendBuffer.bytesSent(nBytesSent);

      

      sendCount ++;

      sendSize  += nBytesSent;

      if(sendCount == reportFreq){

      if(sendCount == reportFreq)

      {

	reportSendLen(get_callback_obj(), remoteNodeId, sendCount, sendSize);

	sendCount = 0;

	sendSize  = 0;

      }

    } else {

    } 

    else 

    {

      if (nBytesSent < 0 && InetErrno == EAGAIN && sent_any)

        break;



      // Send failed

#if defined DEBUG_TRANSPORTER

      ndbout_c("Send Failure(disconnect==%d) to node = %d nBytesSent = %d "