Merge lp:~laurynas-biveinis/percona-server/bug1234513 into lp:percona-server/5.6

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 450
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1234513
Merge into: lp:percona-server/5.6
Diff against target: 42 lines (+13/-16)
1 file modified
Percona-Server/storage/innobase/buf/buf0flu.cc (+13/-16)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1234513
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+189000@code.launchpad.net

Description of the change

Fix bug 1234513 (buf_flush_LRU_tail(): incorrect buf_flush_LRU()
return value check and srv_cleaner_eviction_factor handling).

Fixed trivially by removing the else branch from if
(buf_flush_LRU(...)) statement and negating the
(srv_cleaner_eviction_factor ? n.evicted : n.flushed) expression in
the instance flushing stop condition.

http://jenkins.percona.com/job/percona-server-5.6-param/338/

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

Self-approving, obvious.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/storage/innobase/buf/buf0flu.cc'
2--- Percona-Server/storage/innobase/buf/buf0flu.cc 2013-10-02 08:34:56 +0000
3+++ Percona-Server/storage/innobase/buf/buf0flu.cc 2013-10-03 07:48:39 +0000
4@@ -2247,25 +2247,22 @@
5 buffer pool instance. */
6 buf_flush_wait_batch_end(
7 buf_pool, BUF_FLUSH_LRU);
8- } else {
9-
10- total_flushed += n.flushed;
11-
12- /* When we evict less pages than we did
13- on a previous try we relax the LRU scan
14- limit in order to attempt to evict
15- more */
16- limited_scan[i]
17- = (previous_evicted[i]
18- > n.evicted);
19- previous_evicted[i] = n.evicted;
20-
21- requested_pages[i] += lru_chunk_size;
22 }
23
24+ total_flushed += n.flushed;
25+
26+ /* When we evict less pages than we did on a
27+ previous try we relax the LRU scan limit in
28+ order to attempt to evict more */
29+ limited_scan[i]
30+ = (previous_evicted[i] > n.evicted);
31+ previous_evicted[i] = n.evicted;
32+
33+ requested_pages[i] += lru_chunk_size;
34+
35 if (requested_pages[i] >= scan_depth[i]
36- || (srv_cleaner_eviction_factor
37- ? n.evicted : n.flushed)) {
38+ || !(srv_cleaner_eviction_factor
39+ ? n.evicted : n.flushed)) {
40
41 active_instance[i] = false;
42 remaining_instances--;

Subscribers

People subscribed via source and target branches