From ae8b0cd62a0a3da0eb4062ed57429f527e2a5d07 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 21 Dec 2018 08:38:00 -0600 Subject: [PATCH] osd/OSDMap: maintain compat addr fields Fixes b47d9135d5345816037899cd1d12a5a20b54e6c1 and 9fb1e521c7c75c124b0dbf193e8b65ff1b5f461e. Signed-off-by: Sage Weil --- src/osd/OSDMap.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 660d0fbfe816d..3c0479e9f7032 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -3222,12 +3222,17 @@ void OSDMap::dump(Formatter *f) const f->dump_float("weight", get_weightf(i)); f->dump_float("primary_affinity", get_primary_affinityf(i)); get_info(i).dump(f); - f->dump_stream("public_addr") << get_addrs(i).legacy_addr(); f->dump_object("public_addrs", get_addrs(i)); - f->dump_stream("cluster_addr") << get_cluster_addrs(i).legacy_addr(); f->dump_object("cluster_addrs", get_cluster_addrs(i)); f->dump_object("heartbeat_back_addrs", get_hb_back_addrs(i)); - f->dump_object("heartbeat_front_addr", get_hb_front_addrs(i)); + f->dump_object("heartbeat_front_addrs", get_hb_front_addrs(i)); + // compat + f->dump_stream("public_addr") << get_addrs(i).get_legacy_str(); + f->dump_stream("cluster_addr") << get_cluster_addrs(i).get_legacy_str(); + f->dump_stream("heartbeat_back_addr") + << get_hb_back_addrs(i).get_legacy_str(); + f->dump_stream("heartbeat_front_addr") + << get_hb_front_addrs(i).get_legacy_str(); set st; get_state(i, st); -- 2.39.5