Merge lp:~laurynas-biveinis/percona-server/bug1255628-5.5 into lp:percona-server/5.5

Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 601
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1255628-5.5
Merge into: lp:percona-server/5.5
Diff against target: 11 lines (+1/-0)
1 file modified
Percona-Server/storage/innobase/fil/fil0fil.c (+1/-0)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1255628-5.5
Reviewer Review Type Date Requested Status
George Ormond Lorch III (community) g2 Approve
Review via email: mp+197164@code.launchpad.net

Description of the change

Fix bug 1255628 (XtraDB assertion at shutdown if posix_fallocate is
used in ut_a(node->n_pending == 0 || node->space->stop_new_ops);)

The issue is that fil_extend_space_to_desired_size() bumps the pending
space operation counter before the extending, but fails do decrement
it after the operation if posix_fallocate() was used. Fix by calling
fil_node_complete_io() in that case.

http://jenkins.percona.com/job/percona-server-5.5-param/898/

To post a comment you must log in.
Revision history for this message
George Ormond Lorch III (gl-az) :
review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/storage/innobase/fil/fil0fil.c'
2--- Percona-Server/storage/innobase/fil/fil0fil.c 2013-10-23 08:23:08 +0000
3+++ Percona-Server/storage/innobase/fil/fil0fil.c 2013-11-29 10:39:48 +0000
4@@ -4967,6 +4967,7 @@
5 space->size += (size_after_extend - start_page_no);
6 os_has_said_disk_full = FALSE;
7 }
8+ fil_node_complete_io(node, fil_system, OS_FILE_READ);
9 goto complete_io;
10 }
11 #endif

Subscribers

People subscribed via source and target branches