Skip to content

Commit 38dfc3e

Browse files
author
Maitrayi Sabaratnam
committed
Fixing testSystemRestart StaleNodeTakeoverDuringSR to ignore error
711 and increase the createTable wait timeout.
1 parent e0b7296 commit 38dfc3e

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

storage/ndb/test/ndbapi/testSystemRestart.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -2577,10 +2577,15 @@ runLoad(NDBT_Context* ctx, NDBT_Step* step)
25772577
int retries = 0;
25782578
while (!ctx->isTestStopped() && myDict->createTable(*copy)!= 0)
25792579
{
2580-
// 4009 Cluster Failure is acceptable since SR is in progress
2581-
CHK(myDict->getNdbError().code == 4009, myDict->getNdbError().message);
2580+
/* '4009 - Cluster Failure' is acceptable since SR is in progress.
2581+
* '711 - System busy with node restart, schema operations not allowed'
2582+
* is acceptable since the stale node performs an NR during SR.
2583+
*/
2584+
CHK((myDict->getNdbError().code == 4009 ||
2585+
myDict->getNdbError().code == 711),
2586+
myDict->getNdbError().message);
25822587
retries++;
2583-
CHK(retries < 60, "Creating table not finished within timeout"); // 1 min
2588+
CHK(retries < 180, "Creating table not finished within timeout"); // 3 min
25842589
NdbSleep_MilliSleep(1000);
25852590
}
25862591

0 commit comments

Comments
 (0)