From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Sun, 6 Aug 2017 10:50:17 +0000 (+0800)
Subject: os/bluestore: default journal media to store media if bluefs is disabled
X-Git-Tag: v12.1.3~53^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0fc6a5feb3fa4fd2e545a83483c45b2b6e067cb6;p=ceph.git

os/bluestore: default journal media to store media if bluefs is disabled

So we won't prevent bluestore-without-bluefs backed OSDs from booting:
0> 2017-08-06 18:28:07.431316 7ffa1c95fd00 -1 /home/xxg/build/ceph-dev/src/os/bluestore/BlueStore.cc: In function
'virtual bool BlueStore::is_journal_rotational()' thread 7ffa1c95fd00 time 2017-08-06 18:28:07.428503
/home/xxg/build/ceph-dev/src/os/bluestore/BlueStore.cc: 4401: FAILED assert(bluefs)

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index e28f6e757fae..9d25453838c2 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -4398,7 +4398,11 @@ bool BlueStore::is_rotational()
 
 bool BlueStore::is_journal_rotational()
 {
-  assert(bluefs);
+  if (!bluefs) {
+    dout(5) << __func__ << " bluefs disabled, default to store media type"
+            << dendl;
+    return is_rotational();
+  }
   dout(10) << __func__ << " " << (int)bluefs->wal_is_rotational() << dendl;
   return bluefs->wal_is_rotational();
 }