Bug#36569947 Ndb : No way to determine if SHM transporters in use

Add a new type column to the ndbinfo.transporter_details view.
This takes values 'TCP' or 'SHM', allowing the transporter types in
use to be observed.

Column is added as the last in the table which should allow for
defined upgrade behaviour.

Change-Id: I4cec1a9cdb6d7a84419133178b1b560402222d9c

Author: frazerclement

mysql-test/suite/ndb/r/ndbinfo_plans.result

@@ -63,7 +63,7 @@ ndb$acc_operations	15	64
 ndb$backup_id	1	20
 ndb$blocks	29	20
 ndb$certificates	34	44
-ndb$columns	560	44
+ndb$columns	561	44
 ndb$config_nodes	34	28
 ndb$counters	200	24
 ndb$dblqh_tcconnect_state	19	52
@@ -106,7 +106,7 @@ ndb$threadblocks	124	16
 ndb$threads	26	40
 ndb$threadstat	22	144
 ndb$transactions	5	44
-ndb$transporter_details	32	108
+ndb$transporter_details	32	112
 ndb$transporters	32	68
 
 CALL populate_sizes();

storage/ndb/include/transporter/TransporterRegistry.hpp

@@ -545,6 +545,7 @@ class TransporterRegistry {
   Transporter *get_node_base_transporter(NodeId nodeId) const;
   Transporter *get_node_transporter_instance(NodeId nodeId, int inst) const;
   bool is_shm_transporter(TrpId trp_id);
+  TransporterType get_transporter_type(TrpId id) const;
 
   ndb_sockaddr get_connect_address_node(NodeId nodeId) const;
   ndb_sockaddr get_connect_address(TrpId trpId) const;

storage/ndb/plugin/ha_ndbinfo_sql.cc

@@ -666,7 +666,12 @@ static struct view {
      " connect_count, "
      " overloaded, overload_count, slowdown, slowdown_count, encrypted, "
      " sendbuffer_used_bytes, sendbuffer_max_used_bytes, "
-     " sendbuffer_alloc_bytes, sendbuffer_max_alloc_bytes "
+     " sendbuffer_alloc_bytes, sendbuffer_max_alloc_bytes, "
+     " CASE type"
+     "   WHEN 1 THEN \"TCP\""
+     "   WHEN 3 THEN \"SHM\""
+     "   ELSE NULL "
+     " END AS type "
      "FROM `ndbinfo`.`ndb$transporter_details`"},
     {"ndbinfo", "transporters",
      "SELECT node_id, remote_node_id, "

storage/ndb/src/common/debugger/NdbinfoTables.cpp

@@ -105,8 +105,8 @@ DECLARE_NDBINFO_TABLE(POOLS, 14) = {
      {"resource_id", Ndbinfo::Number, ""},
      {"type_id", Ndbinfo::Number, "Record type id within resource"}}};
 
-DECLARE_NDBINFO_TABLE(TRANSPORTER_DETAILS, 18) = {
-    {"transporter_details", 18, 0,
+DECLARE_NDBINFO_TABLE(TRANSPORTER_DETAILS, 19) = {
+    {"transporter_details", 19, 0,
      [](const Ndbinfo::Counts &counts) {
        return (counts.data_nodes) * (counts.all_nodes - 1);
      },
@@ -139,7 +139,9 @@ DECLARE_NDBINFO_TABLE(TRANSPORTER_DETAILS, 18) = {
      {"sendbuffer_alloc_bytes", Ndbinfo::Number64,
       "SendBuffer bytes allocated"},
      {"sendbuffer_max_alloc_bytes", Ndbinfo::Number64,
-      "SendBuffer historical max bytes allocated"}}};
+      "SendBuffer historical max bytes allocated"},
+
+     {"type", Ndbinfo::Number, "Transporter type"}}};
 
 DECLARE_NDBINFO_TABLE(TRANSPORTERS, 12) = {
     {"transporters", 12, 0,

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

@@ -3085,6 +3085,11 @@ bool TransporterRegistry::is_shm_transporter(TrpId trp_id) {
     return false;
 }
 
+TransporterType TransporterRegistry::get_transporter_type(TrpId trp_id) const {
+  assert(trp_id < maxTransporters);
+  return allTransporters[trp_id]->getTransporterType();
+}
+
 bool TransporterRegistry::is_encrypted_link(TrpId trpId) const {
   return allTransporters[trpId]->is_encrypted();
 }

storage/ndb/src/kernel/blocks/trpman.cpp

@@ -524,6 +524,9 @@ void Trpman::execDBINFO_SCANREQ(Signal *signal) {
         row.write_uint64(
             globalTransporterRegistry.get_send_buffer_max_alloc_bytes(trpId));
 
+        /* Transporter type */
+        row.write_uint32(globalTransporterRegistry.get_transporter_type(trpId));
+
         ndbinfo_send_row(signal, req, row, rl);
         trpId++;
         if (rl.need_break(req)) {