summaryrefslogtreecommitdiffstats
path: root/net/ceph
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-05-07 15:35:09 -0700
committerSage Weil <sage@inktank.com>2012-05-07 15:38:50 -0700
commitc90f95ed46393e29d843686e21947d1c6fcb1164 (patch)
tree9e4c09c00f50957cd861e9fcadc330353e9a7ae6 /net/ceph
parent8b12d47b80c7a34dffdd98244d99316db490ec58 (diff)
downloadlinux-stable-c90f95ed46393e29d843686e21947d1c6fcb1164.tar.gz
linux-stable-c90f95ed46393e29d843686e21947d1c6fcb1164.tar.bz2
linux-stable-c90f95ed46393e29d843686e21947d1c6fcb1164.zip
crush: adjust local retry threshold
This small adjustment reflects a change that was made in ceph.git commit af6a9f30696c900a2a8bd7ae24e8ed15fb4964bb, about 6 months ago. An N-1 search is not exhaustive. Fixed ceph.git bug #1594. Reviewed-by: Alex Elder <elder@inktank.com> Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/crush/mapper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index 436102a8a461..583f644b0e28 100644
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/crush/mapper.c
@@ -415,7 +415,7 @@ reject:
if (collide && flocal < 3)
/* retry locally a few times */
retry_bucket = 1;
- else if (flocal < in->size + orig_tries)
+ else if (flocal <= in->size + orig_tries)
/* exhaustive bucket search */
retry_bucket = 1;
else if (ftotal < 20)