summaryrefslogtreecommitdiffstats
path: root/net/ceph/crush
diff options
context:
space:
mode:
authorIlya Dryomov <ilya.dryomov@inktank.com>2013-12-24 21:19:25 +0200
committerIlya Dryomov <ilya.dryomov@inktank.com>2013-12-31 20:32:15 +0200
commitc6d98a603a02594f6ecf16d0a0af989ae9fa7abd (patch)
tree78984357ac4b19d53b8e51ad70c81be12d50e81c /net/ceph/crush
parente8ef19c4ad161768e1d8309d5ae18481c098eb81 (diff)
downloadlinux-c6d98a603a02594f6ecf16d0a0af989ae9fa7abd.tar.bz2
crush: return CRUSH_ITEM_UNDEF for failed placements with indep
For firstn mode, if we fail to make a valid placement choice, we just continue and return a short result to the caller. For indep mode, however, we need to make the position stable, and return an undefined value on failed placements to avoid shifting later results to the left. Reflects ceph.git commit b1d4dd4eb044875874a1d01c01c7d766db5d0a80. Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph/crush')
-rw-r--r--net/ceph/crush/mapper.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ceph/crush/mapper.c b/net/ceph/crush/mapper.c
index dcf48bc504ea..a8605245d190 100644
--- a/net/ceph/crush/mapper.c
+++ b/net/ceph/crush/mapper.c
@@ -455,8 +455,12 @@ reject:
} while (retry_descent);
if (skip_rep) {
- dprintk("skip rep\n");
- continue;
+ if (firstn) {
+ dprintk("skip rep\n");
+ continue;
+ }
+ dprintk("undef rep, continuing\n");
+ item = CRUSH_ITEM_UNDEF;
}
dprintk("CHOOSE got %d\n", item);