Bug#37006547 Unused node management in TRIX

Patch for 7.6 Only

Problem:
TRIX has boilerplate signal handers and cluster state structures
which have never been used and so are not valid.

Solution:
To avoid confusion, these are removed.

Change-Id: I49587a44e63221afeefa868ef2909e3b2299630c

Author: vinc13e

storage/ndb/src/kernel/blocks/trix/Trix.cpp

@@ -72,25 +72,13 @@ check_timeout(Uint32 errCode)
 /**
  *
  */
-Trix::Trix(Block_context& ctx) :
-  SimulatedBlock(TRIX, ctx),
-  c_theNodes(c_theNodeRecPool),
-  c_masterNodeId(0),
-  c_masterTrixRef(0),
-  c_noNodesFailed(0),
-  c_noActiveNodes(0),
-  c_theSubscriptions(c_theSubscriptionRecPool)
-{
+Trix::Trix(Block_context &ctx)
+    : SimulatedBlock(TRIX, ctx), c_theSubscriptions(c_theSubscriptionRecPool) {
   BLOCK_CONSTRUCTOR(Trix);
 
   // Add received signals
   addRecSignal(GSN_READ_CONFIG_REQ,  &Trix::execREAD_CONFIG_REQ);
   addRecSignal(GSN_STTOR,  &Trix::execSTTOR);
-  addRecSignal(GSN_NDB_STTOR,  &Trix::execNDB_STTOR); // Forwarded from DICT
-  addRecSignal(GSN_READ_NODESCONF, &Trix::execREAD_NODESCONF);
-  addRecSignal(GSN_READ_NODESREF, &Trix::execREAD_NODESREF);
-  addRecSignal(GSN_NODE_FAILREP, &Trix::execNODE_FAILREP);
-  addRecSignal(GSN_INCL_NODEREQ, &Trix::execINCL_NODEREQ);
   addRecSignal(GSN_DUMP_STATE_ORD, &Trix::execDUMP_STATE_ORD);
   addRecSignal(GSN_DBINFO_SCANREQ, &Trix::execDBINFO_SCANREQ);
 
@@ -144,7 +132,6 @@ void
 Trix::execREAD_CONFIG_REQ(Signal* signal)
 {
   jamEntry();
-
   const ReadConfigReq * req = (ReadConfigReq*)signal->getDataPtr();
 
   Uint32 ref = req->senderRef;
@@ -191,8 +178,6 @@ Trix::execREAD_CONFIG_REQ(Signal* signal)
 void Trix::execSTTOR(Signal* signal) 
 {
   jamEntry();                            
-
-  //const Uint32 startphase   = signal->theData[1];
   const Uint32 theSignalKey = signal->theData[6];
 
   signal->theData[0] = theSignalKey;
@@ -202,143 +187,6 @@ void Trix::execSTTOR(Signal* signal)
   return;
 }//Trix::execSTTOR()
 
-/**
- *
- */
-void Trix::execNDB_STTOR(Signal* signal) 
-{
-  jamEntry();                            
-  BlockReference ndbcntrRef = signal->theData[0];	 
-  Uint16 startphase = signal->theData[2];      /* RESTART PHASE           */
-  Uint16 mynode = signal->theData[1];		 
-  //Uint16 restarttype = signal->theData[3];	 
-  //UintR configInfo1 = signal->theData[6];     /* CONFIGRATION INFO PART 1 */
-  //UintR configInfo2 = signal->theData[7];     /* CONFIGRATION INFO PART 2 */
-  switch (startphase) {
-  case 3:
-    jam();
-    /* SYMBOLIC START PHASE 4             */
-    /* ABSOLUTE PHASE 5                   */
-    /* REQUEST NODE IDENTITIES FROM DBDIH */
-    signal->theData[0] = calcTrixBlockRef(mynode);
-    sendSignal(ndbcntrRef, GSN_READ_NODESREQ, signal, 1, JBB);
-    return;
-    break;
-  case 6:
-    break;
-  default:
-    break;
-  }
-}
-
-/**
- *
- */
-void Trix::execREAD_NODESCONF(Signal* signal)
-{
-  jamEntry();
-
-  ReadNodesConf * const  readNodes = (ReadNodesConf *)signal->getDataPtr();
-  //Uint32 noOfNodes   = readNodes->noOfNodes;
-  NodeRecPtr nodeRecPtr;
-
-  c_masterNodeId = readNodes->masterNodeId;
-  c_masterTrixRef = RNIL;
-  c_noNodesFailed = 0;
-
-  for(unsigned i = 0; i < MAX_NDB_NODES; i++) {
-    jam();
-    if(NdbNodeBitmask::get(readNodes->allNodes, i)) {
-      // Node is defined
-      jam();
-      ndbrequire(c_theNodes.getPool().seizeId(nodeRecPtr, i));
-      c_theNodes.addFirst(nodeRecPtr);
-      nodeRecPtr.p->trixRef = calcTrixBlockRef(i);
-      if (i == c_masterNodeId) {
-        c_masterTrixRef = nodeRecPtr.p->trixRef;
-      }
-      if(NdbNodeBitmask::get(readNodes->inactiveNodes, i)){
-        // Node is not active
-	jam();
-	/**-----------------------------------------------------------------
-	 * THIS NODE IS DEFINED IN THE CLUSTER BUT IS NOT ALIVE CURRENTLY.
-	 * WE ADD THE NODE TO THE SET OF FAILED NODES AND ALSO SET THE
-	 * BLOCKSTATE TO BUSY TO AVOID ADDING TRIGGERS OR INDEXES WHILE 
-	 * NOT ALL NODES ARE ALIVE.
-	 *------------------------------------------------------------------*/
-	arrGuard(c_noNodesFailed, MAX_NDB_NODES);
-	nodeRecPtr.p->alive = false;
-	c_noNodesFailed++;
-	c_blockState = Trix::NODE_FAILURE;
-      }
-      else {
-        // Node is active
-        jam();
-        c_noActiveNodes++;
-        nodeRecPtr.p->alive = true;
-      }
-    }
-  }
-  if (c_noNodesFailed == 0) {
-    c_blockState = Trix::STARTED;
-  }
-}
-
-/**
- *
- */
-void Trix::execREAD_NODESREF(Signal* signal)
-{
-  // NYI
-}
-
-/**
- *
- */
-void Trix::execNODE_FAILREP(Signal* signal)
-{
-  jamEntry();
-  NodeFailRep * const  nodeFail = (NodeFailRep *) signal->getDataPtr();
-
-  //Uint32 failureNr    = nodeFail->failNo;
-  //Uint32 numberNodes  = nodeFail->noOfNodes;
-  Uint32 masterNodeId = nodeFail->masterNodeId;
-
-  NodeRecPtr nodeRecPtr;
-
-  for(c_theNodes.first(nodeRecPtr); 
-      nodeRecPtr.i != RNIL; 
-      c_theNodes.next(nodeRecPtr)) {
-    if(NdbNodeBitmask::get(nodeFail->theNodes, nodeRecPtr.i)) {
-      nodeRecPtr.p->alive = false;
-      c_noNodesFailed++;
-      c_noActiveNodes--;      
-    }
-  }
-  if (c_masterNodeId != masterNodeId) {
-    c_masterNodeId = masterNodeId;
-    NodeRecord* nodeRec = c_theNodes.getPtr(masterNodeId);
-    c_masterTrixRef = nodeRec->trixRef;
-  }
-}
-
-/**
- *
- */
-void Trix::execINCL_NODEREQ(Signal* signal)
-{
-  jamEntry();
-  UintR node_id = signal->theData[1];
-  NodeRecord* nodeRec = c_theNodes.getPtr(node_id);
-  nodeRec->alive = true;
-  c_noNodesFailed--;
-  c_noActiveNodes++;      
-  nodeRec->trixRef = calcTrixBlockRef(node_id);
-  if (c_noNodesFailed == 0) {
-    c_blockState = Trix::STARTED;
-  }  
-}
-
 // Debugging
 void
 Trix::execDUMP_STATE_ORD(Signal* signal)

storage/ndb/src/kernel/blocks/trix/Trix.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2021, Oracle and/or its affiliates.
+   Copyright (c) 2003, 2024, Oracle and/or its affiliates.
 
    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,
@@ -78,48 +78,6 @@ class Trix : public SimulatedBlock
   //DBtrix(const Trix &obj);
   //void operator = (const Trix &);
 
-  // Block state
-  enum BlockState {
-    NOT_STARTED,
-    STARTED,
-    NODE_FAILURE,
-    IDLE,
-    BUSY
-  };
-
-  BlockState c_blockState;
-
-  // Node data needed when communicating with remote TRIX:es
-  struct NodeRecord {
-    NodeRecord() {}
-    bool alive;
-    BlockReference trixRef;
-    union {
-      Uint32 nextPool;
-      Uint32 nextList;
-    };
-    Uint32 prevList;
-  };
-  
-  typedef Ptr<NodeRecord> NodeRecPtr;
-  typedef ArrayPool<NodeRecord> NodeRecord_pool;
-  typedef DLList<NodeRecord_pool> NodeRecord_list;
-
-  /**
-   * The pool of node records
-   */
-  NodeRecord_pool c_theNodeRecPool;
-
-  /**
-   * The list of other NDB nodes
-   */  
-  NodeRecord_list c_theNodes;
-
-  Uint32 c_masterNodeId;
-  BlockReference c_masterTrixRef;
-  Uint16 c_noNodesFailed;
-  Uint16 c_noActiveNodes;
-
   AttrOrderBuffer::DataBufferPool c_theAttrOrderBufferPool;
 
   struct SubscriptionRecord {
@@ -308,13 +266,7 @@ class Trix : public SimulatedBlock
   // System start
   void execREAD_CONFIG_REQ(Signal* signal);
   void execSTTOR(Signal* signal);
-  void execNDB_STTOR(Signal* signal);
 
-  // Node management
-  void execREAD_NODESCONF(Signal* signal);
-  void execREAD_NODESREF(Signal* signal);
-  void execNODE_FAILREP(Signal* signal);
-  void execINCL_NODEREQ(Signal* signal);
   // Debugging
   void execDUMP_STATE_ORD(Signal* signal);