From c67d204635c20e07ca6e84d0e196097adda4617b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 20 Jun 2016 13:26:47 -0400 Subject: [PATCH] msg: set addr type when creating from scratch Signed-off-by: Sage Weil --- src/mon/MonMap.cc | 1 + src/msg/msg_types.cc | 1 + src/osd/osd_types.cc | 1 + src/osd/osd_types.h | 1 + 4 files changed, 4 insertions(+) diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc index 144986b03f824..b253c20799f1a 100644 --- a/src/mon/MonMap.cc +++ b/src/mon/MonMap.cc @@ -228,6 +228,7 @@ void MonMap::set_initial_members(CephContext *cct, add(*p, my_addr); } else { entity_addr_t a; + a.set_type(entity_addr_t::TYPE_LEGACY); a.set_family(AF_INET); for (int n=1; ; n++) { a.set_nonce(n); diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc index b2294a2876e54..1d118e9455c99 100644 --- a/src/msg/msg_types.cc +++ b/src/msg/msg_types.cc @@ -41,6 +41,7 @@ void entity_addr_t::generate_test_instances(list& o) a->set_nonce(1); o.push_back(a); entity_addr_t *b = new entity_addr_t(); + b->set_type(entity_addr_t::TYPE_LEGACY); b->set_nonce(5); b->set_family(AF_INET); b->set_in4_quad(0, 127); diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index f5510c776e9ff..f95387b1ec782 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -4425,6 +4425,7 @@ void watch_info_t::generate_test_instances(list& o) o.back()->cookie = 123; o.back()->timeout_seconds = 99; entity_addr_t ea; + ea.set_type(entity_addr_t::TYPE_LEGACY); ea.set_nonce(1); ea.set_family(AF_INET); ea.set_in4_quad(0, 127); diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 2593d4b465b59..7b8834e026a88 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -4556,6 +4556,7 @@ struct obj_list_watch_response_t { entity_addr_t ea; o.push_back(new obj_list_watch_response_t); o.push_back(new obj_list_watch_response_t); + ea.set_type(entity_addr_t::TYPE_LEGACY); ea.set_nonce(1000); ea.set_family(AF_INET); ea.set_in4_quad(0, 127); -- 2.39.5