From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 6 Jul 2017 06:34:49 +0000 (+0800)
Subject: osd/OSD: fix blacklist dump format
X-Git-Tag: v12.1.1~101^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=278b0f67f259fb710289e85581661d74640520b3;p=ceph.git

osd/OSD: fix blacklist dump format

Now:
[
    {
        "entity_addr_t": {
            "nonce": 2338822185,
            "addr": "127.0.0.1:6814"
        },
        "expire_time": "2017-07-06 14:57:29.097542"
    },
    {
        "entity_addr_t": {
            "nonce": 0,
            "addr": "10.118.20.136:12345"
        },
        "expire_time": "2017-07-06 15:27:21.490347"
    }
]

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index bcf65f5d812e..fdf848a5d8dc 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2069,7 +2069,7 @@ bool OSD::asok_command(string admin_command, cmdmap_t& cmdmap, string format,
     curmap->get_blacklist(&bl);
     for (list<pair<entity_addr_t,utime_t> >::iterator it = bl.begin();
 	it != bl.end(); ++it) {
-      f->open_array_section("entry");
+      f->open_object_section("entry");
       f->open_object_section("entity_addr_t");
       it->first.dump(f);
       f->close_section(); //entity_addr_t