From f174bbead449a11491b3fc4ab4d1a6db3d304a3f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 31 Oct 2018 11:12:04 -0500 Subject: [PATCH] msg: standarize on v1: and v2: prefixes for *all* entity_addr_t's This is more consistent than 1.2.3.4:0/0 being v1 and msgr2:1.2.3.4:0/0 being v2. Signed-off-by: Sage Weil --- src/msg/msg_types.cc | 14 ++-- src/msg/msg_types.h | 4 +- src/test/cli/monmaptool/add-exists.t | 2 +- src/test/cli/monmaptool/add-many.t | 6 +- src/test/cli/monmaptool/clobber.t | 2 +- src/test/cli/monmaptool/create-with-add.t | 2 +- src/test/cli/monmaptool/rm-nonexistent.t | 2 +- src/test/common/dns_resolve.cc | 14 ++-- src/test/msgr/test_msgr.cc | 4 +- src/test/test_addrs.cc | 80 +++++++++++------------ src/test/test_ipaddr.cc | 38 +++++------ src/vstart.sh | 4 +- 12 files changed, 85 insertions(+), 87 deletions(-) diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc index 3b9fc7c17ad..8b87647bcb2 100644 --- a/src/msg/msg_types.cc +++ b/src/msg/msg_types.cc @@ -69,11 +69,11 @@ bool entity_addr_t::parse(const char *s, const char **end) const char *start = s; int newtype = TYPE_DEFAULT; - if (strncmp("legacy:", s, 7) == 0) { - start += 7; + if (strncmp("v1:", s, 3) == 0) { + start += 3; newtype = TYPE_LEGACY; - } else if (strncmp("msgr2:", s, 6) == 0) { - start += 6; + } else if (strncmp("v2:", s, 3) == 0) { + start += 3; newtype = TYPE_MSGR2; } else if (*s == '-') { *this = entity_addr_t(); @@ -172,10 +172,8 @@ ostream& operator<<(ostream& out, const entity_addr_t &addr) if (addr.type == entity_addr_t::TYPE_NONE) { return out << "-"; } - if (addr.type != entity_addr_t::TYPE_DEFAULT) { - out << entity_addr_t::get_type_name(addr.type) << ":"; - } - out << addr.get_sockaddr() << '/' << addr.nonce; + out << entity_addr_t::get_type_name(addr.type) << ":" + << addr.get_sockaddr() << '/' << addr.nonce; return out; } diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h index 826cc722cfb..d49b39ff32a 100644 --- a/src/msg/msg_types.h +++ b/src/msg/msg_types.h @@ -237,8 +237,8 @@ struct entity_addr_t { static const char *get_type_name(int t) { switch (t) { case TYPE_NONE: return "none"; - case TYPE_LEGACY: return "legacy"; - case TYPE_MSGR2: return "msgr2"; + case TYPE_LEGACY: return "v1"; + case TYPE_MSGR2: return "v2"; default: return "???"; } }; diff --git a/src/test/cli/monmaptool/add-exists.t b/src/test/cli/monmaptool/add-exists.t index 130c88cbfb6..daeacbc52c4 100644 --- a/src/test/cli/monmaptool/add-exists.t +++ b/src/test/cli/monmaptool/add-exists.t @@ -25,7 +25,7 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) - 0: 2.3.4.5:6789/0 mon.foo + 0: v1:2.3.4.5:6789/0 mon.foo $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)" $ [ "$ORIG_FSID" = "$NEW_FSID" ] diff --git a/src/test/cli/monmaptool/add-many.t b/src/test/cli/monmaptool/add-many.t index 187adf8f95e..1b19a41ec5a 100644 --- a/src/test/cli/monmaptool/add-many.t +++ b/src/test/cli/monmaptool/add-many.t @@ -21,9 +21,9 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) - 0: 2.3.4.5:6789/0 mon.foo - 1: 3.4.5.6:7890/0 mon.bar - 2: 4.5.6.7:8901/0 mon.baz + 0: v1:2.3.4.5:6789/0 mon.foo + 1: v1:3.4.5.6:7890/0 mon.bar + 2: v1:4.5.6.7:8901/0 mon.baz $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)" $ [ "$ORIG_FSID" = "$NEW_FSID" ] diff --git a/src/test/cli/monmaptool/clobber.t b/src/test/cli/monmaptool/clobber.t index 9f038abfe07..2a1dd17ec37 100644 --- a/src/test/cli/monmaptool/clobber.t +++ b/src/test/cli/monmaptool/clobber.t @@ -17,7 +17,7 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) - 0: 2.3.4.5:6789/0 mon.foo + 0: v1:2.3.4.5:6789/0 mon.foo $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)" $ [ "$ORIG_FSID" = "$NEW_FSID" ] diff --git a/src/test/cli/monmaptool/create-with-add.t b/src/test/cli/monmaptool/create-with-add.t index 783642a1a69..efcf5c6ff2f 100644 --- a/src/test/cli/monmaptool/create-with-add.t +++ b/src/test/cli/monmaptool/create-with-add.t @@ -9,4 +9,4 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) - 0: 2.3.4.5:6789/0 mon.foo + 0: v1:2.3.4.5:6789/0 mon.foo diff --git a/src/test/cli/monmaptool/rm-nonexistent.t b/src/test/cli/monmaptool/rm-nonexistent.t index efba162558c..433750d7b24 100644 --- a/src/test/cli/monmaptool/rm-nonexistent.t +++ b/src/test/cli/monmaptool/rm-nonexistent.t @@ -23,7 +23,7 @@ fsid [0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12} (re) last_changed \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) created \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ (re) - 0: 2.3.4.5:6789/0 mon.foo + 0: v1:2.3.4.5:6789/0 mon.foo $ NEW_FSID="$(monmaptool --print mymonmap|grep ^fsid)" $ [ "$ORIG_FSID" = "$NEW_FSID" ] diff --git a/src/test/common/dns_resolve.cc b/src/test/common/dns_resolve.cc index b54825877b8..937b4a2fd6a 100644 --- a/src/test/common/dns_resolve.cc +++ b/src/test/common/dns_resolve.cc @@ -64,7 +64,7 @@ TEST_F(DNSResolverTest, resolve_ip_addr) { std::ostringstream os; os << addr; - ASSERT_EQ(os.str(), "192.168.1.11:0/0"); + ASSERT_EQ(os.str(), "v1:192.168.1.11:0/0"); } TEST_F(DNSResolverTest, resolve_ip_addr_fail) { @@ -146,17 +146,17 @@ TEST_F(DNSResolverTest, resolve_srv_hosts_empty_domain) { ASSERT_NE(it, records.end()); std::ostringstream os; os << it->second.addr; - ASSERT_EQ(os.str(), "192.168.1.11:6789/0"); + ASSERT_EQ(os.str(), "v1:192.168.1.11:6789/0"); os.str(""); it = records.find("mon.b"); ASSERT_NE(it, records.end()); os << it->second.addr; - ASSERT_EQ(os.str(), "192.168.1.12:6789/0"); + ASSERT_EQ(os.str(), "v1:192.168.1.12:6789/0"); os.str(""); it = records.find("mon.c"); ASSERT_NE(it, records.end()); os << it->second.addr; - ASSERT_EQ(os.str(), "192.168.1.13:6789/0"); + ASSERT_EQ(os.str(), "v1:192.168.1.13:6789/0"); } TEST_F(DNSResolverTest, resolve_srv_hosts_full_domain) { @@ -216,17 +216,17 @@ TEST_F(DNSResolverTest, resolve_srv_hosts_full_domain) { ASSERT_NE(it, records.end()); std::ostringstream os; os << it->second.addr; - ASSERT_EQ(os.str(), "192.168.1.11:6789/0"); + ASSERT_EQ(os.str(), "v1:192.168.1.11:6789/0"); os.str(""); it = records.find("mon.b"); ASSERT_NE(it, records.end()); os << it->second.addr; - ASSERT_EQ(os.str(), "192.168.1.12:6789/0"); + ASSERT_EQ(os.str(), "v1:192.168.1.12:6789/0"); os.str(""); it = records.find("mon.c"); ASSERT_NE(it, records.end()); os << it->second.addr; - ASSERT_EQ(os.str(), "192.168.1.13:6789/0"); + ASSERT_EQ(os.str(), "v1:192.168.1.13:6789/0"); } TEST_F(DNSResolverTest, resolve_srv_hosts_fail) { diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc index 3e8063f9933..c8638f34229 100644 --- a/src/test/msgr/test_msgr.cc +++ b/src/test/msgr/test_msgr.cc @@ -298,9 +298,9 @@ TEST_P(MessengerTest, SimpleTest) { TEST_P(MessengerTest, SimpleMsgr2Test) { FakeDispatcher cli_dispatcher(false), srv_dispatcher(true); entity_addr_t legacy_addr; - legacy_addr.parse("127.0.0.1"); + legacy_addr.parse("v1:127.0.0.1"); entity_addr_t msgr2_addr; - msgr2_addr.parse("msgr2:127.0.0.1"); + msgr2_addr.parse("v2:127.0.0.1"); entity_addrvec_t bind_addrs; bind_addrs.v.push_back(legacy_addr); bind_addrs.v.push_back(msgr2_addr); diff --git a/src/test/test_addrs.cc b/src/test/test_addrs.cc index e96084576e0..20dd5ce1dfa 100644 --- a/src/test/test_addrs.cc +++ b/src/test/test_addrs.cc @@ -22,29 +22,29 @@ // input, parsed+printed addr output, leftover // if the parse fails, output + leftover should both be blank. const char *addr_checks[][3] = { - { "127.0.0.1", "127.0.0.1:0/0", "" }, - { "127.0.0.1 foo", "127.0.0.1:0/0", " foo" }, - { "127.0.0.1:1234 foo", "127.0.0.1:1234/0", " foo" }, - { "127.0.0.1:1234/5678 foo", "127.0.0.1:1234/5678", " foo" }, + { "127.0.0.1", "v1:127.0.0.1:0/0", "" }, + { "127.0.0.1 foo", "v1:127.0.0.1:0/0", " foo" }, + { "127.0.0.1:1234 foo", "v1:127.0.0.1:1234/0", " foo" }, + { "127.0.0.1:1234/5678 foo", "v1:127.0.0.1:1234/5678", " foo" }, { "1.2.3:4 a", "", "" }, - { "2607:f298:4:2243::5522", "[2607:f298:4:2243::5522]:0/0", "" }, - { "[2607:f298:4:2243::5522]", "[2607:f298:4:2243::5522]:0/0", "" }, + { "2607:f298:4:2243::5522", "v1:[2607:f298:4:2243::5522]:0/0", "" }, + { "[2607:f298:4:2243::5522]", "v1:[2607:f298:4:2243::5522]:0/0", "" }, { "2607:f298:4:2243::5522a", "", "" }, - { "[2607:f298:4:2243::5522]a", "[2607:f298:4:2243::5522]:0/0", "a" }, - { "[2607:f298:4:2243::5522]:1234a", "[2607:f298:4:2243::5522]:1234/0", "a" }, - { "2001:0db8:85a3:0000:0000:8a2e:0370:7334", "[2001:db8:85a3::8a2e:370:7334]:0/0", "" }, - { "2001:2db8:85a3:4334:4324:8a2e:1370:7334", "[2001:2db8:85a3:4334:4324:8a2e:1370:7334]:0/0", "" }, - { "::", "[::]:0/0", "" }, - { "::zz", "[::]:0/0", "zz" }, - { ":: 12:34", "[::]:0/0", " 12:34" }, + { "[2607:f298:4:2243::5522]a", "v1:[2607:f298:4:2243::5522]:0/0", "a" }, + { "[2607:f298:4:2243::5522]:1234a", "v1:[2607:f298:4:2243::5522]:1234/0", "a" }, + { "2001:0db8:85a3:0000:0000:8a2e:0370:7334", "v1:[2001:db8:85a3::8a2e:370:7334]:0/0", "" }, + { "2001:2db8:85a3:4334:4324:8a2e:1370:7334", "v1:[2001:2db8:85a3:4334:4324:8a2e:1370:7334]:0/0", "" }, + { "::", "v1:[::]:0/0", "" }, + { "::zz", "v1:[::]:0/0", "zz" }, + { ":: 12:34", "v1:[::]:0/0", " 12:34" }, { "-", "-", "" }, { "-asdf", "-", "asdf" }, - { "legacy:1.2.3.4", "1.2.3.4:0/0", "" }, - { "legacy:1.2.3.4:12", "1.2.3.4:12/0", "" }, - { "legacy:1.2.3.4:12/34", "1.2.3.4:12/34", "" }, - { "msgr2:1.2.3.4", "msgr2:1.2.3.4:0/0", "" }, - { "msgr2:1.2.3.4:12", "msgr2:1.2.3.4:12/0", "" }, - { "msgr2:1.2.3.4:12/34", "msgr2:1.2.3.4:12/34", "" }, + { "v1:1.2.3.4", "v1:1.2.3.4:0/0", "" }, + { "v1:1.2.3.4:12", "v1:1.2.3.4:12/0", "" }, + { "v1:1.2.3.4:12/34", "v1:1.2.3.4:12/34", "" }, + { "v2:1.2.3.4", "v2:1.2.3.4:0/0", "" }, + { "v2:1.2.3.4:12", "v2:1.2.3.4:12/0", "" }, + { "v2:1.2.3.4:12/34", "v2:1.2.3.4:12/34", "" }, { NULL, NULL, NULL }, }; @@ -70,19 +70,19 @@ TEST(Msgr, TestAddrParsing) } const char *addr_checks2[][3] = { - { "127.0.0.1", "127.0.0.1:0/0", "" }, - { "127.0.0.1 foo", "127.0.0.1:0/0", " foo" }, - { "127.0.0.1:1234 foo", "127.0.0.1:1234/0", " foo" }, - { "127.0.0.1:1234/5678 foo", "127.0.0.1:1234/5678", " foo" }, - { "2607:f298:4:2243::5522", "[2607:f298:4:2243::5522]:0/0", "" }, - { "[2607:f298:4:2243::5522]", "[2607:f298:4:2243::5522]:0/0", "" }, - { "[2607:f298:4:2243::5522]a", "[2607:f298:4:2243::5522]:0/0", "a" }, - { "[2607:f298:4:2243::5522]:1234a", "[2607:f298:4:2243::5522]:1234/0", "a" }, - { "2001:0db8:85a3:0000:0000:8a2e:0370:7334", "[2001:db8:85a3::8a2e:370:7334]:0/0", "" }, - { "2001:2db8:85a3:4334:4324:8a2e:1370:7334", "[2001:2db8:85a3:4334:4324:8a2e:1370:7334]:0/0", "" }, - { "legacy:1.2.3.4", "1.2.3.4:0/0", "" }, - { "legacy:1.2.3.4:12", "1.2.3.4:12/0", "" }, - { "legacy:1.2.3.4:12/34", "1.2.3.4:12/34", "" }, + { "127.0.0.1", "v1:127.0.0.1:0/0", "" }, + { "127.0.0.1 foo", "v1:127.0.0.1:0/0", " foo" }, + { "127.0.0.1:1234 foo", "v1:127.0.0.1:1234/0", " foo" }, + { "127.0.0.1:1234/5678 foo", "v1:127.0.0.1:1234/5678", " foo" }, + { "2607:f298:4:2243::5522", "v1:[2607:f298:4:2243::5522]:0/0", "" }, + { "[2607:f298:4:2243::5522]", "v1:[2607:f298:4:2243::5522]:0/0", "" }, + { "[2607:f298:4:2243::5522]a", "v1:[2607:f298:4:2243::5522]:0/0", "a" }, + { "[2607:f298:4:2243::5522]:1234a", "v1:[2607:f298:4:2243::5522]:1234/0", "a" }, + { "2001:0db8:85a3:0000:0000:8a2e:0370:7334", "v1:[2001:db8:85a3::8a2e:370:7334]:0/0", "" }, + { "2001:2db8:85a3:4334:4324:8a2e:1370:7334", "v1:[2001:2db8:85a3:4334:4324:8a2e:1370:7334]:0/0", "" }, + { "v1:1.2.3.4", "v1:1.2.3.4:0/0", "" }, + { "v1:1.2.3.4:12", "v1:1.2.3.4:12/0", "" }, + { "v1:1.2.3.4:12/34", "v1:1.2.3.4:12/34", "" }, { NULL, NULL, NULL }, }; @@ -132,10 +132,10 @@ TEST(Msgr, TestEmptyAddrvecEncodeAddrDecode) } const char *addrvec_checks[][4] = { - { "legacy:1.2.3.4", "msgr2:1.2.3.4", "legacy:1.2.3.4", "msgr2:1.2.3.4" }, - { "msgr2:1.2.3.5", "legacy:1.2.3.5", "legacy:1.2.3.5", "msgr2:1.2.3.5" }, - { "msgr2:1.2.3.6", "msgr2:1.2.3.6", "legacy:1.2.3.6", "msgr2:1.2.3.6" }, - { "msgr2:1.2.3.7", "legacy:1.2.3.7", "legacy:1.2.3.7", "msgr2:1.2.3.7" }, + { "v1:1.2.3.4", "v2:1.2.3.4", "v1:1.2.3.4", "v2:1.2.3.4" }, + { "v2:1.2.3.5", "v1:1.2.3.5", "v1:1.2.3.5", "v2:1.2.3.5" }, + { "v2:1.2.3.6", "v2:1.2.3.6", "v1:1.2.3.6", "v2:1.2.3.6" }, + { "v2:1.2.3.7", "v1:1.2.3.7", "v1:1.2.3.7", "v2:1.2.3.7" }, { NULL, NULL, NULL, NULL }, }; @@ -240,10 +240,10 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode3) } const char *addrvec_parse_checks[][3] = { - { "127.0.0.1", "127.0.0.1:0/0", "" }, - { "127.0.0.1 foo", "127.0.0.1:0/0", " foo" }, - { "127.0.0.1 1.2.3.4 foo", "[127.0.0.1:0/0,1.2.3.4:0/0]", " foo" }, - { "127.0.0.1 :: - foo", "[127.0.0.1:0/0,[::]:0/0,-]", " foo" }, + { "127.0.0.1", "v1:127.0.0.1:0/0", "" }, + { "127.0.0.1 foo", "v1:127.0.0.1:0/0", " foo" }, + { "127.0.0.1 1.2.3.4 foo", "[v1:127.0.0.1:0/0,v1:1.2.3.4:0/0]", " foo" }, + { "127.0.0.1 :: - foo", "[v1:127.0.0.1:0/0,v1:[::]:0/0,-]", " foo" }, { NULL, NULL, NULL }, }; diff --git a/src/test/test_ipaddr.cc b/src/test/test_ipaddr.cc index ac7067d3c00..1bac1817bd4 100644 --- a/src/test/test_ipaddr.cc +++ b/src/test/test_ipaddr.cc @@ -688,7 +688,7 @@ TEST(pick_address, filtering) cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(1u, av.v.size()); - ASSERT_EQ(string("0.0.0.0:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v1:0.0.0.0:0/0"), stringify(av.v[0])); } { int r = pick_addresses(cct, @@ -699,7 +699,7 @@ TEST(pick_address, filtering) cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(1u, av.v.size()); - ASSERT_EQ(string("[::]:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v1:[::]:0/0"), stringify(av.v[0])); } { cct->_conf.set_val("public_network", "10.2.0.0/16"); @@ -711,7 +711,7 @@ TEST(pick_address, filtering) cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(1u, av.v.size()); - ASSERT_EQ(string("10.2.1.123:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v1:10.2.1.123:0/0"), stringify(av.v[0])); cct->_conf.set_val("public_network", ""); } { @@ -720,12 +720,12 @@ TEST(pick_address, filtering) int r = pick_addresses(cct, CEPH_PICK_ADDRESS_PUBLIC | CEPH_PICK_ADDRESS_IPV4 | - CEPH_PICK_ADDRESS_MSGR1, + CEPH_PICK_ADDRESS_MSGR2, &one, &av); cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(1u, av.v.size()); - ASSERT_EQ(string("10.2.1.123:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v2:10.2.1.123:0/0"), stringify(av.v[0])); cct->_conf.set_val("public_network", ""); cct->_conf.set_val("public_network_interface", ""); } @@ -735,12 +735,12 @@ TEST(pick_address, filtering) int r = pick_addresses(cct, CEPH_PICK_ADDRESS_PUBLIC | CEPH_PICK_ADDRESS_IPV4 | - CEPH_PICK_ADDRESS_MSGR1, + CEPH_PICK_ADDRESS_MSGR2, &one, &av); cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(1u, av.v.size()); - ASSERT_EQ(string("10.2.1.123:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v2:10.2.1.123:0/0"), stringify(av.v[0])); cct->_conf.set_val("public_network", ""); cct->_conf.set_val("cluster_network", ""); } @@ -755,7 +755,7 @@ TEST(pick_address, filtering) cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(1u, av.v.size()); - ASSERT_EQ(string("10.1.1.2:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v1:10.1.1.2:0/0"), stringify(av.v[0])); cct->_conf.set_val("public_network", ""); cct->_conf.set_val("cluster_network", ""); } @@ -765,12 +765,12 @@ TEST(pick_address, filtering) int r = pick_addresses(cct, CEPH_PICK_ADDRESS_PUBLIC | CEPH_PICK_ADDRESS_IPV6 | - CEPH_PICK_ADDRESS_MSGR1, + CEPH_PICK_ADDRESS_MSGR2, &one, &av); cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(1u, av.v.size()); - ASSERT_EQ(string("[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v2:[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[0])); cct->_conf.set_val("public_network", ""); } { @@ -780,13 +780,13 @@ TEST(pick_address, filtering) CEPH_PICK_ADDRESS_PUBLIC | CEPH_PICK_ADDRESS_IPV4 | CEPH_PICK_ADDRESS_IPV6 | - CEPH_PICK_ADDRESS_MSGR1, + CEPH_PICK_ADDRESS_MSGR2, &one, &av); cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(2u, av.v.size()); - ASSERT_EQ(string("[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[0])); - ASSERT_EQ(string("10.2.1.123:0/0"), stringify(av.v[1])); + ASSERT_EQ(string("v2:[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v2:10.2.1.123:0/0"), stringify(av.v[1])); cct->_conf.set_val("public_network", ""); cct->_conf.set_val("public_network_interface", ""); } @@ -803,8 +803,8 @@ TEST(pick_address, filtering) cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(2u, av.v.size()); - ASSERT_EQ(string("10.2.1.123:0/0"), stringify(av.v[0])); - ASSERT_EQ(string("[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[1])); + ASSERT_EQ(string("v1:10.2.1.123:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v1:[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[1])); cct->_conf.set_val("public_network", ""); cct->_conf.set_val("public_network_interface", ""); } @@ -820,8 +820,8 @@ TEST(pick_address, filtering) cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(2u, av.v.size()); - ASSERT_EQ(string("msgr2:[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[0])); - ASSERT_EQ(string("[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[1])); + ASSERT_EQ(string("v2:[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v1:[2001:1234:5678:90ab::cdef]:0/0"), stringify(av.v[1])); cct->_conf.set_val("public_network", ""); } @@ -835,7 +835,7 @@ TEST(pick_address, filtering) cout << av << std::endl; ASSERT_EQ(0, r); ASSERT_EQ(2u, av.v.size()); - ASSERT_EQ(string("msgr2:0.0.0.0:0/0"), stringify(av.v[0])); - ASSERT_EQ(string("0.0.0.0:0/0"), stringify(av.v[1])); + ASSERT_EQ(string("v2:0.0.0.0:0/0"), stringify(av.v[0])); + ASSERT_EQ(string("v1:0.0.0.0:0/0"), stringify(av.v[1])); } } diff --git a/src/vstart.sh b/src/vstart.sh index f04f5b47c85..a497ad3c326 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -653,12 +653,12 @@ start_mon() { local count=0 for f in $MONS do - str="$str --add $f msgr2:$IP:$(($CEPH_PORT+$count))" + str="$str --add $f v2:$IP:$(($CEPH_PORT+$count))" wconf <