Skip to content

M
mariadb
Commit ed1e0b08 authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com
Browse files
Options

Merge perch.ndb.mysql.com:/home/jonas/src/51-work 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
parents a13d114d 7e9b2ef9
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 158 deletions
storage/ndb/src/kernel/blocks/backup/Backup.cpp
View file @ ed1e0b08
...@@ -427,10 +427,9 @@ Backup::execDUMP_STATE_ORD(Signal* signal) ...@@ -427,10 +427,9 @@ Backup::execDUMP_STATE_ORD(Signal* signal)
for(ptr.p->files.first(filePtr); filePtr.i != RNIL; for(ptr.p->files.first(filePtr); filePtr.i != RNIL;
ptr.p->files.next(filePtr)){ ptr.p->files.next(filePtr)){
jam(); jam();
infoEvent(" file %d: type: %d open: %d running: %d done: %d scan: %d", infoEvent(" file %d: type: %d flags: H'%x",
filePtr.i, filePtr.p->fileType, filePtr.p->fileOpened, filePtr.i, filePtr.p->fileType,
filePtr.p->fileRunning, filePtr.p->m_flags);
filePtr.p->fileClosing, filePtr.p->scanRunning);
} }
} }
} }
...@@ -2368,13 +2367,40 @@ Backup::abort_scan(Signal * signal, BackupRecordPtr ptr) ...@@ -2368,13 +2367,40 @@ Backup::abort_scan(Signal * signal, BackupRecordPtr ptr)
void void
Backup::defineBackupRef(Signal* signal, BackupRecordPtr ptr, Uint32 errCode) Backup::defineBackupRef(Signal* signal, BackupRecordPtr ptr, Uint32 errCode)
{ {
jam();
ptr.p->setErrorCode(errCode);
if(ptr.p->is_lcp()) if(ptr.p->is_lcp())
{ {
jam(); jam();
BackupFilePtr filePtr;
ptr.p->files.getPtr(filePtr, ptr.p->ctlFilePtr);
if (filePtr.p->m_flags & BackupFile::BF_LCP_META)
{
jam();
ndbrequire(! (filePtr.p->m_flags & BackupFile::BF_FILE_THREAD));
ndbrequire(! (filePtr.p->m_flags & BackupFile::BF_CLOSING));
filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_LCP_META;
if (filePtr.p->m_flags & BackupFile::BF_OPEN)
{
filePtr.p->m_flags |= BackupFile::BF_CLOSING;
FsCloseReq * req = (FsCloseReq *)signal->getDataPtrSend();
req->filePointer = filePtr.p->filePointer;
req->userPointer = filePtr.i;
req->userReference = reference();
req->fileFlag = 0;
FsCloseReq::setRemoveFileFlag(req->fileFlag, 1);
sendSignal(NDBFS_REF, GSN_FSCLOSEREQ, signal,
FsCloseReq::SignalLength, JBA);
return;
}
}
ndbrequire(filePtr.p->m_flags == 0);
TablePtr tabPtr; TablePtr tabPtr;
FragmentPtr fragPtr; FragmentPtr fragPtr;
ptr.p->setErrorCode(errCode);
ndbrequire(ptr.p->tables.first(tabPtr)); ndbrequire(ptr.p->tables.first(tabPtr));
tabPtr.p->fragments.getPtr(fragPtr, 0); tabPtr.p->fragments.getPtr(fragPtr, 0);
...@@ -2390,7 +2416,6 @@ Backup::defineBackupRef(Signal* signal, BackupRecordPtr ptr, Uint32 errCode) ...@@ -2390,7 +2416,6 @@ Backup::defineBackupRef(Signal* signal, BackupRecordPtr ptr, Uint32 errCode)
} }
ptr.p->m_gsn = GSN_DEFINE_BACKUP_REF; ptr.p->m_gsn = GSN_DEFINE_BACKUP_REF;
ptr.p->setErrorCode(errCode);
ndbrequire(ptr.p->errorCode != 0); ndbrequire(ptr.p->errorCode != 0);
DefineBackupRef* ref = (DefineBackupRef*)signal->getDataPtrSend(); DefineBackupRef* ref = (DefineBackupRef*)signal->getDataPtrSend();
...@@ -2521,10 +2546,7 @@ Backup::execDEFINE_BACKUP_REQ(Signal* signal) ...@@ -2521,10 +2546,7 @@ Backup::execDEFINE_BACKUP_REQ(Signal* signal)
files[i].p->tableId = RNIL; files[i].p->tableId = RNIL;
files[i].p->backupPtr = ptr.i; files[i].p->backupPtr = ptr.i;
files[i].p->filePointer = RNIL; files[i].p->filePointer = RNIL;
files[i].p->fileClosing = 0; files[i].p->m_flags = 0;
files[i].p->fileOpened = 0;
files[i].p->fileRunning = 0;
files[i].p->scanRunning = 0;
files[i].p->errorCode = 0; files[i].p->errorCode = 0;
if(files[i].p->pages.seize(noOfPages[i]) == false) { if(files[i].p->pages.seize(noOfPages[i]) == false) {
...@@ -2686,8 +2708,7 @@ Backup::openFiles(Signal* signal, BackupRecordPtr ptr) ...@@ -2686,8 +2708,7 @@ Backup::openFiles(Signal* signal, BackupRecordPtr ptr)
* Ctl file * Ctl file
*/ */
c_backupFilePool.getPtr(filePtr, ptr.p->ctlFilePtr); c_backupFilePool.getPtr(filePtr, ptr.p->ctlFilePtr);
ndbrequire(filePtr.p->fileRunning == 0); filePtr.p->m_flags |= BackupFile::BF_OPENING;
filePtr.p->fileRunning = 1;
req->userPointer = filePtr.i; req->userPointer = filePtr.i;
FsOpenReq::setVersion(req->fileNumber, 2); FsOpenReq::setVersion(req->fileNumber, 2);
...@@ -2700,8 +2721,7 @@ Backup::openFiles(Signal* signal, BackupRecordPtr ptr) ...@@ -2700,8 +2721,7 @@ Backup::openFiles(Signal* signal, BackupRecordPtr ptr)
* Log file * Log file
*/ */
c_backupFilePool.getPtr(filePtr, ptr.p->logFilePtr); c_backupFilePool.getPtr(filePtr, ptr.p->logFilePtr);
ndbrequire(filePtr.p->fileRunning == 0); filePtr.p->m_flags |= BackupFile::BF_OPENING;
filePtr.p->fileRunning = 1;
req->userPointer = filePtr.i; req->userPointer = filePtr.i;
FsOpenReq::setVersion(req->fileNumber, 2); FsOpenReq::setVersion(req->fileNumber, 2);
...@@ -2714,8 +2734,7 @@ Backup::openFiles(Signal* signal, BackupRecordPtr ptr) ...@@ -2714,8 +2734,7 @@ Backup::openFiles(Signal* signal, BackupRecordPtr ptr)
* Data file * Data file
*/ */
c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr); c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
ndbrequire(filePtr.p->fileRunning == 0); filePtr.p->m_flags |= BackupFile::BF_OPENING;
filePtr.p->fileRunning = 1;
req->userPointer = filePtr.i; req->userPointer = filePtr.i;
FsOpenReq::setVersion(req->fileNumber, 2); FsOpenReq::setVersion(req->fileNumber, 2);
...@@ -2761,8 +2780,8 @@ Backup::execFSOPENCONF(Signal* signal) ...@@ -2761,8 +2780,8 @@ Backup::execFSOPENCONF(Signal* signal)
BackupRecordPtr ptr; BackupRecordPtr ptr;
c_backupPool.getPtr(ptr, filePtr.p->backupPtr); c_backupPool.getPtr(ptr, filePtr.p->backupPtr);
ndbrequire(filePtr.p->fileOpened == 0); ndbrequire(! (filePtr.p->m_flags & BackupFile::BF_OPEN));
filePtr.p->fileOpened = 1; filePtr.p->m_flags |= BackupFile::BF_OPEN;
openFilesReply(signal, ptr, filePtr); openFilesReply(signal, ptr, filePtr);
} }
...@@ -2775,16 +2794,16 @@ Backup::openFilesReply(Signal* signal, ...@@ -2775,16 +2794,16 @@ Backup::openFilesReply(Signal* signal,
/** /**
* Mark files as "opened" * Mark files as "opened"
*/ */
ndbrequire(filePtr.p->fileRunning == 1); ndbrequire(filePtr.p->m_flags & BackupFile::BF_OPENING);
filePtr.p->fileRunning = 0; filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_OPENING;
filePtr.p->m_flags |= BackupFile::BF_OPEN;
/** /**
* Check if all files have recived open_reply * Check if all files have recived open_reply
*/ */
for(ptr.p->files.first(filePtr); filePtr.i!=RNIL;ptr.p->files.next(filePtr)) for(ptr.p->files.first(filePtr); filePtr.i!=RNIL;ptr.p->files.next(filePtr))
{ {
jam(); jam();
if(filePtr.p->fileRunning == 1) { if(filePtr.p->m_flags & BackupFile::BF_OPENING) {
jam(); jam();
return; return;
}//if }//if
...@@ -2840,13 +2859,22 @@ Backup::openFilesReply(Signal* signal, ...@@ -2840,13 +2859,22 @@ Backup::openFilesReply(Signal* signal,
/** /**
* Start CTL file thread * Start CTL file thread
*/ */
ptr.p->files.getPtr(filePtr, ptr.p->ctlFilePtr); if (!ptr.p->is_lcp())
filePtr.p->fileRunning = 1; {
jam();
ptr.p->files.getPtr(filePtr, ptr.p->ctlFilePtr);
filePtr.p->m_flags |= BackupFile::BF_FILE_THREAD;
signal->theData[0] = BackupContinueB::START_FILE_THREAD;
signal->theData[1] = filePtr.i;
sendSignalWithDelay(BACKUP_REF, GSN_CONTINUEB, signal, 100, 2);
}
else
{
jam();
filePtr.p->m_flags |= BackupFile::BF_LCP_META;
}
signal->theData[0] = BackupContinueB::START_FILE_THREAD;
signal->theData[1] = filePtr.i;
sendSignalWithDelay(BACKUP_REF, GSN_CONTINUEB, signal, 100, 2);
/** /**
* Insert table list in ctl file * Insert table list in ctl file
*/ */
...@@ -2933,6 +2961,10 @@ Backup::execGET_TABINFOREF(Signal* signal) ...@@ -2933,6 +2961,10 @@ Backup::execGET_TABINFOREF(Signal* signal)
BackupRecordPtr ptr; BackupRecordPtr ptr;
c_backupPool.getPtr(ptr, senderData); c_backupPool.getPtr(ptr, senderData);
BackupFilePtr filePtr;
ptr.p->files.getPtr(filePtr, ptr.p->ctlFilePtr);
filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_FILE_THREAD;
defineBackupRef(signal, ptr, ref->errorCode); defineBackupRef(signal, ptr, ref->errorCode);
} }
...@@ -3361,13 +3393,13 @@ Backup::execSTART_BACKUP_REQ(Signal* signal) ...@@ -3361,13 +3393,13 @@ Backup::execSTART_BACKUP_REQ(Signal* signal)
* Start file threads... * Start file threads...
*/ */
BackupFilePtr filePtr; BackupFilePtr filePtr;
for(ptr.p->files.first(filePtr); for(ptr.p->files.first(filePtr); filePtr.i!=RNIL;ptr.p->files.next(filePtr))
filePtr.i!=RNIL; {
ptr.p->files.next(filePtr)){
jam(); jam();
if(filePtr.p->fileRunning == 0) { if(! (filePtr.p->m_flags & BackupFile::BF_FILE_THREAD))
{
jam(); jam();
filePtr.p->fileRunning = 1; filePtr.p->m_flags |= BackupFile::BF_FILE_THREAD;
signal->theData[0] = BackupContinueB::START_FILE_THREAD; signal->theData[0] = BackupContinueB::START_FILE_THREAD;
signal->theData[1] = filePtr.i; signal->theData[1] = filePtr.i;
sendSignalWithDelay(BACKUP_REF, GSN_CONTINUEB, signal, 100, 2); sendSignalWithDelay(BACKUP_REF, GSN_CONTINUEB, signal, 100, 2);
...@@ -3417,10 +3449,8 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal) ...@@ -3417,10 +3449,8 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal)
c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr); c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
ndbrequire(filePtr.p->backupPtr == ptrI); ndbrequire(filePtr.p->backupPtr == ptrI);
ndbrequire(filePtr.p->fileOpened == 1); ndbrequire(filePtr.p->m_flags ==
ndbrequire(filePtr.p->fileRunning == 1); (BackupFile::BF_OPEN | BackupFile::BF_FILE_THREAD));
ndbrequire(filePtr.p->scanRunning == 0);
ndbrequire(filePtr.p->fileClosing == 0);
/** /**
* Get table * Get table
...@@ -3469,7 +3499,7 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal) ...@@ -3469,7 +3499,7 @@ Backup::execBACKUP_FRAGMENT_REQ(Signal* signal)
* Start scan * Start scan
*/ */
{ {
filePtr.p->scanRunning = 1; filePtr.p->m_flags |= BackupFile::BF_SCAN_THREAD;
Table & table = * tabPtr.p; Table & table = * tabPtr.p;
ScanFragReq * req = (ScanFragReq *)signal->getDataPtrSend(); ScanFragReq * req = (ScanFragReq *)signal->getDataPtrSend();
...@@ -3754,7 +3784,7 @@ Backup::execSCAN_FRAGREF(Signal* signal) ...@@ -3754,7 +3784,7 @@ Backup::execSCAN_FRAGREF(Signal* signal)
c_backupFilePool.getPtr(filePtr, filePtrI); c_backupFilePool.getPtr(filePtr, filePtrI);
filePtr.p->errorCode = ref->errorCode; filePtr.p->errorCode = ref->errorCode;
filePtr.p->scanRunning = 0; filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_SCAN_THREAD;
backupFragmentRef(signal, filePtr); backupFragmentRef(signal, filePtr);
} }
...@@ -3794,7 +3824,7 @@ Backup::fragmentCompleted(Signal* signal, BackupFilePtr filePtr) ...@@ -3794,7 +3824,7 @@ Backup::fragmentCompleted(Signal* signal, BackupFilePtr filePtr)
if(filePtr.p->errorCode != 0) if(filePtr.p->errorCode != 0)
{ {
jam(); jam();
filePtr.p->scanRunning = 0; filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_SCAN_THREAD;
backupFragmentRef(signal, filePtr); // Scan completed backupFragmentRef(signal, filePtr); // Scan completed
return; return;
}//if }//if
...@@ -3808,7 +3838,7 @@ Backup::fragmentCompleted(Signal* signal, BackupFilePtr filePtr) ...@@ -3808,7 +3838,7 @@ Backup::fragmentCompleted(Signal* signal, BackupFilePtr filePtr)
return; return;
}//if }//if
filePtr.p->scanRunning = 0; filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_SCAN_THREAD;
BackupRecordPtr ptr; BackupRecordPtr ptr;
c_backupPool.getPtr(ptr, filePtr.p->backupPtr); c_backupPool.getPtr(ptr, filePtr.p->backupPtr);
...@@ -3931,7 +3961,7 @@ Backup::execFSAPPENDREF(Signal* signal) ...@@ -3931,7 +3961,7 @@ Backup::execFSAPPENDREF(Signal* signal)
BackupFilePtr filePtr; BackupFilePtr filePtr;
c_backupFilePool.getPtr(filePtr, filePtrI); c_backupFilePool.getPtr(filePtr, filePtrI);
filePtr.p->fileRunning = 0; filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_FILE_THREAD;
filePtr.p->errorCode = errCode; filePtr.p->errorCode = errCode;
checkFile(signal, filePtr); checkFile(signal, filePtr);
...@@ -4061,37 +4091,35 @@ Backup::checkFile(Signal* signal, BackupFilePtr filePtr) ...@@ -4061,37 +4091,35 @@ Backup::checkFile(Signal* signal, BackupFilePtr filePtr)
FsAppendReq::SignalLength, JBA); FsAppendReq::SignalLength, JBA);
return; return;
} }
Uint32 flags = filePtr.p->m_flags;
filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_FILE_THREAD;
#ifdef DEBUG_ABORT ndbrequire(flags & BackupFile::BF_OPEN);
Uint32 running= filePtr.p->fileRunning; ndbrequire(flags & BackupFile::BF_FILE_THREAD);
Uint32 closing= filePtr.p->fileClosing; ndbrequire(! (flags & BackupFile::BF_CLOSING));
#endif
filePtr.p->m_flags |= BackupFile::BF_CLOSING;
FsCloseReq * req = (FsCloseReq *)signal->getDataPtrSend();
req->filePointer = filePtr.p->filePointer;
req->userPointer = filePtr.i;
req->userReference = reference();
req->fileFlag = 0;
if(!filePtr.p->fileClosing) BackupRecordPtr ptr;
c_backupPool.getPtr(ptr, filePtr.p->backupPtr);
if (ptr.p->errorCode)
{ {
filePtr.p->fileRunning = 0; FsCloseReq::setRemoveFileFlag(req->fileFlag, 1);
filePtr.p->fileClosing = 1;
FsCloseReq * req = (FsCloseReq *)signal->getDataPtrSend();
req->filePointer = filePtr.p->filePointer;
req->userPointer = filePtr.i;
req->userReference = reference();
req->fileFlag = 0;
#ifdef DEBUG_ABORT
ndbout_c("***** a FSCLOSEREQ filePtr.i = %u run=%d cl=%d", filePtr.i,
running, closing);
#endif
sendSignal(NDBFS_REF, GSN_FSCLOSEREQ, signal, FsCloseReq::SignalLength, JBA);
} }
else
{
#ifdef DEBUG_ABORT #ifdef DEBUG_ABORT
ndbout_c("***** a NOT SENDING FSCLOSEREQ filePtr.i = %u run=%d cl=%d", ndbout_c("***** a FSCLOSEREQ filePtr.i = %u run=%d cl=%d", filePtr.i,
filePtr.i, running, closing);
running, closing);
#endif #endif
sendSignal(NDBFS_REF, GSN_FSCLOSEREQ, signal, FsCloseReq::SignalLength, JBA);
}
} }
...@@ -4330,7 +4358,8 @@ Backup::closeFiles(Signal* sig, BackupRecordPtr ptr) ...@@ -4330,7 +4358,8 @@ Backup::closeFiles(Signal* sig, BackupRecordPtr ptr)
int openCount = 0; int openCount = 0;
for(ptr.p->files.first(filePtr); filePtr.i!=RNIL; ptr.p->files.next(filePtr)) for(ptr.p->files.first(filePtr); filePtr.i!=RNIL; ptr.p->files.next(filePtr))
{ {
if(filePtr.p->fileOpened == 0) { if(! (filePtr.p->m_flags & BackupFile::BF_OPEN))
{
jam(); jam();
continue; continue;
} }
...@@ -4338,34 +4367,26 @@ Backup::closeFiles(Signal* sig, BackupRecordPtr ptr) ...@@ -4338,34 +4367,26 @@ Backup::closeFiles(Signal* sig, BackupRecordPtr ptr)
jam(); jam();
openCount++; openCount++;
if(filePtr.p->fileClosing == 1){ if(filePtr.p->m_flags & BackupFile::BF_CLOSING)
{
jam(); jam();
continue; continue;
}//if }//if
filePtr.p->operation.dataBuffer.eof(); filePtr.p->operation.dataBuffer.eof();
if(filePtr.p->fileRunning == 1){ if(filePtr.p->m_flags & BackupFile::BF_FILE_THREAD)
{
jam(); jam();
#ifdef DEBUG_ABORT #ifdef DEBUG_ABORT
ndbout_c("Close files fileRunning == 1, filePtr.i=%u", filePtr.i); ndbout_c("Close files fileRunning == 1, filePtr.i=%u", filePtr.i);
#endif #endif
} else { }
else
{
jam(); jam();
filePtr.p->fileClosing = 1;
checkFile(sig, filePtr); // make sure we write everything before closing checkFile(sig, filePtr); // make sure we write everything before closing
}
FsCloseReq * req = (FsCloseReq *)sig->getDataPtrSend(); }
req->filePointer = filePtr.p->filePointer;
req->userPointer = filePtr.i;
req->userReference = reference();
req->fileFlag = 0;
#ifdef DEBUG_ABORT
ndbout_c("***** b FSCLOSEREQ filePtr.i = %u", filePtr.i);
#endif
sendSignal(NDBFS_REF, GSN_FSCLOSEREQ, sig,
FsCloseReq::SignalLength, JBA);
}//if
}//for
if(openCount == 0){ if(openCount == 0){
jam(); jam();
...@@ -4387,7 +4408,6 @@ Backup::execFSCLOSEREF(Signal* signal) ...@@ -4387,7 +4408,6 @@ Backup::execFSCLOSEREF(Signal* signal)
BackupRecordPtr ptr; BackupRecordPtr ptr;
c_backupPool.getPtr(ptr, filePtr.p->backupPtr); c_backupPool.getPtr(ptr, filePtr.p->backupPtr);
filePtr.p->fileOpened = 1;
FsConf * conf = (FsConf*)signal->getDataPtr(); FsConf * conf = (FsConf*)signal->getDataPtr();
conf->userPointer = filePtrI; conf->userPointer = filePtrI;
...@@ -4408,29 +4428,17 @@ Backup::execFSCLOSECONF(Signal* signal) ...@@ -4408,29 +4428,17 @@ Backup::execFSCLOSECONF(Signal* signal)
#ifdef DEBUG_ABORT #ifdef DEBUG_ABORT
ndbout_c("***** FSCLOSECONF filePtrI = %u", filePtrI); ndbout_c("***** FSCLOSECONF filePtrI = %u", filePtrI);
#endif #endif
ndbrequire(filePtr.p->m_flags == (BackupFile::BF_OPEN |
BackupFile::BF_CLOSING));
ndbrequire(filePtr.p->fileClosing == 1);
ndbrequire(filePtr.p->fileOpened == 1);
ndbrequire(filePtr.p->fileRunning == 0);
ndbrequire(filePtr.p->scanRunning == 0);
filePtr.p->fileOpened = 0; filePtr.p->m_flags &= ~(Uint32)(BackupFile::BF_OPEN |BackupFile::BF_CLOSING);
filePtr.p->operation.dataBuffer.reset(); filePtr.p->operation.dataBuffer.reset();
BackupRecordPtr ptr; BackupRecordPtr ptr;
c_backupPool.getPtr(ptr, filePtr.p->backupPtr); c_backupPool.getPtr(ptr, filePtr.p->backupPtr);
for(ptr.p->files.first(filePtr); filePtr.i!=RNIL;ptr.p->files.next(filePtr)) closeFiles(signal, ptr);
{
jam();
if(filePtr.p->fileOpened == 1) {
jam();
#ifdef DEBUG_ABORT
ndbout_c("waiting for more FSCLOSECONF's filePtr.i = %u", filePtr.i);
#endif
return; // we will be getting more FSCLOSECONF's
}//if
}//for
closeFilesDone(signal, ptr);
} }
void void
...@@ -4626,12 +4634,8 @@ Backup::dumpUsedResources() ...@@ -4626,12 +4634,8 @@ Backup::dumpUsedResources()
filePtr.i != RNIL; filePtr.i != RNIL;
ptr.p->files.next(filePtr)) { ptr.p->files.next(filePtr)) {
jam(); jam();
ndbout_c("filePtr.i = %u, filePtr.p->fileOpened=%u fileRunning=%u " ndbout_c("filePtr.i = %u, flags: H'%x ",
"scanRunning=%u", filePtr.i, filePtr.p->m_flags);
filePtr.i,
filePtr.p->fileOpened,
filePtr.p->fileRunning,
filePtr.p->scanRunning);
}//for }//for
} }
} }
...@@ -4665,13 +4669,10 @@ Backup::cleanup(Signal* signal, BackupRecordPtr ptr) ...@@ -4665,13 +4669,10 @@ Backup::cleanup(Signal* signal, BackupRecordPtr ptr)
}//for }//for
BackupFilePtr filePtr; BackupFilePtr filePtr;
for(ptr.p->files.first(filePtr); for(ptr.p->files.first(filePtr);filePtr.i != RNIL;ptr.p->files.next(filePtr))
filePtr.i != RNIL; {
ptr.p->files.next(filePtr)) {
jam(); jam();
ndbrequire(filePtr.p->fileOpened == 0); ndbrequire(filePtr.p->m_flags == 0);
ndbrequire(filePtr.p->fileRunning == 0);
ndbrequire(filePtr.p->scanRunning == 0);
filePtr.p->pages.release(); filePtr.p->pages.release();
}//for }//for
...@@ -4744,37 +4745,52 @@ Backup::execLCP_PREPARE_REQ(Signal* signal) ...@@ -4744,37 +4745,52 @@ Backup::execLCP_PREPARE_REQ(Signal* signal)
BackupRecordPtr ptr; BackupRecordPtr ptr;
c_backupPool.getPtr(ptr, req.backupPtr); c_backupPool.getPtr(ptr, req.backupPtr);
ptr.p->m_gsn = GSN_LCP_PREPARE_REQ;
TablePtr tabPtr; TablePtr tabPtr;
if(ptr.p->errorCode == 0) FragmentPtr fragPtr;
if (!ptr.p->tables.isEmpty())
{ {
jam(); jam();
FragmentPtr fragPtr; ndbrequire(ptr.p->errorCode);
if(!ptr.p->tables.seize(tabPtr) || !tabPtr.p->fragments.seize(1)) ptr.p->tables.first(tabPtr);
if (tabPtr.p->tableId == req.tableId)
{ {
if(!tabPtr.isNull()) jam();
ptr.p->tables.release(); ndbrequire(!tabPtr.p->fragments.empty());
ndbrequire(false); // TODO tabPtr.p->fragments.getPtr(fragPtr, 0);
fragPtr.p->fragmentId = req.fragmentId;
defineBackupRef(signal, ptr, ptr.p->errorCode);
return;
} }
tabPtr.p->tableId = req.tableId; else
tabPtr.p->fragments.getPtr(fragPtr, 0); {
tabPtr.p->tableType = DictTabInfo::UserTable; jam();
fragPtr.p->fragmentId = req.fragmentId; tabPtr.p->attributes.release();
fragPtr.p->lcp_no = req.lcpNo; tabPtr.p->fragments.release();
fragPtr.p->scanned = 0; ptr.p->tables.release();
fragPtr.p->scanning = 0; ptr.p->errorCode = 0;
fragPtr.p->tableId = req.tableId; // fall-through
}
ptr.p->backupId= req.backupId; }
lcp_open_file(signal, ptr);
} if(!ptr.p->tables.seize(tabPtr) || !tabPtr.p->fragments.seize(1))
else
{ {
jam(); if(!tabPtr.isNull())
FragmentPtr fragPtr; ptr.p->tables.release();
tabPtr.p->fragments.getPtr(fragPtr, 0); ndbrequire(false); // TODO
fragPtr.p->fragmentId = req.fragmentId;
defineBackupRef(signal, ptr, ptr.p->errorCode);
} }
tabPtr.p->tableId = req.tableId;
tabPtr.p->fragments.getPtr(fragPtr, 0);
tabPtr.p->tableType = DictTabInfo::UserTable;
fragPtr.p->fragmentId = req.fragmentId;
fragPtr.p->lcp_no = req.lcpNo;
fragPtr.p->scanned = 0;
fragPtr.p->scanning = 0;
fragPtr.p->tableId = req.tableId;
ptr.p->backupId= req.backupId;
lcp_open_file(signal, ptr);
} }
void void
...@@ -4786,6 +4802,17 @@ Backup::lcp_close_file_conf(Signal* signal, BackupRecordPtr ptr) ...@@ -4786,6 +4802,17 @@ Backup::lcp_close_file_conf(Signal* signal, BackupRecordPtr ptr)
ndbrequire(ptr.p->tables.first(tabPtr)); ndbrequire(ptr.p->tables.first(tabPtr));
Uint32 tableId = tabPtr.p->tableId; Uint32 tableId = tabPtr.p->tableId;
BackupFilePtr filePtr;
c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
ndbrequire(filePtr.p->m_flags == 0);
if (ptr.p->m_gsn == GSN_LCP_PREPARE_REQ)
{
jam();
defineBackupRef(signal, ptr, ptr.p->errorCode);
return;
}
FragmentPtr fragPtr; FragmentPtr fragPtr;
tabPtr.p->fragments.getPtr(fragPtr, 0); tabPtr.p->fragments.getPtr(fragPtr, 0);
Uint32 fragmentId = fragPtr.p->fragmentId; Uint32 fragmentId = fragPtr.p->fragmentId;
...@@ -4833,9 +4860,8 @@ Backup::lcp_open_file(Signal* signal, BackupRecordPtr ptr) ...@@ -4833,9 +4860,8 @@ Backup::lcp_open_file(Signal* signal, BackupRecordPtr ptr)
*/ */
BackupFilePtr filePtr; BackupFilePtr filePtr;
c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr); c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
ndbrequire(filePtr.p->fileRunning == 0); ndbrequire(filePtr.p->m_flags == 0);
filePtr.p->fileClosing = 0; filePtr.p->m_flags |= BackupFile::BF_OPENING;
filePtr.p->fileRunning = 1;
req->userPointer = filePtr.i; req->userPointer = filePtr.i;
FsOpenReq::setVersion(req->fileNumber, 5); FsOpenReq::setVersion(req->fileNumber, 5);
...@@ -4855,6 +4881,12 @@ Backup::lcp_open_file_done(Signal* signal, BackupRecordPtr ptr) ...@@ -4855,6 +4881,12 @@ Backup::lcp_open_file_done(Signal* signal, BackupRecordPtr ptr)
ndbrequire(ptr.p->tables.first(tabPtr)); ndbrequire(ptr.p->tables.first(tabPtr));
tabPtr.p->fragments.getPtr(fragPtr, 0); tabPtr.p->fragments.getPtr(fragPtr, 0);
BackupFilePtr filePtr;
c_backupFilePool.getPtr(filePtr, ptr.p->dataFilePtr);
ndbrequire(filePtr.p->m_flags ==
(BackupFile::BF_OPEN | BackupFile::BF_LCP_META));
filePtr.p->m_flags &= ~(Uint32)BackupFile::BF_LCP_META;
ptr.p->slaveState.setState(STARTED); ptr.p->slaveState.setState(STARTED);
LcpPrepareConf* conf= (LcpPrepareConf*)signal->getDataPtrSend(); LcpPrepareConf* conf= (LcpPrepareConf*)signal->getDataPtrSend();
...@@ -4864,6 +4896,16 @@ Backup::lcp_open_file_done(Signal* signal, BackupRecordPtr ptr) ...@@ -4864,6 +4896,16 @@ Backup::lcp_open_file_done(Signal* signal, BackupRecordPtr ptr)
conf->fragmentId = fragPtr.p->fragmentId; conf->fragmentId = fragPtr.p->fragmentId;
sendSignal(ptr.p->masterRef, GSN_LCP_PREPARE_CONF, sendSignal(ptr.p->masterRef, GSN_LCP_PREPARE_CONF,
signal, LcpPrepareConf::SignalLength, JBB); signal, LcpPrepareConf::SignalLength, JBB);
/**
* Start file thread
*/
filePtr.p->m_flags |= BackupFile::BF_FILE_THREAD;
signal->theData[0] = BackupContinueB::START_FILE_THREAD;
signal->theData[1] = filePtr.i;
signal->theData[2] = __LINE__;
sendSignalWithDelay(BACKUP_REF, GSN_CONTINUEB, signal, 100, 3);
} }
void void
...@@ -4875,6 +4917,22 @@ Backup::execEND_LCPREQ(Signal* signal) ...@@ -4875,6 +4917,22 @@ Backup::execEND_LCPREQ(Signal* signal)
c_backupPool.getPtr(ptr, req->backupPtr); c_backupPool.getPtr(ptr, req->backupPtr);
ndbrequire(ptr.p->backupId == req->backupId); ndbrequire(ptr.p->backupId == req->backupId);
BackupFilePtr filePtr;
ptr.p->files.getPtr(filePtr, ptr.p->ctlFilePtr);
ndbrequire(filePtr.p->m_flags == 0);
if (!ptr.p->tables.isEmpty())
{
jam();
ndbrequire(ptr.p->errorCode);
TablePtr tabPtr;
ptr.p->tables.first(tabPtr);
tabPtr.p->attributes.release();
tabPtr.p->fragments.release();
ptr.p->tables.release();
ptr.p->errorCode = 0;
}
ptr.p->errorCode = 0; ptr.p->errorCode = 0;
ptr.p->slaveState.setState(CLEANING); ptr.p->slaveState.setState(CLEANING);
ptr.p->slaveState.setState(INITIAL); ptr.p->slaveState.setState(INITIAL);
......
storage/ndb/src/kernel/blocks/backup/Backup.hpp
View file @ ed1e0b08
...@@ -345,10 +345,16 @@ public: ...@@ -345,10 +345,16 @@ public:
Uint32 nextList; Uint32 nextList;
union { Uint32 prevList; Uint32 nextPool; }; union { Uint32 prevList; Uint32 nextPool; };
Uint8 fileOpened; enum {
Uint8 fileRunning; BF_OPEN = 0x1
Uint8 fileClosing; ,BF_OPENING = 0x2
Uint8 scanRunning; ,BF_CLOSING = 0x4
,BF_FILE_THREAD = 0x8
,BF_SCAN_THREAD = 0x10
,BF_LCP_META = 0x20
};
Uint32 m_flags;
Uint32 m_pos;
}; };
typedef Ptr<BackupFile> BackupFilePtr; typedef Ptr<BackupFile> BackupFilePtr;
...@@ -357,14 +363,14 @@ public: ...@@ -357,14 +363,14 @@ public:
* State for BackupRecord * State for BackupRecord
*/ */
enum State { enum State {
INITIAL, INITIAL = 0,
DEFINING, // Defining backup content and parameters DEFINING = 1, // Defining backup content and parameters
DEFINED, // DEFINE_BACKUP_CONF sent in slave, received all in master DEFINED = 2, // DEFINE_BACKUP_CONF sent in slave, received all in master
STARTED, // Creating triggers STARTED = 3, // Creating triggers
SCANNING, // Scanning fragments SCANNING = 4, // Scanning fragments
STOPPING, // Closing files STOPPING = 5, // Closing files
CLEANING, // Cleaning resources CLEANING = 6, // Cleaning resources
ABORTING // Aborting backup ABORTING = 7 // Aborting backup
}; };
static const Uint32 validSlaveTransitionsCount; static const Uint32 validSlaveTransitionsCount;
......
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
View file @ ed1e0b08
...@@ -212,8 +212,6 @@ inline ...@@ -212,8 +212,6 @@ inline
void void
FsBuffer::reset() FsBuffer::reset()
{ {
assert(m_free = m_size);
assert(m_readIndex == m_writeIndex);
m_readIndex = m_writeIndex = 0; m_readIndex = m_writeIndex = 0;
m_free = m_size; m_free = m_size;
m_eof = 0; m_eof = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7