firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 08:03:03 +01:00
Code Issues

Improvement CORE-5614 : Physical backup merge stage could run too long, especially with huge page cache

Browse Source
This commit is contained in:
hvlad 2017-09-16 11:18:34 +03:00
parent bb5a3b06df
commit 9825b04c2a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/jrd/nbak.cpp
View File

@ -567,6 +567,7 @@ void BackupManager::endBackup(thread_db* tdbb, bool recover)
if (all.getFirst())
{
int n = 0;
do {
if (--tdbb->tdbb_quantum < 0)
JRD_reschedule(tdbb, QUANTUM, true);
@ -577,11 +578,17 @@ void BackupManager::endBackup(thread_db* tdbb, bool recover)
NBAK_TRACE(("Merge: page %d is fetched", all.current().db_page));
if (page->pag_scn != current_scn)
{
CCH_MARK(tdbb, &window2);
CCH_MARK_SYSTEM(tdbb, &window2);
NBAK_TRACE(("Merge: page %d is marked", all.current().db_page));
}
CCH_RELEASE(tdbb, &window2);
NBAK_TRACE(("Merge: page %d is released", all.current().db_page));
if (++n == 512)
{
CCH_flush(tdbb, FLUSH_SYSTEM, 0);
n = 0;
}
} while (all.getNext());
}