Commit 7e7668e4 authored by unknown's avatar unknown

ndb - bug#32359

  Increase connection negotiation timeout
  Improve some weirdness


storage/ndb/src/common/transporter/Transporter.cpp:
  - Increase connection negotiation timeout
  - return false if trying to connect when already connected (should still be assert)
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Use correct "is_connected" checks
    (although this is kind of bogus and should be cleaned-up)
parent 5ac34666
...@@ -70,7 +70,7 @@ Transporter::Transporter(TransporterRegistry &t_reg, ...@@ -70,7 +70,7 @@ Transporter::Transporter(TransporterRegistry &t_reg,
signalIdUsed = _signalId; signalIdUsed = _signalId;
m_connected = false; m_connected = false;
m_timeOutMillis = 1000; m_timeOutMillis = 30000;
m_connect_address.s_addr= 0; m_connect_address.s_addr= 0;
if(s_port<0) if(s_port<0)
...@@ -101,7 +101,7 @@ Transporter::connect_server(NDB_SOCKET_TYPE sockfd) { ...@@ -101,7 +101,7 @@ Transporter::connect_server(NDB_SOCKET_TYPE sockfd) {
if(m_connected) if(m_connected)
{ {
DBUG_RETURN(true); // TODO assert(0); DBUG_RETURN(false); // TODO assert(0);
} }
{ {
......
...@@ -758,7 +758,8 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis) ...@@ -758,7 +758,8 @@ TransporterRegistry::poll_TCP(Uint32 timeOutMillis)
TCP_Transporter * t = theTCPTransporters[i]; TCP_Transporter * t = theTCPTransporters[i];
// If the transporter is connected // 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(); const NDB_SOCKET_TYPE socket = t->getSocket();
// Find the highest socket value. It will be used by select // Find the highest socket value. It will be used by select
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment