i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Let the transaction abort that caused the transaction to get too large. This

Browse Source 
fixes that the next action failed after the problem.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31928 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-07-29 17:50:01 +00:00
parent a64a5357f2
commit 1857ae604e
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/Journal.cpp
+10 -3
View File
@@ -713,9 +713,8 @@ Journal::_WriteTransactionToLog()
// We created a transaction larger than one we can write back to // We created a transaction larger than one we can write back to
// disk - the only option we have (besides risking disk corruption // disk - the only option we have (besides risking disk corruption
// by writing it back anyway), is to let it fail. // by writing it back anyway), is to let it fail.
dprintf("transaction too large (%d blocks, %d main, log size %d)!\n", dprintf("transaction too large (%d blocks, log size %d)!\n",
(int)_TransactionSize(), (int)cache_blocks_in_main_transaction( (int)_TransactionSize(), (int)fLogSize);
fVolume->BlockCache(), fTransactionID), (int)fLogSize);
return B_BUFFER_OVERFLOW; return B_BUFFER_OVERFLOW;
} }
} }
@@ -881,6 +880,14 @@ Journal::_WriteTransactionToLog()
fTransactionID = cache_detach_sub_transaction(fVolume->BlockCache(), fTransactionID = cache_detach_sub_transaction(fVolume->BlockCache(),
fTransactionID, _TransactionWritten, logEntry); fTransactionID, _TransactionWritten, logEntry);
fUnwrittenTransactions = 1; fUnwrittenTransactions = 1;
if (status == B_OK && _TransactionSize() > fLogSize) {
// If the transaction is too large after writing, there is no way to
// recover, so let this transaction fail.
dprintf("transaction too large (%d blocks, log size %d)!\n",
(int)_TransactionSize(), (int)fLogSize);
return B_BUFFER_OVERFLOW;
}
} else { } else {
cache_end_transaction(fVolume->BlockCache(), fTransactionID, cache_end_transaction(fVolume->BlockCache(), fTransactionID,
_TransactionWritten, logEntry); _TransactionWritten, logEntry);