Merge lp://qastaging/~david-goetz/swift/auditor_bug into lp://qastaging/~hudson-openstack/swift/trunk

Proposed by David Goetz
Status: Merged
Approved by: John Dickinson
Approved revision: 350
Merged at revision: 350
Proposed branch: lp://qastaging/~david-goetz/swift/auditor_bug
Merge into: lp://qastaging/~hudson-openstack/swift/trunk
Diff against target: 93 lines (+47/-24)
2 files modified
swift/obj/auditor.py (+27/-24)
test/unit/obj/test_auditor.py (+20/-0)
To merge this branch: bzr merge lp://qastaging/~david-goetz/swift/auditor_bug
Reviewer Review Type Date Requested Status
John Dickinson Approve
gholt (community) Approve
Review via email: mp+73449@code.qastaging.launchpad.net

Description of the change

Fix for object auditor. It doesn't close files that are quarantined for certain reasons, zero byte files for one, which will cause it to eventually crash due to keeping too many files open. Thanks David Kranz for finding / reporting this!!

To post a comment you must log in.
Revision history for this message
gholt (gholt) wrote :

Your was_df stuff should have a try/finally

review: Needs Fixing
350. By David Goetz

fix for unit test

Revision history for this message
David Goetz (david-goetz) wrote :

added the try finally.

Revision history for this message
gholt (gholt) wrote :

:)

review: Approve
Revision history for this message
John Dickinson (notmyname) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.