From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Oct 2017 18:54:06 +0000 (-0500)
Subject: ceph-bluestore-tool: fix show-label to use dev name as key
X-Git-Tag: v12.2.2~133^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=508889d4a7aa93f3bbe13ad8bfc181f3fc9ed2a9;p=ceph.git

ceph-bluestore-tool: fix show-label to use dev name as key

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 4785345ace7b675a0e1c34c457aad1103aab5a1d)
---

diff --git a/src/os/bluestore/bluestore_tool.cc b/src/os/bluestore/bluestore_tool.cc
index ad0fc48a8612..c9a1ff2c432c 100644
--- a/src/os/bluestore/bluestore_tool.cc
+++ b/src/os/bluestore/bluestore_tool.cc
@@ -342,7 +342,7 @@ int main(int argc, char **argv)
   }
   else if (action == "show-label") {
     JSONFormatter jf(true);
-    jf.open_array_section("devices");
+    jf.open_object_section("devices");
     for (auto& i : devs) {
       bluestore_bdev_label_t label;
       int r = BlueStore::_read_bdev_label(cct.get(), i, &label);