wl#9819 patch #11: New method set_application_address() on Ndb_cluster_connection

Author: jdduncan

storage/ndb/include/ndbapi/ndb_cluster_connection.hpp

@@ -96,12 +96,27 @@ class Ndb_cluster_connection {
 
   /**
    * Set a name on the connection, which will be reported in cluster log
+   * and in ndbinfo.processes.
+   * For the name to be visible, this must be called prior to connect().
    *
    * @param name
    *
    */
   void set_name(const char *name);
 
+  /**
+   * Set an application host network address and port number on the connection,
+   * which will be reported in ndbinfo.processes.
+   * This must be called prior to connect() for the information to be visible.
+   * If address_string is null, the network address used by the NDBAPI
+   * connection will be reported.
+   *
+   * @param address_string
+   * @param port
+   *
+   */
+  void set_application_address(const char * address_string, int port);
+
   /**
    * Set timeout
    *

storage/ndb/src/ndbapi/ndb_cluster_connection.cpp

@@ -437,7 +437,9 @@ Ndb_cluster_connection_impl(const char * connect_string,
     m_latest_error_msg(),
     m_latest_error(0),
     m_data_node_neighbour(0),
-    m_multi_wait_group(0)
+    m_multi_wait_group(0),
+    m_application_addr(0),
+    m_application_port(0)
 {
   DBUG_ENTER("Ndb_cluster_connection");
   DBUG_PRINT("enter",("Ndb_cluster_connection this=0x%lx", (long) this));
@@ -901,6 +903,13 @@ Ndb_cluster_connection_impl::set_name(const char *name)
   ndb_mgm_set_name(h, name);
 }
 
+void
+Ndb_cluster_connection_impl::set_application_address(const char * addr, int port)
+{
+  m_application_addr = addr;
+  m_application_port = port;
+}
+
 int
 Ndb_cluster_connection_impl::init_nodes_vector(Uint32 nodeid,
 					       const ndb_mgm_configuration 
@@ -1210,6 +1219,11 @@ void Ndb_cluster_connection::set_name(const char *name)
   m_impl.set_name(name);
 }
 
+void Ndb_cluster_connection::set_application_address(const char * addr, int port)
+{
+  m_impl.set_application_address(addr, port);
+}
+
 int Ndb_cluster_connection_impl::connect(int no_retries,
                                          int retry_delay_in_seconds,
                                          int verbose)
@@ -1275,7 +1289,11 @@ int Ndb_cluster_connection_impl::connect(int no_retries,
       ndb_mgm_destroy_configuration(props);
       DBUG_RETURN(-1);
     }
-
+    NdbMgmHandle mgm_handle = m_config_retriever->get_mgmHandle();
+    const char * name = ndb_mgm_get_name(mgm_handle);
+    m_transporter_facade->theClusterMgr->setProcessInfo(name,
+                                                        m_application_addr,
+                                                        m_application_port);
     ndb_mgm_destroy_configuration(props);
     m_transporter_facade->connected();
     m_latest_error = 0;

storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp

@@ -117,6 +117,7 @@ class Ndb_cluster_connection_impl : public Ndb_cluster_connection
   int configure(Uint32 nodeid, const ndb_mgm_configuration &config);
   void connect_thread();
   void set_name(const char *name);
+  void set_application_address(const char *, int);
   void set_data_node_neighbour(Uint32 neighbour_node);
   void adjust_node_proximity(Uint32 node_id, Int32 adjustment);
   Uint32 get_db_nodes(Uint8 nodesarray[MAX_NDB_NODES]) const;
@@ -168,6 +169,10 @@ class Ndb_cluster_connection_impl : public Ndb_cluster_connection
   Uint64 globalApiStatsBaseline[ Ndb::NumClientStatistics ];
 
   NdbWaitGroup *m_multi_wait_group;
+
+  // Data for ndbinfo.processes
+  const char * m_application_addr;
+  int m_application_port;
 };
 
 #endif