Bug #6291
Recovery can take more resources than it should
0%
Description
The code in do_recovery() uses MAX instead of MIN so is can exceed osd_recovery_max_active.
Associated revisions
osd/OSD.cc: Use MIN so that we don't exceed osd_recovery_max_active
Caused by 944f3b73531af791c90f0f061280160003545c63
Fixes: #6291
Backport: dumpling
Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
osd/OSD.cc: Use MIN so that we don't exceed osd_recovery_max_active
Caused by 944f3b73531af791c90f0f061280160003545c63
Fixes: #6291
Backport: dumpling
Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 139a714e13aa3c7f42091270b55dde8a17b3c4b8)
Conflicts:
src/osd/OSD.cc
History
#1 Updated by David Zafman over 10 years ago
Caused by 944f3b73 "OSD: only start osd_recovery_max_single_start at once"
#2 Updated by David Zafman over 10 years ago
- Status changed from New to Pending Backport
139a714e13aa3c7f42091270b55dde8a17b3c4b8
#3 Updated by Samuel Just over 10 years ago
- Status changed from Pending Backport to Resolved