Bug#32130078 Bug#30647187 ADDS DEBUG STATEMENTS IN TESTUPGRADE, DBDICT

Adds test-only require statements in DbDict.cpp and debug statements
in testUpgrade.cpp to investigate Bug#32130078 and Bug#30647187.

Both the mentioned bugs happen very sporadically and couldn't be
reproduced after several manual attempts. Added code which will be
removed once issues are reproduced.

Change-Id: I51d3a0e533a5549138d1781bfa72b1604a047e0f

Author: VarunNagaraju

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2021, 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,
@@ -18898,6 +18898,12 @@ void Dbdict::dropEvent_sendReply(Signal* signal,
     ret->setErrorLine(evntRecPtr.p->m_errorLine);
     ret->setErrorNode(evntRecPtr.p->m_errorNode);
 
+    // Attempt to get the trace to investigate sporadic failures
+    #ifdef ERROR_INSERT
+      ndbrequire(evntRecPtr.p->m_errorCode != 4710); // Investigate Bug#32130078
+      ndbrequire(evntRecPtr.p->m_errorCode != 1418); // Investigate Bug#30647187
+    #endif
+
     sendSignal(senderRef, GSN_DROP_EVNT_REF, signal,
 	       DropEvntRef::SignalLength, JBB);
   } else {

storage/ndb/test/ndbapi/testUpgrade.cpp

@@ -366,13 +366,14 @@ createDropEvent(NDBT_Context* ctx, NDBT_Step* step, bool wait = true)
       {
         continue;
       }
+      ndbout << "step " << step->getStepNo() << endl;
+      ndbout << "Creating event for table: " << tab->getName() << endl;
       if ((res = createEvent(pNdb, *tab) != NDBT_OK))
       {
         goto done;
       }
-      
-      
-      
+      ndbout << "step " << step->getStepNo() << endl;
+      ndbout << "Dropping event for table: " << tab->getName() << endl;
       if ((res = dropEvent(pNdb, *tab)) != NDBT_OK)
       {
         goto done;