Bug#32130078 Bug#30647187 FIXES AUTOTEST EVENT DROP FAILURES

VarunNagaraju · VarunNagaraju · commit 20608049ebee · 2021-05-28T00:04:33.000+05:30
Removes the debug asserts added to investigate the mentioned bugs
in upgrade/downgrade tests.

The upgrade/downgrade tests create and drop events between data node
restarts. Since, these event create and drop do not use schema
transactions, data node failures are handled with request retries
which can result in operations being attempted more than once, and
failing on the second (and reported) attempt. So, until
WL#4101 is implemented, the failure during event handling in
testUpgrade.cpp is ignored.

Change-Id: I827f2c2a6b06b05153bfb1a7b36112c7b394084d
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -18898,12 +18898,6 @@ 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 {
diff --git a/storage/ndb/test/ndbapi/testUpgrade.cpp b/storage/ndb/test/ndbapi/testUpgrade.cpp
@@ -366,14 +366,12 @@ 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;
@@ -658,8 +656,8 @@ int runUpgrade_NR1(NDBT_Context* ctx, NDBT_Step* step){
       if (restarter.waitNodesStarted(&nodeId, 1))
         return NDBT_FAILED;
       
-      if (createDropEvent(ctx, step))
-        return NDBT_FAILED;
+      // Return value is ignored until WL#4101 is implemented.
+      createDropEvent(ctx, step);
     }
   }
   
@@ -799,9 +797,10 @@ runUpgrade_Half(NDBT_Context* ctx, NDBT_Step* step)
 
     CHK_NDB_READY(GETNDB(step));
 
-    if (event && createDropEvent(ctx, step))
+    if (event)
     {
-      return NDBT_FAILED;
+      // Return value is ignored until WL#4101 is implemented.
+      createDropEvent(ctx, step);
     }
 
     ndbout << "Half started" << endl;
@@ -856,9 +855,10 @@ runUpgrade_Half(NDBT_Context* ctx, NDBT_Step* step)
 
     CHK_NDB_READY(GETNDB(step));
 
-    if (event && createDropEvent(ctx, step))
+    if (event)
     {
-      return NDBT_FAILED;
+      // Return value is ignored until WL#4101 is implemented.
+      createDropEvent(ctx, step);
     }
   }
 
@@ -1172,10 +1172,8 @@ runBasic(NDBT_Context* ctx, NDBT_Step* step)
         trans.clearTable(pNdb, records/2);
         break;
       case 3:
-        if (createDropEvent(ctx, step, false))
-        {
-          return NDBT_FAILED;
-        }
+        // Return value is ignored until WL#4101 is implemented.
+        createDropEvent(ctx, step, false);
         break;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -366,14 +366,12 @@ createDropEvent(NDBT_Context* ctx, NDBT_Step* step, bool wait = true)`
`366`	`366`	`{`
`367`	`367`	`continue;`
`368`	`368`	`}`
`369`		`- ndbout << "step " << step->getStepNo() << endl;`
`370`		`- ndbout << "Creating event for table: " << tab->getName() << endl;`
	`369`	`+`
`371`	`370`	`if ((res = createEvent(pNdb, *tab) != NDBT_OK))`
`372`	`371`	`{`
`373`	`372`	`goto done;`
`374`	`373`	`}`
`375`		`- ndbout << "step " << step->getStepNo() << endl;`
`376`		`- ndbout << "Dropping event for table: " << tab->getName() << endl;`
	`374`	`+`
`377`	`375`	`if ((res = dropEvent(pNdb, *tab)) != NDBT_OK)`
`378`	`376`	`{`
`379`	`377`	`goto done;`
`@@ -658,8 +656,8 @@ int runUpgrade_NR1(NDBT_Context* ctx, NDBT_Step* step){`
`658`	`656`	`if (restarter.waitNodesStarted(&nodeId, 1))`
`659`	`657`	`return NDBT_FAILED;`
`660`	`658`
`661`		`- if (createDropEvent(ctx, step))`
`662`		`- return NDBT_FAILED;`
	`659`	`+ // Return value is ignored until WL#4101 is implemented.`
	`660`	`+ createDropEvent(ctx, step);`
`663`	`661`	`}`
`664`	`662`	`}`
`665`	`663`
`@@ -799,9 +797,10 @@ runUpgrade_Half(NDBT_Context* ctx, NDBT_Step* step)`
`799`	`797`
`800`	`798`	`CHK_NDB_READY(GETNDB(step));`
`801`	`799`
`802`		`- if (event && createDropEvent(ctx, step))`
	`800`	`+ if (event)`
`803`	`801`	`{`
`804`		`- return NDBT_FAILED;`
	`802`	`+ // Return value is ignored until WL#4101 is implemented.`
	`803`	`+ createDropEvent(ctx, step);`
`805`	`804`	`}`
`806`	`805`
`807`	`806`	`ndbout << "Half started" << endl;`
`@@ -856,9 +855,10 @@ runUpgrade_Half(NDBT_Context* ctx, NDBT_Step* step)`
`856`	`855`
`857`	`856`	`CHK_NDB_READY(GETNDB(step));`
`858`	`857`
`859`		`- if (event && createDropEvent(ctx, step))`
	`858`	`+ if (event)`
`860`	`859`	`{`
`861`		`- return NDBT_FAILED;`
	`860`	`+ // Return value is ignored until WL#4101 is implemented.`
	`861`	`+ createDropEvent(ctx, step);`
`862`	`862`	`}`
`863`	`863`	`}`
`864`	`864`
`@@ -1172,10 +1172,8 @@ runBasic(NDBT_Context* ctx, NDBT_Step* step)`
`1172`	`1172`	`trans.clearTable(pNdb, records/2);`
`1173`	`1173`	`break;`
`1174`	`1174`	`case 3:`
`1175`		`- if (createDropEvent(ctx, step, false))`
`1176`		`- {`
`1177`		`- return NDBT_FAILED;`
`1178`		`- }`
	`1175`	`+ // Return value is ignored until WL#4101 is implemented.`
	`1176`	`+ createDropEvent(ctx, step, false);`
`1179`	`1177`	`break;`
`1180`	`1178`	`}`
`1181`	`1179`	`}`