]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
crush/CrushWrapper: fix crush tree json dumper 24481/head
authorsongshuangyang <songshuangyang@baidu.com>
Fri, 14 Sep 2018 06:53:17 +0000 (14:53 +0800)
committerPrashant D <pdhange@redhat.com>
Mon, 8 Oct 2018 21:39:42 +0000 (17:39 -0400)
commite397f92dfc3944bbfb1d7fd783bdeffd6d7be3d5
treeb05bdb1583b1cc90b1a3fc83a8771dde7a6c940c
parent87b5e7c4255796bdd4391cfa2e16959109047531
crush/CrushWrapper: fix crush tree json dumper

    The output json string is invalid for 'osd crush tree --format=json'
    command. It contains a array of 'nodes' and a array of 'stray', but
    not in a json object, and the stray array was not implemented.
    Applications which depends on the output of the above MonCommand will
    occur json parse error.

Signed-off-by: Oshyn Song <dualyangsong@gmail.com>
(cherry picked from commit 35c0d1f45cd676f201d4031cb8f447f7ea6aee0e)
src/crush/CrushWrapper.cc
src/mon/OSDMonitor.cc