WL#8069: Enabled some debug output, more printout before crash, a minor switch of two calls for clarity

Mikael Ronström · prashanttekriwal · commit 2e74bbacabdc · 2018-01-23T10:34:01.000+01:00
(cherry picked from commit 47231e2fbaeec301b024729ed581237eccfe38ad)
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
@@ -102,7 +102,7 @@ static NDB_TICKS startTime;
 #define DEB_LCP_DEL(arglist) do { } while (0)
 #endif
 
-//#define DEBUG_LCP_STAT 1
+#define DEBUG_LCP_STAT 1
 #ifdef DEBUG_LCP_STAT
 #define DEB_LCP_STAT(arglist) do { g_eventLogger->info arglist ; } while (0)
 #else
@@ -7284,11 +7284,26 @@ Backup::fragmentCompleted(Signal* signal,
      * the LCP scan in an orderly manner with no rows read. So we
      * should not crash in this case.
      */
-    ndbrequire(errCode != 0 ||
-               ptr.p->m_row_count == filePtr.p->m_lcp_inserts ||
-      ((ptr.p->m_num_parts_in_this_lcp != BackupFormat::NDB_MAX_LCP_PARTS) &&
-       (ptr.p->m_row_count >=
-        (filePtr.p->m_lcp_inserts + filePtr.p->m_lcp_writes))));
+    if (!(errCode != 0 ||
+          ptr.p->m_row_count == filePtr.p->m_lcp_inserts ||
+          ((ptr.p->m_num_parts_in_this_lcp !=
+            BackupFormat::NDB_MAX_LCP_PARTS) &&
+           (ptr.p->m_row_count >=
+            (filePtr.p->m_lcp_inserts + filePtr.p->m_lcp_writes)))))
+    {
+      g_eventLogger->info("errCode = %u, row_count = %llu, inserts: %llu"
+                          ", writes: %llu, parts: %u",
+                          errCode,
+                          ptr.p->m_row_count,
+                          filePtr.p->m_lcp_inserts,
+                          filePtr.p->m_lcp_writes,
+                          ptr.p->m_num_parts_in_this_lcp);
+      ndbrequire(errCode != 0 ||
+                 ptr.p->m_row_count == filePtr.p->m_lcp_inserts ||
+        ((ptr.p->m_num_parts_in_this_lcp != BackupFormat::NDB_MAX_LCP_PARTS) &&
+         (ptr.p->m_row_count >=
+          (filePtr.p->m_lcp_inserts + filePtr.p->m_lcp_writes))));
+    }
 
     ptr.p->slaveState.setState(STOPPING);
 
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
@@ -2198,9 +2198,8 @@ Dbtup::handle_lcp_keep(Signal* signal,
      * current page temporarily. This can be found in copytuple[0]
      * where handle_lcp_keep_commit puts it.
      */
-    remove_top_from_lcp_keep_list(fragPtr.p, copytuple, tmp);
-
     c_backup->change_current_page_temp(copytuple[0]);
+    remove_top_from_lcp_keep_list(fragPtr.p, copytuple, tmp);
     DEB_LCP_KEEP(("(%u)tab(%u,%u) page(%u,%u): Handle LCP keep insert entry",
                   instance(),
                   fragPtr.p->fragTableId,
