merge 7.3 -> 7.4

Author: Priyanka Sangam

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

@@ -6620,21 +6620,13 @@ void Dbdih::removeNodeFromTable(Signal* signal,
    */
   ndbrequire(tabPtr.p->tabLcpStatus == TabRecord::TLS_ACTIVE);
 
-  /**
-   * Save the table
-   * This can be skipped if the status is LCP_INIT_TABLES because
-   * no metadata updates have been done so far, therefore there
-   * are no changes which need to be reverted.
-   */
-  if(c_lcpState.lcpStatus != LCP_INIT_TABLES) 
-  {
-    tabPtr.p->tabCopyStatus = TabRecord::CS_REMOVE_NODE;
-    tabPtr.p->tabUpdateState = TabRecord::US_REMOVE_NODE;
-    tabPtr.p->tabRemoveNode = nodeId;
-    signal->theData[0] = DihContinueB::ZPACK_TABLE_INTO_PAGES;
-    signal->theData[1] = tabPtr.i;
-    sendSignal(reference(), GSN_CONTINUEB, signal, 2, JBB);
-  }
+  tabPtr.p->tabCopyStatus = TabRecord::CS_REMOVE_NODE;
+  tabPtr.p->tabUpdateState = TabRecord::US_REMOVE_NODE;
+  tabPtr.p->tabRemoveNode = nodeId;
+  signal->theData[0] = DihContinueB::ZPACK_TABLE_INTO_PAGES;
+  signal->theData[1] = tabPtr.i;
+  sendSignal(reference(), GSN_CONTINUEB, signal, 2, JBB);
+    
   if (noOfRemainingLcpReplicas == 0)
   {
     jam();

storage/ndb/test/ndbapi/testNodeRestart.cpp

@@ -6296,7 +6296,13 @@ runBug18044717(NDBT_Context* ctx, NDBT_Step* step)
   } while (0);
   ndbout_c("restore original state of cluster and verify that there");
   ndbout_c("is no core due to inconsistent c_lcpStatus/tabLcpStatus");
-  restarter.waitNodesStarted(&master, 1);
+
+  if (restarter.waitNodesStarted(&master, 1))
+  {
+    ndbout_c("master node failed to start");
+    return NDBT_FAILED;
+  }
+
   if (restarter.insertErrorInAllNodes(0))
   {
     result = NDBT_FAILED;