os/bluestore/bluestore-tool: omit device from both source and taget

lists when migrating.

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 5ea89a4e0c2d6988156e76c074ae755632b51d53)

diff --git a/src/os/bluestore/bluestore_tool.cc b/src/os/bluestore/bluestore_tool.cc
index 5e6b481cefd58ae10a7a15e5dc90e7ebfbf42ae3..bdc5869b5120fec9593bd1056b529687471048b2 100644 (file)
--- a/src/os/bluestore/bluestore_tool.cc
+++ b/src/os/bluestore/bluestore_tool.cc
@@ -691,8 +691,14 @@ int main(int argc, char **argv)
     for (auto& s :  devs_source) {
       auto i = cur_devs_map.find(s);
       if (i != cur_devs_map.end()) {
-       src_devs.emplace(*i);
-       src_dev_ids.emplace(i->second);
+        if (s == dev_target) {
+         cerr << "Device " << dev_target
+              << " is present in both source and target lists, omitted."
+              << std::endl;
+        } else {
+         src_devs.emplace(*i);
+         src_dev_ids.emplace(i->second);
+       }
       } else {
        cerr << "can't migrate " << s << ", not a valid bluefs volume "
              << std::endl;