3036 Jonas Oreland 2009-09-08
ndb - bug#47171 - tentative patch for autotest
modified:
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
3035 Frazer Clement 2009-09-07 [merge]
Merge 6.2->6.3
modified:
storage/ndb/test/ndbapi/testNdbApi.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2009-05-27 12:11:46 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp 2009-09-08 10:23:38 +0000
@@ -1421,8 +1421,10 @@ public:
CLOSING_EXEC_LOG = 18,
OPEN_INIT = 19,
OPEN = 20, ///< Log file open
- OPEN_SR_INVALIDATE_PAGES = 21,
- CLOSE_SR_INVALIDATE_PAGES = 22
+ OPEN_SR_READ_INVALIDATE_PAGES = 21,
+ CLOSE_SR_READ_INVALIDATE_PAGES = 22,
+ OPEN_SR_WRITE_INVALIDATE_PAGES = 23,
+ CLOSE_SR_WRITE_INVALIDATE_PAGES = 24
};
/**
@@ -2382,7 +2384,9 @@ private:
void errorReport(Signal* signal, int place);
void warningReport(Signal* signal, int place);
void invalidateLogAfterLastGCI(Signal *signal);
- void readFileInInvalidate(Signal *signal, bool stepNext);
+ Uint32 nextLogFilePtr(Uint32 logFilePtrI);
+ void readFileInInvalidate(Signal *signal, int stepNext);
+ void writeFileInInvalidate(Signal *signal, int stepPrev);
void exitFromInvalidate(Signal* signal);
Uint32 calcPageCheckSum(LogPageRecordPtr logP);
Uint32 handleLongTupKey(Signal* signal, Uint32* dataPtr, Uint32 len);
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2009-05-27 12:11:46 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2009-09-08 10:23:38 +0000
@@ -12818,15 +12818,26 @@ void Dblqh::execFSCLOSECONF(Signal* sign
jamEntry();
logFilePtr.i = signal->theData[0];
ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
+ logFilePtr.p->fileRef = RNIL;
switch (logFilePtr.p->logFileStatus) {
- case LogFileRecord::CLOSE_SR_INVALIDATE_PAGES:
+ case LogFileRecord::CLOSE_SR_READ_INVALIDATE_PAGES:
jam();
logFilePtr.p->logFileStatus = LogFileRecord::CLOSED;
logPartPtr.i = logFilePtr.p->logPartRec;
ptrCheckGuard(logPartPtr, clogPartFileSize, logPartRecord);
- exitFromInvalidate(signal);
+ readFileInInvalidate(signal, 2);
+ return;
+
+ case LogFileRecord::CLOSE_SR_WRITE_INVALIDATE_PAGES:
+ jam();
+ logFilePtr.p->logFileStatus = LogFileRecord::CLOSED;
+
+ logPartPtr.i = logFilePtr.p->logPartRec;
+ ptrCheckGuard(logPartPtr, clogPartFileSize, logPartRecord);
+
+ writeFileInInvalidate(signal, 1);
return;
case LogFileRecord::CLOSING_INIT:
jam();
@@ -12868,10 +12879,15 @@ void Dblqh::execFSOPENCONF(Signal* signa
jamEntry();
initFsopenconf(signal);
switch (logFilePtr.p->logFileStatus) {
- case LogFileRecord::OPEN_SR_INVALIDATE_PAGES:
+ case LogFileRecord::OPEN_SR_READ_INVALIDATE_PAGES:
jam();
logFilePtr.p->logFileStatus = LogFileRecord::OPEN;
- readFileInInvalidate(signal, false);
+ readFileInInvalidate(signal, 0);
+ return;
+ case LogFileRecord::OPEN_SR_WRITE_INVALIDATE_PAGES:
+ jam();
+ logFilePtr.p->logFileStatus = LogFileRecord::OPEN;
+ writeFileInInvalidate(signal, 0);
return;
case LogFileRecord::OPENING_INIT:
jam();
@@ -14312,11 +14328,15 @@ void Dblqh::writeSinglePage(Signal* sign
signal->theData[7] = pageNo;
sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal, 8, JBA);
+ ndbrequire(logFilePtr.p->fileRef != RNIL);
+
if (DEBUG_REDO)
+ {
ndbout_c("writeSingle 1 page at part: %u file: %u pos: %u",
logPartPtr.i,
logFilePtr.p->fileNo,
pageNo);
+ }
}//Dblqh::writeSinglePage()
/* ##########################################################################
@@ -15872,11 +15892,13 @@ void Dblqh::execSr(Signal* signal)
jam();
logWord = readLogword(signal);
if (DEBUG_REDO)
+ {
ndbout_c("found gci: %u part: %u file: %u page: %u",
logWord,
logPartPtr.i,
logFilePtr.p->fileNo,
logFilePtr.p->currentFilepage);
+ }
if (logWord == logPartPtr.p->logLastGci) {
jam();
/*---------------------------------------------------------------------------*/
@@ -15895,8 +15917,10 @@ void Dblqh::execSr(Signal* signal)
logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX];
logPartPtr.p->logLap = logPagePtr.p->logPageWord[ZPOS_LOG_LAP];
if (DEBUG_REDO)
+ {
ndbout_c("execSr part: %u logLap: %u",
logPartPtr.i, logPartPtr.p->logLap);
+ }
}//if
/*---------------------------------------------------------------------------*/
/* THERE IS NO NEED OF EXECUTING PAST THIS LINE SINCE THERE WILL ONLY BE LOG */
@@ -16047,8 +16071,17 @@ void Dblqh::execLogRecord(Signal* signal
// consistent. This function is executed last in start phase 3.
// RT 450. EDTJAMO.
//----------------------------------------------------------------------------
-void Dblqh::invalidateLogAfterLastGCI(Signal* signal) {
-
+Uint32
+Dblqh::nextLogFilePtr(Uint32 logFilePtrI)
+{
+ LogFileRecordPtr tmp;
+ tmp.i = logFilePtrI;
+ ptrCheckGuard(tmp, clogFileFileSize, logFileRecord);
+ return tmp.p->nextLogFile;
+}
+
+void Dblqh::invalidateLogAfterLastGCI(Signal* signal)
+{
jam();
if (logPartPtr.p->logExecState != LogPartRecord::LES_EXEC_LOG_INVALIDATE) {
jam();
@@ -16070,13 +16103,13 @@ void Dblqh::invalidateLogAfterLastGCI(Si
// restart.
if (logPagePtr.p->logPageWord[ZPOS_LOG_LAP] == logPartPtr.p->logLap)
{
+ jam();
// This page must be invalidated.
// We search for end
// read next
releaseLfo(signal);
releaseLogpage(signal);
- readFileInInvalidate(signal, true);
- lfoPtr.p->lfoState = LogFileOperationRecord::READ_SR_INVALIDATE_PAGES;
+ readFileInInvalidate(signal, 1);
return;
}
@@ -16101,145 +16134,226 @@ void Dblqh::invalidateLogAfterLastGCI(Si
if (logFilePtr.p->fileNo == 0)
{
- /**
- * We're wrapping in the log...
- * update logLap
- */
- logPartPtr.p->logLap--;
+ jam();
+ /**
+ * We're wrapping in the log...
+ * update logLap
+ */
+ logPartPtr.p->logLap--;
ndbrequire(logPartPtr.p->logLap); // Should always be > 0
- if (DEBUG_REDO)
+ if (1 || DEBUG_REDO)
+ {
ndbout_c("invalidateLogAfterLastGCI part: %u wrap from file 0 -> logLap: %u",
logPartPtr.i, logPartPtr.p->logLap);
+ }
}
- /**
- * Move to prev file
- */
- logFilePtr.i = logFilePtr.p->prevLogFile;
- ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
- logPartPtr.p->invalidateFileNo = logFilePtr.p->fileNo;
- logPartPtr.p->invalidatePageNo = clogFileSize * ZPAGES_IN_MBYTE - 1;
- }
-
- if (logPartPtr.p->invalidateFileNo == logPartPtr.p->headFileNo &&
- logPartPtr.p->invalidatePageNo == logPartPtr.p->headPageNo)
- {
- /**
- * Done...
- */
- logFilePtr.i = logPartPtr.p->currentLogfile;
- ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
-
- logFilePtr.i = logFilePtr.p->nextLogFile;
- ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
-
- // Close files if necessary. Current file and the next file should be
- // left open.
- exitFromInvalidate(signal);
+ if (logFilePtr.p->fileNo != 0 &&
+ logFilePtr.i != logPartPtr.p->currentLogfile &&
+ logFilePtr.i != nextLogFilePtr(logPartPtr.p->currentLogfile))
+ {
+ jam();
+ if (1 || DEBUG_REDO)
+ {
+ ndbout_c("invalidate part: %u close %u(%u) (write) (%u)",
+ logPartPtr.i,
+ logFilePtr.p->fileNo,
+ logFilePtr.i,
+ logPartPtr.p->currentLogfile);
+ }
+ logFilePtr.p->logFileStatus =
+ LogFileRecord::CLOSE_SR_WRITE_INVALIDATE_PAGES;
+ closeFile(signal, logFilePtr, __LINE__);
+ return;
+ }
+ writeFileInInvalidate(signal, 1); // step prev
return;
}
+ writeFileInInvalidate(signal, 0);
+ return;
+ default:
+ jamLine(lfoPtr.p->lfoState);
+ ndbrequire(false);
+ }
+}
- seizeLogpage(signal);
+void
+Dblqh::writeFileInInvalidate(Signal* signal, int stepPrev)
+{
+ /**
+ * Move to prev file
+ */
+ if (stepPrev == 1)
+ {
+ jam();
+ logFilePtr.i = logFilePtr.p->prevLogFile;
+ ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
+ logPartPtr.p->invalidateFileNo = logFilePtr.p->fileNo;
+ logPartPtr.p->invalidatePageNo = clogFileSize * ZPAGES_IN_MBYTE - 1;
+ }
+ if (logPartPtr.p->invalidateFileNo == logPartPtr.p->headFileNo &&
+ logPartPtr.p->invalidatePageNo == logPartPtr.p->headPageNo)
+ {
+ jam();
/**
- * Make page really empty
+ * Done...
*/
- bzero(logPagePtr.p, sizeof(LogPageRecord));
- writeSinglePage(signal, logPartPtr.p->invalidatePageNo,
- ZPAGE_SIZE - 1, __LINE__);
+ logFilePtr.i = logPartPtr.p->currentLogfile;
+ ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
- lfoPtr.p->lfoState = LogFileOperationRecord::WRITE_SR_INVALIDATE_PAGES;
+ logFilePtr.i = logFilePtr.p->nextLogFile;
+ ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
+
+ exitFromInvalidate(signal);
return;
- default:
+ }
+
+ if (stepPrev == 1 && logFilePtr.p->logFileStatus != LogFileRecord::OPEN)
+ {
jam();
- systemError(signal, __LINE__);
+ if (1 || DEBUG_REDO)
+ {
+ ndbout_c("invalidate part: %u open for write %u",
+ logPartPtr.i, logFilePtr.p->fileNo);
+ }
+ logFilePtr.p->logFileStatus =LogFileRecord::OPEN_SR_WRITE_INVALIDATE_PAGES;
+ openFileRw(signal, logFilePtr);
return;
- break;
}
+
+ seizeLogpage(signal);
+
+ /**
+ * Make page really empty
+ */
+ bzero(logPagePtr.p, sizeof(LogPageRecord));
+ writeSinglePage(signal, logPartPtr.p->invalidatePageNo,
+ ZPAGE_SIZE - 1, __LINE__);
+
+ lfoPtr.p->lfoState = LogFileOperationRecord::WRITE_SR_INVALIDATE_PAGES;
+ return;
}//Dblqh::invalidateLogAfterLastGCI
-void Dblqh::readFileInInvalidate(Signal* signal, bool stepNext)
+void Dblqh::readFileInInvalidate(Signal* signal, int stepNext)
{
jam();
- if (stepNext)
+ if (stepNext == 1)
{
logPartPtr.p->invalidatePageNo++;
- if (logPartPtr.p->invalidatePageNo == (clogFileSize * ZPAGES_IN_MBYTE))
+ if (logPartPtr.p->invalidatePageNo == (clogFileSize * ZPAGES_IN_MBYTE))
{
- // We continue in the next file.
- logFilePtr.i = logFilePtr.p->nextLogFile;
- ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
- logPartPtr.p->invalidateFileNo = logFilePtr.p->fileNo;
- // Page 0 is used for file descriptors.
- logPartPtr.p->invalidatePageNo = 1;
-
- if (logFilePtr.p->fileNo == 0)
+ if (logFilePtr.p->fileNo != 0 &&
+ logFilePtr.i != logPartPtr.p->currentLogfile &&
+ logFilePtr.i != nextLogFilePtr(logPartPtr.p->currentLogfile))
{
- /**
- * We're wrapping in the log...
- * update logLap
- */
- logPartPtr.p->logLap++;
- if (DEBUG_REDO)
- ndbout_c("readFileInInvalidate part: %u wrap to file 0 -> logLap: %u",
- logPartPtr.i, logPartPtr.p->logLap);
+ jam();
+ if (1 || DEBUG_REDO)
+ {
+ ndbout_c("invalidate part: %u close %u(%u) (read) (%u)",
+ logPartPtr.i,
+ logFilePtr.p->fileNo,
+ logFilePtr.i,
+ logPartPtr.p->currentLogfile);
+ }
+ logFilePtr.p->logFileStatus =
+ LogFileRecord::CLOSE_SR_READ_INVALIDATE_PAGES;
+ closeFile(signal, logFilePtr, __LINE__);
+ return;
}
- if (logFilePtr.p->logFileStatus != LogFileRecord::OPEN)
+ else
{
- jam();
- logFilePtr.p->logFileStatus = LogFileRecord::OPEN_SR_INVALIDATE_PAGES;
- openFileRw(signal, logFilePtr);
- return;
+ jam();
+ stepNext = 2; // After close
}
}
}
+ if (stepNext == 2)
+ {
+ jam();
+ // We continue in the next file.
+ logFilePtr.i = logFilePtr.p->nextLogFile;
+ ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
+ logPartPtr.p->invalidateFileNo = logFilePtr.p->fileNo;
+ // Page 0 is used for file descriptors.
+ logPartPtr.p->invalidatePageNo = 1;
+
+ if (logFilePtr.p->fileNo == 0)
+ {
+ /**
+ * We're wrapping in the log...
+ * update logLap
+ */
+ logPartPtr.p->logLap++;
+ if (1 || DEBUG_REDO)
+ {
+ ndbout_c("readFileInInvalidate part: %u wrap to file 0 -> logLap: %u",
+ logPartPtr.i, logPartPtr.p->logLap);
+ }
+ }
+
+ if (logFilePtr.p->logFileStatus != LogFileRecord::OPEN)
+ {
+ jam();
+ if (1 || DEBUG_REDO)
+ {
+ ndbout_c("invalidate part: %u open for read %u",
+ logPartPtr.i, logFilePtr.p->fileNo);
+ }
+ logFilePtr.p->logFileStatus =LogFileRecord::OPEN_SR_READ_INVALIDATE_PAGES;
+ openFileRw(signal, logFilePtr);
+ return;
+ }
+ }
+
// Contact NDBFS. Real time break.
readSinglePage(signal, logPartPtr.p->invalidatePageNo);
lfoPtr.p->lfoState = LogFileOperationRecord::READ_SR_INVALIDATE_PAGES;
}
-void Dblqh::exitFromInvalidate(Signal* signal) {
+void Dblqh::exitFromInvalidate(Signal* signal)
+{
jam();
-loop:
- logFilePtr.i = logFilePtr.p->nextLogFile;
- ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
-
- if (logFilePtr.i == logPartPtr.p->currentLogfile)
- {
- jam();
- goto done;
- }
-
- if (logFilePtr.p->fileNo == 0)
+ if (1 || DEBUG_REDO)
{
jam();
- /**
- * Logfile 0 shoult *not* be closed
- */
- goto loop;
- }
-
- if (logFilePtr.p->logFileStatus == LogFileRecord::CLOSED)
- {
- jam();
- goto done;
- }
+ printf("exitFromInvalidate part: %u head file: %u page: %u open: ",
+ logPartPtr.i,
+ logPartPtr.p->headFileNo,
+ logPartPtr.p->headPageNo);
- jam();
- ndbrequire(logFilePtr.p->logFileStatus == LogFileRecord::OPEN);
- logFilePtr.p->logFileStatus = LogFileRecord::CLOSE_SR_INVALIDATE_PAGES;
- closeFile(signal, logFilePtr, __LINE__);
- return;
+ LogFileRecordPtr tmp;
+ tmp.i = logPartPtr.p->currentLogfile;
+ do
+ {
+ jam();
+ ptrCheckGuard(tmp, clogFileFileSize, logFileRecord);
+ if (tmp.p->logFileStatus != LogFileRecord::LFS_IDLE &&
+ tmp.p->logFileStatus != LogFileRecord::CLOSED)
+ {
+ jam();
+ printf("%u ", tmp.p->fileNo);
+ }
+ tmp.i = tmp.p->nextLogFile;
+ } while (tmp.i != logPartPtr.p->currentLogfile && tmp.i != RNIL);
+ printf("\n");
-done:
- if (DEBUG_REDO)
- ndbout_c("exitFromInvalidate part: %u head file: %u page: %u",
- logPartPtr.i,
- logPartPtr.p->headFileNo,
- logPartPtr.p->headPageNo);
+ tmp.i = logPartPtr.p->currentLogfile;
+ ptrCheckGuard(tmp, clogFileFileSize, logFileRecord);
+
+ LogPosition head = { tmp.p->fileNo, tmp.p->currentMbyte };
+ LogPosition tail = { logPartPtr.p->logTailFileNo,
+ logPartPtr.p->logTailMbyte};
+ Uint64 mb = free_log(head, tail, logPartPtr.p->noLogFiles, clogFileSize);
+ Uint64 total = logPartPtr.p->noLogFiles * Uint64(clogFileSize);
+ ndbout_c("head: [ %u %u ] tail: [ %u %u ] free: %llu total: %llu",
+ head.m_file_no, head.m_mbyte,
+ tail.m_file_no, tail.m_mbyte,
+ mb, total);
+ }
logFilePtr.i = logPartPtr.p->firstLogfile;
ptrCheckGuard(logFilePtr, clogFileFileSize, logFileRecord);
@@ -16627,8 +16741,7 @@ void Dblqh::readSrFourthZeroLab(Signal*
logPartPtr.p->invalidatePageNo = logPartPtr.p->headPageNo;
logPartPtr.p->logExecState = LogPartRecord::LES_EXEC_LOG_INVALIDATE;
- readFileInInvalidate(signal, true);
- lfoPtr.p->lfoState = LogFileOperationRecord::READ_SR_INVALIDATE_PAGES;
+ readFileInInvalidate(signal, 1);
return;
}//Dblqh::readSrFourthZeroLab()
@@ -17143,12 +17256,16 @@ void Dblqh::completedLogPage(Signal* sig
signal->theData[5] = twlpNoPages;
sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal, 15, JBA);
+ ndbrequire(logFilePtr.p->fileRef != RNIL);
+
if (DEBUG_REDO)
+ {
ndbout_c("writing %d pages at part: %u file: %u pos: %u",
twlpNoPages,
logPartPtr.i,
logFilePtr.p->fileNo,
logFilePtr.p->filePosition);
+ }
if (twlpType == ZNORMAL) {
jam();
@@ -18310,11 +18427,13 @@ void Dblqh::readExecLog(Signal* signal)
sendSignal(NDBFS_REF, GSN_FSREADREQ, signal, 16, JBA);
if (DEBUG_REDO)
+ {
ndbout_c("readExecLog %u page at part: %u file: %u pos: %u",
lfoPtr.p->noPagesRw,
logPartPtr.i,
logFilePtr.p->fileNo,
logPartPtr.p->execSrStartPageNo);
+ }
}//Dblqh::readExecLog()
@@ -18380,12 +18499,13 @@ void Dblqh::readExecSr(Signal* signal)
sendSignal(NDBFS_REF, GSN_FSREADREQ, signal, 15, JBA);
if (DEBUG_REDO)
+ {
ndbout_c("readExecSr %u page at part: %u file: %u pos: %u",
8,
logPartPtr.i,
logFilePtr.p->fileNo,
tresPageid);
-
+ }
}//Dblqh::readExecSr()
/* ------------------------------------------------------------------------- */
@@ -18543,11 +18663,12 @@ void Dblqh::readSinglePage(Signal* signa
sendSignal(NDBFS_REF, GSN_FSREADREQ, signal, 8, JBA);
if (DEBUG_REDO)
+ {
ndbout_c("readSinglePage 1 page at part: %u file: %u pos: %u",
logPartPtr.i,
logFilePtr.p->fileNo,
pageNo);
-
+ }
}//Dblqh::readSinglePage()
/* --------------------------------------------------------------------------
@@ -19056,11 +19177,13 @@ void Dblqh::writeCompletedGciLog(Signal*
logFilePtr.p->remainingWordsInMbyte - ZCOMPLETED_GCI_LOG_SIZE;
if (DEBUG_REDO)
+ {
ndbout_c("writeCompletedGciLog gci: %u part: %u file: %u page: %u",
cnewestCompletedGci,
logPartPtr.i,
logFilePtr.p->fileNo,
logFilePtr.p->currentFilepage);
+ }
writeLogWord(signal, ZCOMPLETED_GCI_TYPE);
writeLogWord(signal, cnewestCompletedGci);
@@ -19099,12 +19222,15 @@ void Dblqh::writeDirty(Signal* signal, U
signal->theData[7] = logPartPtr.p->prevFilepage;
sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal, 8, JBA);
+ ndbrequire(logFilePtr.p->fileRef != RNIL);
+
if (DEBUG_REDO)
+ {
ndbout_c("writeDirty 1 page at part: %u file: %u pos: %u",
logPartPtr.i,
logFilePtr.p->fileNo,
logPartPtr.p->prevFilepage);
-
+ }
}//Dblqh::writeDirty()
/* --------------------------------------------------------------------------
Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20090908102338-ok1kw1xryhsn882c.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-telco-6.3 branch (jonas:3035 to 3036) Bug#47171 | Jonas Oreland | 8 Sep |
