From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Wed, 17 Feb 2021 13:27:11 +0000 (+0000)
Subject: rbd: fix rbd-wnbd device status
X-Git-Tag: v16.2.0~181^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4f212b93600ade3dc8601ea5d02495bc8ce00687;p=ceph.git

rbd: fix rbd-wnbd device status

The "rbd-wnbd show" command will always report the device status
as "inactive". This patch adds the missing check, similar to the
one used by the "list" command.

Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
(cherry picked from commit 94cf22e35217e33a48ab73a018c8b1015b887ca4)
---

diff --git a/src/tools/rbd_wnbd/rbd_wnbd.cc b/src/tools/rbd_wnbd/rbd_wnbd.cc
index a4b0cf29bd0ff..0b4cbb650c2bc 100644
--- a/src/tools/rbd_wnbd/rbd_wnbd.cc
+++ b/src/tools/rbd_wnbd/rbd_wnbd.cc
@@ -1345,6 +1345,7 @@ static int do_show_mapped_device(std::string format, bool pretty_format,
   }
 
   auto conn_props = conn_info.Properties;
+  cfg.active = conn_info.DiskNumber > 0 && is_process_running(conn_props.Pid);
   f->open_object_section("device");
   f->dump_int("id", conn_props.Pid ? conn_props.Pid : -1);
   f->dump_string("device", cfg.devpath);