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

osd: Make --get-journal-fsid not really start the osd.

Browse Source 
This way, it won't need -i ID and it won't access the osd_data_dir.
That makes it useful for locating the right osd to use with an
external journal partition.

Signed-off-by: Tommi Virtanen <tv@inktank.com>
This commit is contained in:
Sage Weil 2012-10-05 09:10:31 -07:00 committed by Tommi Virtanen
parent 435a5c1435
commit 8d718caf00
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ceph_osd.cc
View File

@ -265,6 +265,14 @@ int main(int argc, const char **argv)
exit(0);
}
if (get_journal_fsid) {
uuid_d fsid;
int r = OSD::peek_journal_fsid(g_conf->osd_journal, fsid);
if (r == 0)
cout << fsid << std::endl;
exit(r);
}
string magic;
uuid_d cluster_fsid, osd_fsid;
int w;
@ -297,13 +305,6 @@ int main(int argc, const char **argv)
cout << osd_fsid << std::endl;
exit(0);
}
if (get_journal_fsid) {
uuid_d fsid;
int r = OSD::peek_journal_fsid(g_conf->osd_journal, fsid);
if (r == 0)
cout << fsid << std::endl;
exit(r);
}
pick_addresses(g_ceph_context);