From d9dfa2d17859ca07d735b8e35c5dc00a25995153 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 5 Oct 2012 09:10:31 -0700 Subject: [PATCH] osd: Make --get-journal-fsid not really start the osd. 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 --- src/ceph_osd.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index afb3d02e53cd..a823befed55f 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -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); -- 2.47.3