Commit 5c059f7d authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files

ndb - bug#32359 

  Increase connection negotiation timeout
  Improve some weirdness
parent 574bce49

storage/ndb/src/common/transporter/Transporter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ Transporter::Transporter(TransporterRegistry &t_reg, 
  signalIdUsed    = _signalId;



  m_connected     = false;

  m_timeOutMillis = 1000;

  m_timeOutMillis = 30000;



  m_connect_address.s_addr= 0;

  if(s_port<0)
@@ -101,7 +101,7 @@ Transporter::connect_server(NDB_SOCKET_TYPE sockfd) { 


  if(m_connected)

  {

    DBUG_RETURN(true); // TODO assert(0);

    DBUG_RETURN(false); // TODO assert(0);

  }

  

  {

storage/ndb/src/common/transporter/TransporterRegistry.cpp

+2 −1
Original line number Diff line number Diff line
@@ -758,7 +758,8 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis) 
    TCP_Transporter * t = theTCPTransporters[i];

    

    // If the transporter is connected

    if (t->isConnected()) {

    NodeId nodeId = t->getRemoteNodeId();

    if (is_connected(nodeId) && t->isConnected()) {

      

      const NDB_SOCKET_TYPE socket = t->getSocket();

      // Find the highest socket value. It will be used by select