wl#9819 patch #9: Send ProcessInfoRep from ClusterMgr

Author: jdduncan

storage/ndb/include/kernel/ProcessInfo.hpp

@@ -50,7 +50,7 @@ class ProcessInfo {
   void setNodeId(Uint16);
   const char * getConnectionName() const { return connection_name;   };
   const char * getProcessName() const    { return process_name;      };
-  const char * getHostAddress() const;
+  const char * getHostAddress() const    { return host_address;      };
   int getPid() const;
   int getAngelPid() const                { return angel_process_id;  };
   int getPort() const                    { return application_port;  };
@@ -67,9 +67,9 @@ class ProcessInfo {
   STATIC_CONST( AddressStringLength = 48 );  // Long enough for IPv6
   STATIC_CONST( AddressStringLengthInWords = 12);
 
-//  /* Interface for ClusterManager to create signal */
-//  void buildProcessInfoReport(ProcessInfoRep *);
-//
+  /* Interface for ClusterManager to create signal */
+  void buildProcessInfoReport(ProcessInfoRep *);
+
 
 private:              /* Data Members */
   char connection_name[ConnectionNameLength];
@@ -86,9 +86,4 @@ inline bool ProcessInfo::isValid() const {
   return process_id;
 }
 
-inline const char * ProcessInfo::getHostAddress() const {
-  return host_address[0] ? host_address : 0;
-}
-
-
 #endif

storage/ndb/include/ndb_version.h.in

@@ -895,6 +895,12 @@ ndbd_multi_tc_instance_takeover(Uint32 x)
  */
 #define NDBD_SUPPORT_PARALLEL_SYNCH NDB_MAKE_VERSION(7,4,3)
 
+/**
+ * Support for wl#9819 ndbinfo.processes
+ * FIXME adjust this when actually merging
+ */
+#define NDBD_PROCESSINFO_VERSION NDB_MAKE_VERSION(7,5,5)
+
 #define NDBD_ISOLATE_ORD_72 NDB_MAKE_VERSION(7,2,19)
 #define NDBD_ISOLATE_ORD_73 NDB_MAKE_VERSION(7,3,8)
 #define NDBD_ISOLATE_ORD_74 NDB_MAKE_VERSION(7,4,3)

storage/ndb/src/ndbapi/ClusterMgr.cpp

@@ -28,13 +28,15 @@
 #include <NdbSleep.h>
 #include <NdbOut.hpp>
 #include <NdbTick.h>
-
+#include <ProcessInfo.hpp>
+#include <OwnProcessInfo.hpp>
 
 #include <signaldata/NodeFailRep.hpp>
 #include <signaldata/NFCompleteRep.hpp>
 #include <signaldata/ApiRegSignalData.hpp>
 #include <signaldata/AlterTable.hpp>
 #include <signaldata/SumaImpl.hpp>
+#include <signaldata/ProcessInfoRep.hpp>
 
 #include <mgmapi.h>
 #include <mgmapi_configuration.hpp>
@@ -66,6 +68,7 @@ ClusterMgr::ClusterMgr(TransporterFacade & _facade):
   noOfConnectedDBNodes(0),
   minDbVersion(0),
   theClusterMgrThread(NULL),
+  m_process_info(NULL),
   m_cluster_state(CS_waiting_for_clean_cache),
   m_hbFrequency(0)
 {
@@ -94,6 +97,7 @@ ClusterMgr::~ClusterMgr()
   }
   NdbCondition_Destroy(waitForHBCond);
   NdbMutex_Destroy(clusterMgrThreadMutex);
+  ProcessInfo::release(m_process_info);
   DBUG_VOID_RETURN;
 }
 
@@ -195,6 +199,8 @@ ClusterMgr::configure(Uint32 nodeId,
 
   theFacade.get_registry()->set_connect_backoff_max_time_in_ms(
     start_connect_backoff_max_time);
+
+  m_process_info = ProcessInfo::forNodeId(nodeId);
 }
 
 void
@@ -587,7 +593,7 @@ ClusterMgr::trp_deliver_signal(const NdbApiSignal* sig,
 }
 
 ClusterMgr::Node::Node()
-  : hbFrequency(0), hbCounter(0)
+  : hbFrequency(0), hbCounter(0), processInfoSent(0)
 {
 }
 
@@ -656,6 +662,39 @@ ClusterMgr::recalcMinDbVersion()
   minDbVersion = newMinDbVersion;
 }
 
+/******************************************************************************
+ * Send PROCESSINFO_REP
+ ******************************************************************************/
+void
+ClusterMgr::sendProcessInfoReport(NodeId nodeId)
+{
+  LinearSectionPtr ptr[3];
+  LinearSectionPtr & nameSection = ptr[ProcessInfoRep::ConnNameSectionNum];
+  LinearSectionPtr & addrSection = ptr[ProcessInfoRep::HostAddrSectionNum];
+  BlockReference ownRef = numberToRef(API_CLUSTERMGR, theFacade.ownId());
+  NdbApiSignal signal(ownRef);
+  int nsections = 1;
+  signal.theVerId_signalNumber = GSN_PROCESSINFO_REP;
+  signal.theReceiversBlockNumber = QMGR;
+  signal.theTrace  = 0;
+  signal.theLength = ProcessInfoRep::SignalLength;
+
+  ProcessInfoRep * report = CAST_PTR(ProcessInfoRep, signal.getDataPtrSend());
+  m_process_info->buildProcessInfoReport(report);
+  nameSection.p = (Uint32 *) m_process_info->getConnectionName();
+  nameSection.sz = ProcessInfo::ConnectionNameLengthInWords;
+  const char * hostAddress = m_process_info->getHostAddress();
+  if(hostAddress[0])
+  {
+    // report->flags = ProcessInfoRep::HostAddressFlag;
+    nsections = 2;
+    addrSection.p = (Uint32 *) hostAddress;
+    addrSection.sz = ProcessInfo::AddressStringLengthInWords;
+  }
+  raw_sendSignal(&signal, nodeId, ptr, nsections);
+}
+
+
 /******************************************************************************
  * API_REGREQ and friends
  ******************************************************************************/
@@ -833,6 +872,15 @@ ClusterMgr::execAPI_REGCONF(const NdbApiSignal * signal,
     }
   }
 
+  /* Send ProcessInfo Report to a newly connected DB node */
+  if ( cm_node.m_info.m_type == NodeInfo::DB &&
+       cm_node.m_info.m_version >= NDBD_PROCESSINFO_VERSION &&
+       (! cm_node.processInfoSent) )
+  {
+    sendProcessInfoReport(nodeId);
+    cm_node.processInfoSent = true;
+  }
+
   // Distribute signal to all threads/blocks
   // TODO only if state changed...
   theFacade.for_each(this, signal, ptr);
@@ -923,6 +971,7 @@ ClusterMgr::reportConnected(NodeId nodeId)
   cm_node.hbMissed = 0;
   cm_node.hbCounter = 0;
   cm_node.hbFrequency = 0;
+  cm_node.processInfoSent = false;
 
   assert(theNode.is_connected() == false);
 
@@ -1245,6 +1294,14 @@ ClusterMgr::print_nodes(const char* where, NdbOut& out)
   out << "<<" << endl;
 }
 
+void
+ClusterMgr::setProcessInfo(const char * connection_name,
+                           const char * address_string, int port)
+{
+  m_process_info->setConnectionName(connection_name);
+  m_process_info->setHostAddress(address_string);
+  m_process_info->setPort(port);
+}
 
 /******************************************************************************
  * Arbitrator

storage/ndb/src/ndbapi/ClusterMgr.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 
 extern "C" void* runClusterMgr_C(void * me);
 
-
 /**
   @class ClusterMgr
   This class runs a heartbeat protocol between nodes, to detect if remote
@@ -58,7 +57,10 @@ class ClusterMgr : public trp_client
 
   void reportConnected(NodeId nodeId);
   void reportDisconnected(NodeId nodeId);
-  
+  void setProcessInfo(const char * connection_name,
+                      const char * application_address,
+                      int application_port);
+  void sendProcessInfoReport(NodeId nodeId);
   void doStop();
   void startThread();
 
@@ -129,6 +131,8 @@ class ClusterMgr : public trp_client
     Uint32 hbFrequency; // Heartbeat frequence 
     Uint32 hbCounter;   // # milliseconds passed since last hb sent
     Uint32 hbMissed;    // # missed heartbeats
+
+    bool processInfoSent;  // ProcessInfo Report has been sent to node
   };
 
   const trp_node & getNodeInfo(NodeId) const;
@@ -141,6 +145,7 @@ class ClusterMgr : public trp_client
    */
   int m_auto_reconnect;
   Uint32        m_connect_count;
+
 private:
   Uint32        m_max_api_reg_req_interval;
   Uint32        noOfAliveNodes;
@@ -151,6 +156,7 @@ class ClusterMgr : public trp_client
   NdbThread*    theClusterMgrThread;
 
   NdbCondition* waitForHBCond;
+  class ProcessInfo * m_process_info;
 
   enum Cluster_state m_cluster_state;
   /**