From: Greg Farnum <gfarnum@redhat.com>
Date: Mon, 26 Feb 2018 21:33:45 +0000 (-0800)
Subject: bluestore: correctly check all block devices to decide if journal is_rotational
X-Git-Tag: v13.0.2~143^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d3fb03e194c8ed99436239bab66d161b8316bca;p=ceph.git

bluestore: correctly check all block devices to decide if journal is_rotational

Fixes: http://tracker.ceph.com/issues/23141

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index df98aae32674..35b4be35b855 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -2448,7 +2448,10 @@ int BlueFS::unlink(const string& dirname, const string& filename)
 
 bool BlueFS::wal_is_rotational()
 {
-  if (!bdev[BDEV_WAL] || bdev[BDEV_WAL]->is_rotational())
-    return true;
-  return false;
+  if (bdev[BDEV_WAL]) {
+    return bdev[BDEV_WAL]->is_rotational();
+  } else if (bdev[BDEV_DB]) {
+    return bdev[BDEV_DB]->is_rotational();
+  }
+  return bdev[BDEV_SLOW]->is_rotational();
 }