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

osd: don't block on mon negotiation on startup

Browse Source 
That means we don't check for monmap vs ondisk fsid checks and
such.  They're mostly useless anyway.
This commit is contained in:
Sage Weil 2010-02-11 16:18:54 -08:00
parent 315c8cd9d3
commit 8538efc5c2
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cosd.cc
View File

@ -96,11 +96,12 @@ int main(int argc, const char **argv)
MonClient mc(&rkeys);
if (mc.build_initial_monmap() < 0)
return -1;
if (mc.get_monmap_privately() < 0)
return -1;
char buf[80];
if (mkfs) {
if (mc.get_monmap_privately() < 0)
return -1;
int err = OSD::mkfs(g_conf.osd_data, g_conf.osd_journal, mc.monmap.fsid, whoami);
if (err < 0) {
cerr << "error creating empty object store in " << g_conf.osd_data << ": " << strerror_r(-err, buf, sizeof(buf)) << std::endl;
@ -130,14 +131,6 @@ int main(int argc, const char **argv)
cerr << "OSD magic " << magic << " != my " << CEPH_OSD_ONDISK_MAGIC << std::endl;
exit(1);
}
if (ceph_fsid_compare(&fsid, &mc.monmap.fsid)) {
cerr << "OSD fsid " << fsid << " != monmap fsid " << mc.monmap.fsid << std::endl;
exit(1);
}
// start up network
g_my_addr.ss_addr() = mc.get_my_addr().ss_addr();
g_my_addr.set_port(0);
SimpleMessenger *messenger = new SimpleMessenger();
SimpleMessenger *messenger_hb = new SimpleMessenger();
@ -148,7 +141,6 @@ int main(int argc, const char **argv)
<< " at " << messenger->get_ms_addr()
<< " osd_data " << g_conf.osd_data
<< " " << ((g_conf.osd_journal && g_conf.osd_journal[0]) ? g_conf.osd_journal:"(no journal)")
<< " fsid " << mc.monmap.fsid
<< std::endl;
g_timer.shutdown();

5
src/osd/OSD.cc
View File

@ -693,11 +693,6 @@ int OSD::read_superblock()
}
}
if (ceph_fsid_compare(&superblock.fsid, &monc->get_fsid())) {
derr(0) << "read_superblock fsid " << superblock.fsid << " != monmap " << monc->get_fsid() << dendl;
return -1;
}
if (whoami != superblock.whoami) {
derr(0) << "read_superblock superblock says osd" << superblock.whoami
<< ", but i (think i) am osd" << whoami << dendl;