From: Igor Fedotov <ifedotov@suse.com>
Date: Wed, 19 Jun 2019 12:07:19 +0000 (+0300)
Subject: os/bluestore/bluestore-tool: fix error output
X-Git-Tag: v15.1.0~2288^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9297d0420dcf8e735cea88bad86c14e0de95b707;p=ceph.git

os/bluestore/bluestore-tool: fix error output

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
---

diff --git a/src/os/bluestore/bluestore_tool.cc b/src/os/bluestore/bluestore_tool.cc
index 629f0e2c6f2..5e6b481cefd 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;