diff options
| -rw-r--r-- | ndb/src/kernel/blocks/ERROR_codes.txt | 2 | ||||
| -rw-r--r-- | ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 2 | ||||
| -rw-r--r-- | ndb/test/ndbapi/testNodeRestart.cpp | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/ndb/src/kernel/blocks/ERROR_codes.txt b/ndb/src/kernel/blocks/ERROR_codes.txt index b4c5d1b1d7e..4887b6a7ea5 100644 --- a/ndb/src/kernel/blocks/ERROR_codes.txt +++ b/ndb/src/kernel/blocks/ERROR_codes.txt @@ -316,7 +316,7 @@ LQH: 5026 Crash when receiving COPY_ACTIVEREQ 5027 Crash when receiving STAT_RECREQ -5042 Crash starting node, when scan is finished on primary replica +5043 Crash starting node, when scan is finished on primary replica Test Crashes in handling take over ---------------------------------- diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp index 0aeeaccd55e..3540fc79dff 100644 --- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp @@ -9221,7 +9221,7 @@ void Dblqh::nextScanConfCopyLab(Signal* signal) /*---------------------------------------------------------------------------*/ scanptr.p->scanCompletedStatus = ZTRUE; scanptr.p->scanState = ScanRecord::WAIT_LQHKEY_COPY; - if (ERROR_INSERTED(5042)) + if (ERROR_INSERTED(5043)) { CLEAR_ERROR_INSERT_VALUE; tcConnectptr.p->copyCountWords = ~0; diff --git a/ndb/test/ndbapi/testNodeRestart.cpp b/ndb/test/ndbapi/testNodeRestart.cpp index cc2998ff73a..5a7510be9bd 100644 --- a/ndb/test/ndbapi/testNodeRestart.cpp +++ b/ndb/test/ndbapi/testNodeRestart.cpp @@ -439,6 +439,14 @@ int runBug15587(NDBT_Context* ctx, NDBT_Step* step){ if (restarter.startNodes(&nodeId, 1)) return NDBT_FAILED; + restarter.waitNodesStartPhase(&nodeId, 1, 3); + + if (restarter.waitNodesNoStart(&nodeId, 1)) + return NDBT_FAILED; + + if (restarter.startNodes(&nodeId, 1)) + return NDBT_FAILED; + if (restarter.waitNodesStarted(&nodeId, 1)) return NDBT_FAILED; |