Bug#35703454 NdbSocket refactoring - move invalidate into close [NOCLOSE]

NdbSocket::close should always invalidate the socket file descriptor.
Renamed invalidate into a private method invalidate_socket_handle and
used that in close and other methods.

Change-Id: Ic02406a72de3e452287337dcc87f8a0d361ecf8a

Author: zmur

storage/ndb/include/util/NdbSocket.h

@@ -48,7 +48,6 @@ class NdbSocket {
 
   void init_from_new(ndb_socket_t);
   void init_from_native(socket_t fd) { ndb_socket_init_from_native(s, fd); }
-  void invalidate();
   int is_valid() const               { return ndb_socket_valid(s); }
   bool has_tls() const               { return ssl; }
   ndb_socket_t ndb_socket() const    { return s; }
@@ -169,6 +168,8 @@ class NdbSocket {
   bool check_hup() const;
 
 private:
+  void invalidate_socket_handle();
+
   ssize_t ssl_recv(char * buf, size_t len) const;
   ssize_t ssl_peek(char * buf, size_t len) const;
   ssize_t ssl_send(const char * buf, size_t len) const;
@@ -229,9 +230,10 @@ NdbSocket& NdbSocket::operator=(NdbSocket && oth) {
 }
 
 inline
-void NdbSocket::invalidate() {
-  assert(ssl == nullptr);         // call close() before invalidate()
-  assert(mutex == nullptr);       // call close() before invalidate()
+void NdbSocket::invalidate_socket_handle() {
+  // call close() before invalidate_socket_handle()
+  assert(ssl == nullptr);
+  assert(mutex == nullptr);
   ndb_socket_invalidate(&s);
 }
 
@@ -268,13 +270,17 @@ inline
 int NdbSocket::close() {
   if(ssl) ssl_close();
   disable_locking();
-  return ndb_socket_close(s);
+  int r = ndb_socket_close(s);
+  invalidate_socket_handle();
+  return r;
 }
 
 inline
 void NdbSocket::close_with_reset(bool with_reset) {
   if(ssl) ssl_close();
+  disable_locking();
   ndb_socket_close_with_reset(s, with_reset);
+  invalidate_socket_handle();
 }
 
 /* ndb_socket_poller.h */

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

@@ -74,20 +74,19 @@ Loopback_Transporter::connect_client()
 void
 Loopback_Transporter::disconnectImpl()
 {
-  ndb_socket_t pair[] = { theSocket.ndb_socket(), m_send_socket };
-
   get_callback_obj()->lock_transporter(m_transporter_index);
 
-  theSocket.invalidate();
+  NdbSocket recv_sock = std::move(theSocket);
+  ndb_socket_t send_sock = m_send_socket;
   ndb_socket_invalidate(&m_send_socket);
 
   get_callback_obj()->unlock_transporter(m_transporter_index);
 
-  if (ndb_socket_valid(pair[0]))
-    ndb_socket_close(pair[0]);
+  if (recv_sock.is_valid())
+    recv_sock.close();
 
-  if (ndb_socket_valid(pair[1]))
-    ndb_socket_close(pair[1]);
+  if (ndb_socket_valid(send_sock))
+    ndb_socket_close(send_sock);
 }
 
 bool

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

@@ -623,7 +623,6 @@ SHM_Transporter::disconnect_socket()
       report_error(TE_ERROR_CLOSING_SOCKET);
     }
   }
-  theSocket.invalidate();
   setupBuffersUndone();
   get_callback_obj()->unlock_transporter(m_transporter_index);
 }

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

@@ -485,7 +485,6 @@ TCP_Transporter::shutdown()
     DEB_MULTI_TRP(("Close socket for trp %u",
                    getTransporterIndex()));
     theSocket.close();
-    theSocket.invalidate();
   }
   else
   {

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

@@ -183,7 +183,6 @@ bool Transporter::do_disconnect(int err, bool send_source)
       DEB_MULTI_TRP(("Close trp_id %u in inactive mode, socket valid",
                      getTransporterIndex()));
       theSocket.close();
-      theSocket.invalidate();
     }
     else
     {

storage/ndb/src/common/util/NdbSocket.cpp

@@ -177,7 +177,6 @@ bool NdbSocket::ssl_handshake() {
 
   log_ssl_error(desc);
   close();
-  invalidate();
   return false;
 }
 

storage/ndb/src/common/util/SocketClient.cpp

@@ -226,7 +226,6 @@ SocketClient::authenticate(NdbSocket & secureSocket)
     g_eventLogger->error("Socket authentication failed: %s\n",
                          m_auth->error(r));
     secureSocket.close();
-    secureSocket.invalidate();
   }
   return r;
 }

storage/ndb/src/common/util/testSecureSocket.cpp

@@ -319,11 +319,11 @@ Client::Client(const char * hostname) : SocketClient(nullptr),
 }
 
 NdbSocket & Client::connect_plain() {
+  require(!m_plain_socket.is_valid());
   ndb_sockaddr server_addr;
   if (Ndb_getAddr(&server_addr, m_server_host))
   {
     puts("Plain connection lookup server address failed.");
-    m_plain_socket.invalidate();
     return m_plain_socket;
   }
   server_addr.set_port(opt_port);
@@ -335,11 +335,11 @@ NdbSocket & Client::connect_plain() {
 }
 
 NdbSocket & Client::connect_tls() {
+  require(!m_tls_socket.is_valid());
   ndb_sockaddr server_addr;
   if (Ndb_getAddr(&server_addr, m_server_host))
   {
     puts("TLS connection lookup server address failed.");
-    m_tls_socket.invalidate();
     return m_tls_socket;
   }
   server_addr.set_port(opt_port + 1);
@@ -357,7 +357,7 @@ NdbSocket & Client::connect_tls() {
     }
     else NdbSocket::free_ssl(ssl);
     puts("TLS connection failed.");
-    m_tls_socket.invalidate();
+    m_tls_socket.close();
   }
   ndb_setsockopt(m_tls_socket.ndb_socket(), IPPROTO_TCP, TCP_NODELAY,
                  & opt_tcp_no_delay);

storage/ndb/src/cw/cpcd/APIService.cpp

@@ -172,7 +172,6 @@ void CPCDAPISession::runSession() {
     }
   }
   m_secure_socket.close();
-  m_secure_socket.invalidate();
 }
 
 void CPCDAPISession::stopSession() {

storage/ndb/src/mgmapi/mgmapi.cpp

@@ -678,7 +678,6 @@ int ndb_mgm_is_connected(NdbMgmHandle handle)
     {
       handle->connected= 0;
       handle->socket.close();
-      handle->socket.invalidate();
     }
   }
   return handle->connected;
@@ -1019,7 +1018,6 @@ int
 ndb_mgm_disconnect_quiet(NdbMgmHandle handle)
 {
   handle->socket.close();
-  handle->socket.invalidate();
   handle->connected = 0;
 
   return 0;

storage/ndb/src/mgmsrv/Services.cpp

@@ -397,7 +397,6 @@ MgmApiSession::~MgmApiSession()
   if(m_secure_socket.is_valid())
   {
     m_secure_socket.close();
-    m_secure_socket.invalidate();
   }
   if(m_stopSelf < 0)
     g_RestartServer= true;
@@ -492,7 +491,6 @@ MgmApiSession::runSession()
   if(m_secure_socket.is_valid())
   {
     m_secure_socket.close();
-    m_secure_socket.invalidate();
   }
   NdbMutex_Unlock(m_mutex);
 
@@ -1860,7 +1858,6 @@ MgmApiSession::listen_event(Parser<MgmApiSession>::Context & ctx,
   {
     m_mgmsrv.m_event_listner.add_listener(le);
     m_stop = true;
-    m_secure_socket.invalidate();
   }
 }
 
@@ -1908,7 +1905,6 @@ MgmApiSession::transporter_connect(Parser_t::Context &ctx,
     }
     // Close the socket to indicate failure to client
     m_secure_socket.close_with_reset(close_with_reset);
-    m_secure_socket.invalidate(); // Already closed
   }
   else
   {