WL#8069: Post-push fix, improve testing for PLCP_3

Mikael Ronström · prashanttekriwal · commit 620e29f8f9d4 · 2018-01-23T10:34:09.000+01:00
(cherry picked from commit 9c05d933e599c6634f8f8db8ed2d8fab5559ea7b)
diff --git a/storage/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
@@ -5714,7 +5714,7 @@ Backup::start_lcp_scan(Signal *signal,
 
     if (ptr.p->m_lcp_max_page_cnt > 20)
     {
-      delay = 3000;
+      delay = 9000;
     }
   }
   sendScanFragReq(signal, ptr, filePtr, tabPtr, fragPtr, delay);
diff --git a/storage/ndb/test/ndbapi/testSystemRestart.cpp b/storage/ndb/test/ndbapi/testSystemRestart.cpp
@@ -903,7 +903,7 @@ int runSystemRestartLCP_3(NDBT_Context *ctx, NDBT_Step *step)
     Uint32 batch = 1;
     Uint32 row_step = 10;
 
-    for (Uint32 k = 0; k < 3; k++)
+    for (Uint32 k = 0; k < 6; k++)
     {
       /**
        * We start by deleting 90% of the rows with row_step set to 10.
@@ -944,7 +944,7 @@ int runSystemRestartLCP_3(NDBT_Context *ctx, NDBT_Step *step)
       g_err << "Insert the deleted records" << endl;
       for (Uint32 start = 1; start < 10; start++)
       {
-        CHECK(hugoTrans.loadTableStartFrom(pNdb,
+        CHECK((result = hugoTrans.loadTableStartFrom(pNdb,
                                            start,
                                            num_deleted_records,
                                            100,
@@ -954,7 +954,7 @@ int runSystemRestartLCP_3(NDBT_Context *ctx, NDBT_Step *step)
                                            0,
                                            false,
                                            true,
-                                           10) == NDBT_OK);
+                                           10)) == NDBT_OK);
         if (result == NDBT_FAILED)
           return result;
       }

Original file line number	Diff line number	Diff line change
`@@ -5714,7 +5714,7 @@ Backup::start_lcp_scan(Signal *signal,`
`5714`	`5714`
`5715`	`5715`	`if (ptr.p->m_lcp_max_page_cnt > 20)`
`5716`	`5716`	`{`
`5717`		`- delay = 3000;`
	`5717`	`+ delay = 9000;`
`5718`	`5718`	`}`
`5719`	`5719`	`}`
`5720`	`5720`	`sendScanFragReq(signal, ptr, filePtr, tabPtr, fragPtr, delay);`