RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 14:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18073 from dragonylffly/wip-check-monitor-address-configuration

Browse Source 
mon: check monitor address configuration

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-10-04 13:58:48 -05:00 committed by GitHub
commit 2ad8c3706b
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ceph_mon.cc
View File

@ -627,11 +627,17 @@ int main(int argc, const char **argv)
std::string mon_addr_str;
if (g_conf->get_val_from_conf_file(my_sections, "mon addr",
mon_addr_str, true) == 0) {
if (conf_addr.parse(mon_addr_str.c_str()) && (ipaddr != conf_addr)) {
derr << "WARNING: 'mon addr' config option " << conf_addr
<< " does not match monmap file" << std::endl
<< " continuing with monmap configuration" << dendl;
}
if (conf_addr.parse(mon_addr_str.c_str())) {
if (conf_addr.get_port() == 0)
conf_addr.set_port(CEPH_MON_PORT);
if (ipaddr != conf_addr) {
derr << "WARNING: 'mon addr' config option " << conf_addr
<< " does not match monmap file" << std::endl
<< " continuing with monmap configuration" << dendl;
}
} else
derr << "WARNING: invalid 'mon addr' config option" << std::endl
<< " continuing with monmap configuration" << dendl;
}
} else {
dout(0) << g_conf->name << " does not exist in monmap, will attempt to join an existing cluster" << dendl;

3
src/msg/msg_types.cc
View File

@ -140,6 +140,9 @@ bool entity_addr_t::parse(const char *s, const char **end)
// parse a port, too!
p++;
int port = atoi(p);
if (port > MAX_PORT_NUMBER) {
return false;
}
set_port(port);
while (*p && *p >= '0' && *p <= '9')
p++;

2
src/msg/msg_types.h
View File

@ -22,6 +22,8 @@
#include "include/blobhash.h"
#include "include/encoding.h"
#define MAX_PORT_NUMBER 65535
namespace ceph {
class Formatter;
}