Bug#35714466 Timeout too long on MGMAPI connections converted to transporters

When a TransporterRegistry (TR) instance is connecting to an MGMD, it
first connects using MGMAPI, and then converts the connection to a
Transporter connection for further communication.

The initial MGMAPI connection should have a timeout set so that the TR
instance does not spend too long waiting for unsuccessful connection
attempts to time out.

The MGMAPI connection timeout is set equal to the MGMAPI connection timeout
used by the TR for the connection it uses for getting/setting dynamic ports.

Change-Id: I3e3361dff3fca88ca0792c07222629c48359daf8

Author: frazerclement

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

@@ -322,13 +322,25 @@ TransporterRegistry::TransporterRegistry(TransporterCallback *callback,
   DBUG_VOID_RETURN;
 }
 
+/**
+ * Time limit for individual MGMAPI activities, including
+ * TCP connection
+ * Handshake, auth, TLS
+ * MGMAPI command responses (except where overridden)
+ * Affects:
+ *   - TR MGMAPI connection used to manage dynamic ports
+ *   - Transporter-to-MGMD MGMAPI connections converted
+ *     to transporters
+ */
+static const Uint32 MGM_TIMEOUT_MILLIS=5000;
+
 void TransporterRegistry::set_mgm_handle(NdbMgmHandle h)
 {
   DBUG_ENTER("TransporterRegistry::set_mgm_handle");
   if (m_mgm_handle)
     ndb_mgm_destroy_handle(&m_mgm_handle);
   m_mgm_handle= h;
-  ndb_mgm_set_timeout(m_mgm_handle, 5000);
+  ndb_mgm_set_timeout(m_mgm_handle, MGM_TIMEOUT_MILLIS);
 #ifndef NDEBUG
   if (h)
   {
@@ -2670,6 +2682,11 @@ TransporterRegistry::connect_ndb_mgmd(const char* server_name,
     ndb_mgm_set_connectstring(h, cs.c_str());
   }
 
+  /**
+   * Set timeout
+   */
+  ndb_mgm_set_timeout(h, MGM_TIMEOUT_MILLIS);
+
   if(ndb_mgm_connect(h, 0, 0, 0)<0)
   {
     DBUG_PRINT("info", ("connection to mgmd failed"));