From: Sage Weil <sage@redhat.com>
Date: Mon, 25 Jan 2016 15:21:48 +0000 (-0500)
Subject: ceph-osd: don't mention journal on mkfs
X-Git-Tag: v10.0.4~46^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=43dce135d61c8252be66dd6f746ce7c80f613996;p=ceph.git

ceph-osd: don't mention journal on mkfs

Some backends don't use it, almost all clusters use the default
path, and there'll always be a symlink.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 6c5b7f1835f1..b40b596b25b2 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -277,10 +277,8 @@ int main(int argc, const char **argv)
 	   << g_conf->osd_data << ": " << cpp_strerror(-err) << TEXT_NORMAL << dendl;
       exit(1);
     }
-    derr << "created object store " << g_conf->osd_data;
-    if (!g_conf->osd_journal.empty())
-      *_dout << " journal " << g_conf->osd_journal;
-    *_dout << " for osd." << whoami << " fsid " << mc.monmap.fsid << dendl;
+    derr << "created object store " << g_conf->osd_data
+	 << " for osd." << whoami << " fsid " << mc.monmap.fsid << dendl;
   }
   if (mkkey) {
     common_init_finish(g_ceph_context);