BUG#20823 testBackup FailMaster failing

  
few cases not handled properly (NF occurs).
parent 76d4e65a
...@@ -274,8 +274,18 @@ Backup::execCONTINUEB(Signal* signal) ...@@ -274,8 +274,18 @@ Backup::execCONTINUEB(Signal* signal)
BackupRecordPtr ptr; BackupRecordPtr ptr;
c_backupPool.getPtr(ptr, ptr_I); c_backupPool.getPtr(ptr, ptr_I);
if (tabPtr_I == RNIL)
{
closeFiles(signal, ptr);
return;
}
jam();
TablePtr tabPtr; TablePtr tabPtr;
ptr.p->tables.getPtr(tabPtr, tabPtr_I); ptr.p->tables.getPtr(tabPtr, tabPtr_I);
jam();
if(tabPtr.p->fragments.getSize())
{
FragmentPtr fragPtr; FragmentPtr fragPtr;
tabPtr.p->fragments.getPtr(fragPtr, fragPtr_I); tabPtr.p->fragments.getPtr(fragPtr, fragPtr_I);
...@@ -304,6 +314,8 @@ Backup::execCONTINUEB(Signal* signal) ...@@ -304,6 +314,8 @@ Backup::execCONTINUEB(Signal* signal)
filePtr.p->operation.dataBuffer.updateWritePtr(sz); filePtr.p->operation.dataBuffer.updateWritePtr(sz);
fragPtr_I++; fragPtr_I++;
}
if (fragPtr_I == tabPtr.p->fragments.getSize()) if (fragPtr_I == tabPtr.p->fragments.getSize())
{ {
signal->theData[0] = tabPtr.p->tableId; signal->theData[0] = tabPtr.p->tableId;
...@@ -4243,6 +4255,12 @@ Backup::execSTOP_BACKUP_REQ(Signal* signal) ...@@ -4243,6 +4255,12 @@ Backup::execSTOP_BACKUP_REQ(Signal* signal)
TablePtr tabPtr; TablePtr tabPtr;
ptr.p->tables.first(tabPtr); ptr.p->tables.first(tabPtr);
if (tabPtr.i == RNIL)
{
closeFiles(signal, ptr);
return;
}
signal->theData[0] = BackupContinueB::BACKUP_FRAGMENT_INFO; signal->theData[0] = BackupContinueB::BACKUP_FRAGMENT_INFO;
signal->theData[1] = ptr.i; signal->theData[1] = ptr.i;
signal->theData[2] = tabPtr.i; signal->theData[2] = tabPtr.i;
......
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