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

config: parse fsid uuid in config, not ceph_mon

Browse Source 
Use the new OPT_UUID type.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
This commit is contained in:
Sage Weil 2012-04-04 22:29:08 -07:00 committed by Sage Weil
parent 2c14c8b206
commit cfee0333e7
5 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ceph_mon.cc
View File

@ -174,13 +174,9 @@ int main(int argc, const char **argv)
}
}
if (!g_conf->fsid.empty()) {
if (!monmap.fsid.parse(g_conf->fsid.c_str())) {
cerr << "unable to parse fsid '" << g_conf->fsid << "'" << std::endl;
exit(1);
} else {
cout << argv[0] << ": set fsid to " << g_conf->fsid << std::endl;
}
if (!g_conf->fsid.is_zero()) {
monmap.fsid = g_conf->fsid;
cout << argv[0] << ": set fsid to " << g_conf->fsid << std::endl;
}
if (monmap.fsid.is_zero()) {

2
src/common/config_opts.h
View File

@ -14,7 +14,7 @@
/* note: no header guard */
OPTION(host, OPT_STR, "localhost")
OPTION(fsid, OPT_STR, "") // used for mkfs
OPTION(fsid, OPT_UUID, uuid_d())
OPTION(public_addr, OPT_ADDR, entity_addr_t())
OPTION(cluster_addr, OPT_ADDR, entity_addr_t())
OPTION(public_network, OPT_STR, "")

2
src/include/uuid.h
View File

@ -19,7 +19,7 @@ struct uuid_d {
memset(&uuid, 0, sizeof(uuid));
}
bool is_zero() {
bool is_zero() const {
return uuid_is_null(uuid);
}

6
src/mon/MonClient.cc
View File

@ -97,10 +97,8 @@ int MonClient::build_initial_monmap(CephContext *cct, MonMap &monmap)
}
// fsid from conf?
if (cct->_conf->fsid.length()) {
if (!monmap.fsid.parse(cct->_conf->fsid.c_str())) {
cerr << " failed to parse fsid '" << cct->_conf->fsid << "'" << std::endl;
}
if (!cct->_conf->fsid.is_zero()) {
monmap.fsid = cct->_conf->fsid;
}
// -m foo?

9
src/monmaptool.cc
View File

@ -124,17 +124,14 @@ int main(int argc, const char **argv)
monmap.created = ceph_clock_now(g_ceph_context);
monmap.last_changed = monmap.created;
srand(getpid() + time(0));
if (g_conf->fsid.empty()) {
if (g_conf->fsid.is_zero()) {
monmap.generate_fsid();
cout << me << ": generated fsid " << monmap.fsid << std::endl;
}
modified = true;
}
if (g_conf->fsid.length()) {
if (!monmap.fsid.parse(g_conf->fsid.c_str())) {
cerr << me << ": failed to parse fsid '" << g_conf->fsid << "'" << std::endl;
exit(1);
}
if (!g_conf->fsid.is_zero()) {
monmap.fsid = g_conf->fsid;
cout << me << ": set fsid to " << monmap.fsid << std::endl;
modified = true;
}