From fde02a804367149ccd24718044ca3de82cc30de5 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Mar 2006 11:53:54 +0100 Subject: [PATCH 1/2] ndb - minor fixes in test programs ndb/src/kernel/blocks/ERROR_codes.txt: Fix conflicting error codes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fix conflicting error codes ndb/test/ndbapi/testNodeRestart.cpp: Fix test program --- ndb/src/kernel/blocks/ERROR_codes.txt | 2 +- ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 2 +- 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; From deb4d310909b8589368adf561a2663007dde5cbe Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Mar 2006 15:33:40 +0100 Subject: [PATCH 2/2] ndb - remove bug#18385 from autotest as it only works on 2 node clusters ndb/test/run-test/daily-basic-tests.txt: remove bug#18385 as it only works on 2 node clusters --- ndb/test/run-test/daily-basic-tests.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ndb/test/run-test/daily-basic-tests.txt b/ndb/test/run-test/daily-basic-tests.txt index b11e4479a57..ce5462d11c9 100644 --- a/ndb/test/run-test/daily-basic-tests.txt +++ b/ndb/test/run-test/daily-basic-tests.txt @@ -454,10 +454,10 @@ max-time: 500 cmd: testNodeRestart args: -n Bug16772 T1 -max-time: 500 -cmd: testSystemRestart -args: -n Bug18385 T1 - +#max-time: 500 +#cmd: testSystemRestart +#args: -n Bug18385 T1 +# max-time: 500 cmd: testNodeRestart args: -n Bug18414 T1