]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/OSD: fix blacklist dump format
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 6 Jul 2017 06:34:49 +0000 (14:34 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Fri, 7 Jul 2017 01:55:41 +0000 (09:55 +0800)
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>
src/osd/OSD.cc

index bcf65f5d812ea2db56a73c4899a837928a57c5f7..fdf848a5d8dc46f8b321d5c63b396de9b4ceddff 100644 (file)
@@ -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