RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from renhwztetecs/renhw-wip-moninit-cleanup

Browse Source 
mon: clean up in ceph_mon.cc

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Jos Collin <jcollin@redhat.com>
This commit is contained in:
Joao Eduardo Luis 2017-06-28 14:36:02 +02:00 committed by GitHub
commit 40f023c2bc
1 changed files with 11 additions and 11 deletions

22
src/ceph_mon.cc
View File

@ -368,8 +368,8 @@ int main(int argc, const char **argv)
string name;
monmap.get_addr_name(a, name);
monmap.rename(name, g_conf->name.get_id());
cout << argv[0] << ": renaming mon." << name << " " << a
<< " to mon." << g_conf->name.get_id() << std::endl;
dout(0) << argv[0] << ": renaming mon." << name << " " << a
<< " to mon." << g_conf->name.get_id() << dendl;
}
} else {
// is a local address listed without a name? if so, name myself.
@ -382,12 +382,12 @@ int main(int argc, const char **argv)
monmap.get_addr_name(local, name);
if (name.compare(0, 7, "noname-") == 0) {
cout << argv[0] << ": mon." << name << " " << local
<< " is local, renaming to mon." << g_conf->name.get_id() << std::endl;
dout(0) << argv[0] << ": mon." << name << " " << local
<< " is local, renaming to mon." << g_conf->name.get_id() << dendl;
monmap.rename(name, g_conf->name.get_id());
} else {
cout << argv[0] << ": mon." << name << " " << local
<< " is local, but not 'noname-' + something; not assuming it's me" << std::endl;
dout(0) << argv[0] << ": mon." << name << " " << local
<< " is local, but not 'noname-' + something; not assuming it's me" << dendl;
}
}
}
@ -395,7 +395,7 @@ int main(int argc, const char **argv)
if (!g_conf->fsid.is_zero()) {
monmap.fsid = g_conf->fsid;
cout << argv[0] << ": set fsid to " << g_conf->fsid << std::endl;
dout(0) << argv[0] << ": set fsid to " << g_conf->fsid << dendl;
}
if (monmap.fsid.is_zero()) {
@ -435,8 +435,8 @@ int main(int argc, const char **argv)
exit(1);
}
store.close();
cout << argv[0] << ": created monfs at " << g_conf->mon_data
<< " for " << g_conf->name << std::endl;
dout(0) << argv[0] << ": created monfs at " << g_conf->mon_data
<< " for " << g_conf->name << dendl;
return 0;
}
@ -726,11 +726,11 @@ int main(int argc, const char **argv)
prefork.exit(1);
}
cout << "starting " << g_conf->name << " rank " << rank
dout(0) << "starting " << g_conf->name << " rank " << rank
<< " at " << ipaddr
<< " mon_data " << g_conf->mon_data
<< " fsid " << monmap.get_fsid()
<< std::endl;
<< dendl;
// start monitor
mon = new Monitor(g_ceph_context, g_conf->name.get_id(), store,