]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c376708) | patch
osd/OSD.cc: Use MIN() so that we don't exceed osd_recovery_max_active
authorDavid Zafman <david.zafman@inktank.com>
Wed, 11 Sep 2013 23:55:06 +0000 (16:55 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 1 Oct 2013 23:18:48 +0000 (16:18 -0700)
commite0203c61a3f45fdd6d3d3ece26fef6152bdc036d
tree5027d8f39395af7860ec34aab08f4f7d72f8494ftree | snapshot
parentc376708358cedb5561fbb43e9b9e622df3ea7a58commit | diff
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
src/osd/OSD.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.