Merge lp://staging/~sergei.glushchenko/percona-server/5.6-ps-bug1193319 into lp://staging/percona-server/5.6
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 501 |
Proposed branch: | lp://staging/~sergei.glushchenko/percona-server/5.6-ps-bug1193319 |
Merge into: | lp://staging/percona-server/5.6 |
Diff against target: |
56 lines (+17/-15) 1 file modified
Percona-Server/storage/innobase/log/log0log.cc (+17/-15) |
To merge this branch: | bzr merge lp://staging/~sergei.glushchenko/percona-server/5.6-ps-bug1193319 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Vlad Lesin (community) | g2 | Approve | |
Review via email: mp+193695@code.staging.launchpad.net |
Description of the change
Bug 1193319: Failing assertion: ++count < 50 in file log0log.cc line 308
* Move check of log tracking margin below archiving margin, which
is equivalent of the following:
if (either margin violated) {
if (archiving margin violated) {
archive;
} else {
sleep;
}
goto loop;
}
* Allocate separate count for tracking margin as it insert of
large BLOB without doing checkpoints makes count spin too fast
because log tracking margin will always be violated and the
only possible way to proceed is to proceed further no matter of
log tracking margin. This is not the case anymore.
Both changes together make visible effect and assertion is harder
to violate without changing the idea of assertion.
http://
Reset to Needs Review because G1 review was requested originally