]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
bluestore: correctly check all block devices to decide if journal is_rotational 20602/head
authorGreg Farnum <gfarnum@redhat.com>
Mon, 26 Feb 2018 21:33:45 +0000 (13:33 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Mon, 26 Feb 2018 21:36:07 +0000 (13:36 -0800)
Fixes: http://tracker.ceph.com/issues/23141
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/os/bluestore/BlueFS.cc

index df98aae32674d243f73dcd2d1c48173e8abe5a59..35b4be35b85581c23f658ec4e7b63cba974cf240 100644 (file)
@@ -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();
 }