Bug#37030426 AT: testNodeRestart -n Bug58453 T1 fails in .4node4rpl

due to error insert leftover

Patch for 7.6 only.

Test fail in 4node4rpl setup only.
Test checks that, during TC takeover, surviving nodes are not affected
by any transactions being commit/complete in parallel with the handling
of LQH_TRANSREQ/CONF signals send/received by the node that is taking
over.

Problem:
1 - In a single node group setup (e.g 4node4rpl), if there is a node
fail handling in progress there will be no transactions being
commit/complete in parallel with the takeover, so conditions to run
the test are not met.

2 - If number of replicas is < 2 there will be no nodes in same node
group as taking over node to send LQH_TRANSREQ to 'new' TC node.

Solution:
1 - Skip test when number of node groups is < 2.
2 - Skip test when number of replicas is < 2.

Change-Id: Ia091f7c24fec16560b3adff6f13ed8b148566ead

Author: vinc13e

storage/ndb/test/include/NdbRestarter.hpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2023, 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,
@@ -122,6 +122,7 @@ class NdbRestarter {
   int getNextMasterNodeId(int nodeId);
   int getNodeGroup(int nodeId);
   int getNodeGroups(Vector<int>& node_groups, int * max_alive_replicas_ptr = NULL);
+  int getNumNodeGroups();
   int getNumReplicas();
   int getRandomNodeSameNodeGroup(int nodeId, int randomNumber);
   int getRandomNodeOtherNodeGroup(int nodeId, int randomNumber);

storage/ndb/test/ndbapi/testNodeRestart.cpp

@@ -5311,10 +5311,13 @@ int
 runBug58453(NDBT_Context* ctx, NDBT_Step* step)
 {
   NdbRestarter res;
-  if (res.getNumDbNodes() < 4)
-  {
-    g_err << "[SKIPPED] Test skipped. Requires at least 4 nodes" << endl;
-    return NDBT_OK;
+  if (res.getNumReplicas() < 2) {
+    g_err << "[SKIPPED] Test skipped. Requires at least 2 Replicas" << endl;
+    return NDBT_SKIPPED;
+  }
+  if (res.getNumNodeGroups() < 2) {
+    g_err << "[SKIPPED] Test skipped. Requires at least 2 Node Groups" << endl;
+    return NDBT_SKIPPED;
   }
 
   Ndb* pNdb = GETNDB(step);

storage/ndb/test/src/NdbRestarter.cpp

@@ -259,6 +259,11 @@ NdbRestarter::getNodeGroups(Vector<int>& node_groups, int * max_alive_replicas_p
   return 0;
 }
 
+int NdbRestarter::getNumNodeGroups() {
+  Vector<int> node_group_list;
+  return getNodeGroups(node_group_list);
+}
+
 int NdbRestarter::getNumReplicas()
 {
   Vector<int> node_group_list;