Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osd: dump the field name of object watchers and cleanups #15946

Merged
merged 2 commits into from Jun 30, 2017

Conversation

Projects
None yet
3 participants
@Yan-waller
Copy link
Contributor

Yan-waller commented Jun 27, 2017

field name will not dump in array section, command ceph daemon osd.x dump_watchers print out as following:

[
    [
        "",
        "rbd_header.10392ae8944a",
        {
            "type": "client",
            "num": 534114
        },
        140292086877568,
        30,
        {
            "nonce": 532829443,
            "addr": "127.0.0.1:0"
        }
    ]
]

so we open object section to dump the field name:

[
    {
        "namespace": "",
        "object": "rbd_header.10392ae8944a",
        "entity_name": {
            "type": "client",
            "num": 654126
        },
        "cookie": 140344431791488,
        "timeout": 30,
        "entity_addr_t": {
            "nonce": 2116290762,
            "addr": "127.0.0.1:0"
        }
    }
]

Yan-waller added some commits Jun 27, 2017

osd: use dump_unsigned consistent with the variable's type
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
osd: use object section to dump watchers titles
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>

@Yan-waller Yan-waller force-pushed the Yan-waller:wip-waller-dumpwatcher0627 branch from 5ad644d to 208f1f3 Jun 27, 2017

@xiexingguo
Copy link
Member

xiexingguo left a comment

lgtm

@liewegas liewegas merged commit 6ee7f82 into ceph:master Jun 30, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
default Build finished.
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.