RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-05 15:58:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

monclient: check for monmap_file _first_

Browse Source
This commit is contained in:
Sage Weil 2009-03-11 11:35:08 -07:00
parent 9472dfe16a
commit 20b5620374
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mon/MonClient.cc
View File

@ -83,6 +83,18 @@ int MonClient::get_monmap(MonMap *pmonmap)
{
static string monstr;
if (g_conf.monmap_file) {
// file?
const char *monmap_fn = g_conf.monmap_file;
int r = pmonmap->read(monmap_fn);
if (r >= 0) {
cout << "[opened monmap at " << monmap_fn << " fsid " << pmonmap->fsid << "]" << std::endl;
return 0;
}
cerr << "unable to read monmap from " << monmap_fn << ": " << strerror(errno) << std::endl;
}
if (!g_conf.mon_host) {
// cluster conf?
ConfFile a(g_conf.cluster_conf);
@ -115,18 +127,6 @@ int MonClient::get_monmap(MonMap *pmonmap)
probe_mon(pmonmap) == 0)
return 0;
if (g_conf.monmap_file) {
// file?
const char *monmap_fn = g_conf.monmap_file;
int r = pmonmap->read(monmap_fn);
if (r >= 0) {
cout << "[opened monmap at " << monmap_fn << " fsid " << pmonmap->fsid << "]" << std::endl;
return 0;
}
cerr << "unable to read monmap from " << monmap_fn << ": " << strerror(errno) << std::endl;
}
cerr << "must specify monitor address (-m monaddr) or cluster conf (-C cluster.conf) or monmap file (-M monmap)" << std::endl;
return -1;
}