From 9297d0420dcf8e735cea88bad86c14e0de95b707 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Wed, 19 Jun 2019 15:07:19 +0300 Subject: [PATCH] os/bluestore/bluestore-tool: fix error output Signed-off-by: Igor Fedotov --- src/os/bluestore/bluestore_tool.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/bluestore_tool.cc b/src/os/bluestore/bluestore_tool.cc index 629f0e2c6f29f..5e6b481cefd58 100644 --- a/src/os/bluestore/bluestore_tool.cc +++ b/src/os/bluestore/bluestore_tool.cc @@ -713,8 +713,6 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - bool need_db = dev_target_id == BlueFS::BDEV_NEWDB; - BlueStore bluestore(cct.get(), path); int r = bluestore.migrate_to_existing_bluefs_device( src_dev_ids, @@ -727,8 +725,9 @@ int main(int argc, char **argv) } } } else { + bool need_db = dev_target_id == BlueFS::BDEV_DB; cerr << "failed to migrate to existing BlueFS device: " - << (need_db ? BlueFS::BDEV_DB : BlueFS::BDEV_DB) + << (need_db ? BlueFS::BDEV_DB : BlueFS::BDEV_WAL) << " " << dev_target << cpp_strerror(r) << std::endl; -- 2.39.5