msg: set addr type when creating from scratch

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 144986b03f8241b38fd4216076e43e044dac2be4..b253c20799f1a0ec636f6a28b1b6d801e70807d1 100644 (file)
--- 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 b2294a2876e5487945ad62d9b90b1f9f6811c1d2..1d118e9455c9983a68786f80010c04fdcd5afad5 100644 (file)
--- a/src/msg/msg_types.cc
+++ b/src/msg/msg_types.cc
@@ -41,6 +41,7 @@ void entity_addr_t::generate_test_instances(list<entity_addr_t*>& 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 f5510c776e9ffefe4fede17442fdbcfe77f3a18b..f95387b1ec7829292ad65462136d5ff65ea4988a 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -4425,6 +4425,7 @@ void watch_info_t::generate_test_instances(list<watch_info_t*>& 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 2593d4b465b59c1aae7e15c2698b26e21910e494..7b8834e026a88179c831e8c45957e13f9e52f351 100644 (file)
--- 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);