Bug#31016905 MAINTAIN THE MINIMUM CONNECTED API

VERSION VALUE IN NDBAPI

Added code to calculate and maintain the minimum API node version
connected to the cluster, in NDBAPI. A new method, get_min_api_version,
is added to the Ndb_cluster_connection to give access to this value.

Changes:
class ApiRegConf
- Added a new member variable minApiVersion. QMGR uses this variable to
  send the minimum API version, connected to that data node, to the API
  nodes as a part of the GSN_API_REGCONF reply.

struct trp_node
- Added a new member variable minApiVersion to cache the minimum API
  node version reported by the respective data nodes.

class ClusterMgr
- Added a new member variable minApiVersion to maintain the minimum API
  version connected to cluster.
- Added a method recalcMinApiVersion() that recalculates the minimum API
  version connected to cluster by comparing the minimum API node
  versions reported by all the data nodes. The value is recalculated
  whenever a new data node connects, when it reports a change in the
  lowest API node connected to it or when it is disconnected.

class Ndb_cluster_connection
- Added a new method get_min_api_version() that returns the minimum API
  version value cached in the ClusterMgr object.

Change-Id: I0ac873dbe55da188d049e647c890005f8c81219a

Author: lkshminarayanan

storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2020, 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, version 2.0,
@@ -93,7 +93,7 @@ class ApiRegConf {
   friend class ClusterMgr;
 
 public:
-  STATIC_CONST( SignalLength = 5 + NodeState::DataLength );
+  STATIC_CONST( SignalLength = 6 + NodeState::DataLength );
 private:
 
   Uint32 qmgrRef;
@@ -102,6 +102,7 @@ class ApiRegConf {
   Uint32 mysql_version;
   Uint32 minDbVersion;
   NodeStatePOD nodeState;
+  Uint32 minApiVersion;
 };
 
 

storage/ndb/include/ndb_version.h.in

@@ -625,4 +625,17 @@ ndbd_support_waitgcp_shutdownsync(Uint32 x)
   return 1;
 }
 
+/*
+ * Data Node sends minimum API version connected to cluster
+ * as a part of ApiRegConf reply since 8.0.21
+ */
+#define NDBD_SEND_MIN_API_VERSION NDB_MAKE_VERSION(8,0,21)
+static
+inline
+int
+ndbd_send_min_api_version(Uint32 x)
+{
+  return x >= NDBD_SEND_MIN_API_VERSION;
+}
+
 #endif

storage/ndb/include/ndbapi/ndb_cluster_connection.hpp

@@ -309,6 +309,7 @@ class Ndb_cluster_connection {
   unsigned node_id();
   unsigned get_connect_count() const;
   unsigned get_min_db_version() const;
+  unsigned get_min_api_version() const;
 
   void init_get_next_node(Ndb_cluster_connection_node_iter &iter);
   unsigned int get_next_node(Ndb_cluster_connection_node_iter &iter);

storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

@@ -4595,6 +4595,7 @@ Qmgr::sendApiRegConf(Signal *signal, Uint32 node)
   }
   NodeVersionInfo info = getNodeVersionInfo();
   apiRegConf->minDbVersion = info.m_type[NodeInfo::DB].m_min_version;
+  apiRegConf->minApiVersion = info.m_type[NodeInfo::API].m_min_version;
   apiRegConf->nodeState.m_connected_nodes.assign(c_connectedNodes);
   sendSignal(ref, GSN_API_REGCONF, signal, ApiRegConf::SignalLength, JBB);
 }

storage/ndb/src/ndbapi/ClusterMgr.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2020, 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, version 2.0,
@@ -83,6 +83,7 @@ ClusterMgr::ClusterMgr(TransporterFacade & _facade):
   noOfConnectedNodes(0),
   noOfConnectedDBNodes(0),
   minDbVersion(0),
+  minApiVersion(0),
   theClusterMgrThread(NULL),
   m_process_info(NULL),
   m_cluster_state(CS_waiting_for_clean_cache),
@@ -686,6 +687,52 @@ ClusterMgr::recalcMinDbVersion()
   minDbVersion = newMinDbVersion;
 }
 
+/**
+ * recalcMinApiVersion
+ *
+ * This method is called whenever the 'minimum API node
+ * version' data for the connected DB nodes changes
+ * It calculates the minimum version of all the connected
+ * API nodes.
+ * This information is cached by Ndb object instances.
+ * This information is useful when implementing API compatibility
+ * with older API nodes
+ */
+void
+ClusterMgr::recalcMinApiVersion()
+{
+  Uint32 newMinApiVersion = ~ (Uint32) 0;
+
+  for (Uint32 i = 0; i < MAX_NODES; i++)
+  {
+    trp_node& node = theNodes[i];
+
+    if (node.is_connected() &&
+        node.is_confirmed() &&
+        node.m_info.getType() == NodeInfo::DB)
+    {
+      /* Include this node in the set of nodes used to
+       * compute the lowest current API node version
+       */
+      assert(node.m_info.m_version);
+
+      if (node.minApiVersion < newMinApiVersion)
+      {
+        newMinApiVersion = node.minApiVersion;
+      }
+    }
+  }
+
+  /* Now update global min Api version if we have one.
+   * Otherwise set it to 0
+   */
+  newMinApiVersion = (newMinApiVersion == ~ (Uint32) 0) ?
+                     0 :
+                     newMinApiVersion;
+
+  minApiVersion = newMinApiVersion;
+}
+
 /******************************************************************************
  * Send PROCESSINFO_REP
  ******************************************************************************/
@@ -783,6 +830,7 @@ ClusterMgr::execAPI_REGREQ(const Uint32 * theData){
   conf->apiHeartbeatFrequency = m_hbFrequency/10;
 
   conf->minDbVersion= 0;
+  conf->minApiVersion= 0;
   conf->nodeState= node.m_state;
 
   DEBUG_FPRINTF((stderr, "set_confirmed on node: %u\n", nodeId));
@@ -835,6 +883,13 @@ ClusterMgr::execAPI_REGCONF(const NdbApiSignal * signal,
     recalcMinDbVersion();
   }
 
+  if (ndbd_send_min_api_version(apiRegConf->mysql_version) &&
+      node.minApiVersion != apiRegConf->minApiVersion)
+  {
+    node.minApiVersion = apiRegConf->minApiVersion;
+    recalcMinApiVersion();
+  }
+
   node.m_state = apiRegConf->nodeState;
 
   if (node.m_info.m_type == NodeInfo::DB)
@@ -1183,6 +1238,7 @@ ClusterMgr::reportConnected(NodeId nodeId)
   theNode.m_node_fail_rep = false;
   theNode.m_state.startLevel = NodeState::SL_NOTHING;
   theNode.minDbVersion = 0;
+  theNode.minApiVersion = 0;
 
   /**
    * End of protected ClusterMgr updates of shared global data.
@@ -1361,6 +1417,7 @@ ClusterMgr::execNODE_FAILREP(const NdbApiSignal* sig,
   }
 
   recalcMinDbVersion();
+  recalcMinApiVersion();
   if (copy->noOfNodes)
   {
     LinearSectionPtr lsptr[3];

storage/ndb/src/ndbapi/ClusterMgr.hpp

@@ -157,6 +157,7 @@ class ClusterMgr : public trp_client
   Uint32        noOfConnectedNodes;
   Uint32        noOfConnectedDBNodes;
   Uint32        minDbVersion;
+  Uint32        minApiVersion;
   Node          theNodes[MAX_NODES];
   NdbThread*    theClusterMgrThread;
 
@@ -223,6 +224,7 @@ class ClusterMgr : public trp_client
 
   void print_nodes(const char* where, NdbOut& out = ndbout);
   void recalcMinDbVersion();
+  void recalcMinApiVersion();
   void sendProcessInfoReport(NodeId nodeId);
 
 public:

storage/ndb/src/ndbapi/TransporterFacade.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2020, 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, version 2.0,
@@ -132,6 +132,7 @@ class TransporterFacade :
 
 public:
   Uint32 getMinDbNodeVersion() const;
+  Uint32 getMinApiNodeVersion() const;
 
   // My own processor id
   NodeId ownId() const;
@@ -652,6 +653,12 @@ unsigned Ndb_cluster_connection_impl::get_min_db_version() const
   return m_transporter_facade->getMinDbNodeVersion();
 }
 
+inline
+unsigned Ndb_cluster_connection_impl::get_min_api_version() const
+{
+  return m_transporter_facade->getMinApiNodeVersion();
+}
+
 inline
 bool
 TransporterFacade::get_node_alive(NodeId n) const {
@@ -678,6 +685,16 @@ TransporterFacade::getMinDbNodeVersion() const
     return 0;
 }
 
+inline
+Uint32
+TransporterFacade::getMinApiNodeVersion() const
+{
+  if (theClusterMgr)
+    return theClusterMgr->minApiVersion;
+  else
+    return 0;
+}
+
 inline
 const trp_node &
 trp_client::getNodeInfo(Uint32 nodeId) const

storage/ndb/src/ndbapi/ndb_cluster_connection.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2020, 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, version 2.0,
@@ -431,6 +431,11 @@ unsigned Ndb_cluster_connection::get_min_db_version() const
   return m_impl.get_min_db_version();
 }
 
+unsigned Ndb_cluster_connection::get_min_api_version() const
+{
+  return m_impl.get_min_api_version();
+}
+
 int Ndb_cluster_connection::get_latest_error() const
 {
   return m_impl.m_latest_error;

storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2020, 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, version 2.0,
@@ -82,6 +82,7 @@ class Ndb_cluster_connection_impl : public Ndb_cluster_connection
 
   inline unsigned get_connect_count() const;
   inline unsigned get_min_db_version() const;
+  inline unsigned get_min_api_version() const;
 public:
   inline Uint64 *get_latest_trans_gci() { return &m_latest_trans_gci; }
 

storage/ndb/src/ndbapi/trp_node.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2020, 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, version 2.0,
@@ -33,6 +33,7 @@ trp_node::trp_node()
   m_state.init();
   m_state.startLevel = NodeState::SL_NOTHING;
   minDbVersion = 0;
+  minApiVersion = 0;
 }
 
 bool
@@ -46,6 +47,7 @@ trp_node::operator==(const trp_node& other) const
           m_api_reg_conf == other.m_api_reg_conf &&
           m_node_fail_rep == other.m_node_fail_rep &&
           minDbVersion == other.minDbVersion &&
+          minApiVersion == other.minApiVersion &&
           memcmp(&m_state, &other.m_state, sizeof(m_state)) == 0);
 }
 
@@ -61,6 +63,7 @@ operator<<(NdbOut& out, const trp_node& n)
       << ", nodefailrep: " << n.m_node_fail_rep
       << ", nfCompleteRep: " << n.nfCompleteRep
       << ", minDbVersion: " << n.minDbVersion
+      << ", minApiVersion: " << n.minApiVersion
       << ", state: " << n.m_state
       << ", connected: "
       << BaseString::getPrettyTextShort(n.m_state.m_connected_nodes).c_str()