summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2011-05-03 12:52:05 -0700
committerSage Weil <sage@newdream.net>2011-05-24 11:52:09 -0700
commit7662d8ff57d2b00ce8f7fe0b60a85efbb2c05652 (patch)
treec87fd023ab2d4749ea32619034bcc813cba9504a /net
parent9db4b3e32778400555d5cc6fb61d4058902d37f7 (diff)
downloadlinux-3.10-7662d8ff57d2b00ce8f7fe0b60a85efbb2c05652.tar.gz
linux-3.10-7662d8ff57d2b00ce8f7fe0b60a85efbb2c05652.tar.bz2
linux-3.10-7662d8ff57d2b00ce8f7fe0b60a85efbb2c05652.zip
libceph: handle new osdmap down/state change encoding
Old incrementals encode a 0 value (nearly always) when an osd goes down. Change that to allow any state bit(s) to be flipped. Special case 0 to mean flip the CEPH_OSD_UP bit to mimic the old behavior. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/osdmap.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index 94f068dda43..e97c3588c3e 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -830,15 +830,20 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
map->osd_addr[osd] = addr;
}
- /* new_down */
+ /* new_state */
ceph_decode_32_safe(p, end, len, bad);
while (len--) {
u32 osd;
+ u8 xorstate;
ceph_decode_32_safe(p, end, osd, bad);
+ xorstate = **(u8 **)p;
(*p)++; /* clean flag */
- pr_info("osd%d down\n", osd);
+ if (xorstate == 0)
+ xorstate = CEPH_OSD_UP;
+ if (xorstate & CEPH_OSD_UP)
+ pr_info("osd%d down\n", osd);
if (osd < map->max_osd)
- map->osd_state[osd] &= ~CEPH_OSD_UP;
+ map->osd_state[osd] ^= xorstate;
}
/* new_weight */