Bug#36082229 [1/2] Check there are no active error inserts

 set after NDBAPI test run

Error insertion improvements

- Have each block log when an error insertion is set
  - Indicates previous and new value
  - Gives visual indication of when error insert is
    set in log
  - Info for debugging problems

- Add new ERROR 1 code which can be used to check that
  Error inserts are cleared, e.g. at the end of a test

- Improve setting + clearing of error insert and extra
  value together.

Change-Id: I18ee88a9a02cec7349a39a85aaec6d03f8df4002

Author: frazerclement

storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

@@ -205,7 +205,9 @@ Cmvmi::~Cmvmi()
 void Cmvmi::execNDB_TAMPER(Signal* signal) 
 {
   jamEntry();
-  SET_ERROR_INSERT_VALUE(signal->theData[0]);
+
+  SimulatedBlock::execNDB_TAMPER(signal);
+
   if(ERROR_INSERTED(9999)){
     CRASH_INSERTION(9999);
   }
@@ -1187,14 +1189,15 @@ void Cmvmi::execTAMPER_ORD(Signal* signal)
   TamperOrd* const tamperOrd = (TamperOrd*)&signal->theData[0];
   Uint32 errNo = tamperOrd->errorNo;
 
-  if (errNo == 0)
+  if (errNo <= 1)
   {
     jam();
-    signal->theData[0] = 0;
+    signal->theData[0] = errNo;
     for (Uint32 i = 0; blocks[i] != 0; i++)
     {
       sendSignal(blocks[i], GSN_NDB_TAMPER, signal, 1, JBB);
     }
+    sendSignal(CMVMI_REF, GSN_NDB_TAMPER, signal, 1, JBB);
     return;
   }
 

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

@@ -27396,16 +27396,7 @@ Dbdih::execNDB_TAMPER(Signal* signal)
     calculateKeepGciLab(signal, 0, 0);
     return;
   }//if
-  if (signal->getLength() == 1)
-  {
-    SET_ERROR_INSERT_VALUE2(signal->theData[0],
-                            0);
-  }
-  else
-  {
-    SET_ERROR_INSERT_VALUE2(signal->theData[0],
-                            signal->theData[1]);
-  }
+  SimulatedBlock::execNDB_TAMPER(signal);
   return;
 }//Dbdih::execNDB_TAMPER()
 

storage/ndb/src/kernel/blocks/trpman.cpp

@@ -513,15 +513,8 @@ void
 Trpman::execNDB_TAMPER(Signal* signal)
 {
   jamEntry();
+  SimulatedBlock::execNDB_TAMPER(signal);
 #ifdef ERROR_INSERT
-  if (signal->getLength() == 1)
-  {
-    SET_ERROR_INSERT_VALUE(signal->theData[0]);
-  }
-  else
-  {
-    SET_ERROR_INSERT_VALUE2(signal->theData[0], signal->theData[1]);
-  }
 
   if (signal->theData[0] == 9003)
   {

storage/ndb/src/kernel/vm/SimulatedBlock.cpp

@@ -2196,16 +2196,32 @@ SimulatedBlock::execCHANGE_NODE_STATE_REQ(Signal* signal){
 	     ChangeNodeStateConf::SignalLength, JBB);
 }
 
-void
-SimulatedBlock::execNDB_TAMPER(Signal * signal){
-  if (signal->getLength() == 1)
-  {
+void SimulatedBlock::execNDB_TAMPER(Signal *signal) {
+#ifdef ERROR_INSERT
+  g_eventLogger->info("NDB_TAMPER : block %s/%u error %u %u -> %u %u",
+                      getBlockName(refToMain(reference()), "Unknown"),
+                      instance(), ERROR_INSERT_VALUE, ERROR_INSERT_EXTRA,
+                      signal->theData[0],
+                      signal->getLength() > 1 ? signal->theData[1] : 0);
+  if (signal->theData[0] == 1) {
+    /* Check that error insert cleared everywhere */
+    if (ERROR_INSERT_VALUE != 0 || ERROR_INSERT_EXTRA != 0) {
+      g_eventLogger->info("NDB_TAMPER : ERROR_INSERT not cleared %u %u\n",
+                          ERROR_INSERT_VALUE, ERROR_INSERT_EXTRA);
+      jam();
+      ndbrequire(false);
+    }
+    return;
+  }
+
+  if (signal->getLength() == 1) {
     SET_ERROR_INSERT_VALUE(signal->theData[0]);
   }
   else
   {
     SET_ERROR_INSERT_VALUE2(signal->theData[0], signal->theData[1]);
   }
+#endif
 }
 
 void

storage/ndb/src/kernel/vm/pc.hpp

@@ -187,9 +187,21 @@
 #define ERROR_INSERTED_CLEAR(x) (cerrorInsert == (x) ? (cerrorInsert = 0, true) : false)
 #define ERROR_INSERT_VALUE cerrorInsert
 #define ERROR_INSERT_EXTRA c_error_insert_extra
-#define SET_ERROR_INSERT_VALUE(x) cerrorInsert = x
-#define SET_ERROR_INSERT_VALUE2(x,y) cerrorInsert = x; c_error_insert_extra = y
-#define CLEAR_ERROR_INSERT_VALUE cerrorInsert = 0
+#define ERROR_INSERT_VALUE cerrorInsert
+#define ERROR_INSERT_EXTRA c_error_insert_extra
+#define SET_ERROR_INSERT_VALUE(x) \
+  do {                            \
+    cerrorInsert = x;             \
+    c_error_insert_extra = 0;     \
+  } while (0)
+#define SET_ERROR_INSERT_VALUE2(x, y) \
+  cerrorInsert = x;                   \
+  c_error_insert_extra = y
+#define CLEAR_ERROR_INSERT_VALUE \
+  do {                           \
+    cerrorInsert = 0;            \
+    c_error_insert_extra = 0;    \
+  } while (0)
 #define CLEAR_ERROR_INSERT_EXTRA c_error_insert_extra = 0
 #else
 #define ERROR_INSERT_VARIABLE typedef void * cerrorInsert // Will generate compiler error if used