summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-05-07 15:35:09 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:38:03 -0800
commit9926776ca573b23914d5265457202307a3715748 (patch)
tree5b0e181568831b2f9df0a548238df8240509ed47
parent506b4672ace55889c16d4e9d5515e0c1ae7832d5 (diff)
downloadlwn-9926776ca573b23914d5265457202307a3715748.tar.gz
lwn-9926776ca573b23914d5265457202307a3715748.zip
crush: adjust local retry threshold
(cherry picked from commit c90f95ed46393e29d843686e21947d1c6fcb1164) 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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)