Skip to content

Commit af2f49f

Browse files
author
Ole John Aske
committed
Fix failing ATRT testcases:
- testNodeRestart -n TestLCPFSErr - testNodeRestart -n LCPScanFragWatchdogIsolation Both tescases assumed that 'victim' node killed by testcase would auto-restart after being killed. However, as the testcase didn't specify CmvmiSetRestartOnErrorInsert behaviour, it depended on the previous restart behaviour setting whether the node started, or stayed in 'no start' state.
1 parent 81baf33 commit af2f49f

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

storage/ndb/test/ndbapi/testNodeRestart.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5649,6 +5649,14 @@ runTestScanFragWatchdog(NDBT_Context* ctx, NDBT_Step* step)
56495649
otherNode = restarter.getNode(NdbRestarter::NS_RANDOM);
56505650
} while (otherNode == victim);
56515651

5652+
// Setting 'RestartOnErrorInsert = 2' will auto restart 'victim'
5653+
int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 2};
5654+
if (restarter.dumpStateOneNode(victim, val2, 2) != 0)
5655+
{
5656+
g_err << "Failed setting dump state 'RestartOnErrorInsert'" << endl;
5657+
break;
5658+
}
5659+
56525660
if (restarter.insertErrorInNode(victim, 10039) != 0) /* Cause LCP/backup frag scan to halt */
56535661
{
56545662
g_err << "Error insert failed." << endl;
@@ -5998,6 +6006,14 @@ runTestLcpFsErr(NDBT_Context* ctx, NDBT_Step* step)
59986006
otherNode = restarter.getNode(NdbRestarter::NS_RANDOM);
59996007
} while (otherNode == victim);
60006008

6009+
// Setting 'RestartOnErrorInsert = 2' will auto restart 'victim'
6010+
int val2[] = { DumpStateOrd::CmvmiSetRestartOnErrorInsert, 2};
6011+
if (restarter.dumpStateOneNode(victim, val2, 2) != 0)
6012+
{
6013+
g_err << "Failed setting dump state 'RestartOnErrorInsert'" << endl;
6014+
break;
6015+
}
6016+
60016017
bool failed = false;
60026018
Uint32 lcpsRequired = 2;
60036019
switch (scenario)

0 commit comments

Comments
 (0)