Skip to content

osd/scheduler: add mclock queue length perfcounter#58302

Merged
yuriw merged 2 commits intoceph:mainfrom
jianwei1216:feat_add_mclock_perfcounter_main
Aug 4, 2024
Merged

osd/scheduler: add mclock queue length perfcounter#58302
yuriw merged 2 commits intoceph:mainfrom
jianwei1216:feat_add_mclock_perfcounter_main

Conversation

@jianwei1216
Copy link
Contributor

@jianwei1216 jianwei1216 commented Jun 27, 2024 •
edited
Loading

feature: https://tracker.ceph.com/issues/66714

Author: zhangjianwei2 <zhangjianwei2_yewu@cmss.chinamobile.com>
Date:   Thu Jun 27 16:20:00 2024 +0800

    osd/scheduler: add mclock queue length perfcounter

    Easy to visualize the number of ops in each subqueue of mclock.
    Add request statistics for each op_scheduler_class

    daemon or tell command:
    ceph daemon osd.0 perf dump mclock-shard-queue-0
    {
        "mclock-shard-queue-0": {
            "mclock_immediate_queue_len": 0,
            "mclock_client_queue_len": 0,
            "mclock_recovery_queue_len": 6,
            "mclock_best_effort_queue_len": 4,
            "mclock_all_type_queue_len": 10
        }
    }

    Signed-off-by: zhangjianwei2 <zhangjianwei2@cmss.chinamobile.com>

@jianwei1216 jianwei1216 requested a review from a team as a code owner June 27, 2024 08:33
@github-actions github-actions bot added the core label Jun 27, 2024
@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jun 27, 2024

@sseshasa Please REVIEW here

@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jun 27, 2024 •
edited
Loading

Test results with this PR

# ceph daemon osd.0 perf dump | grep mclock-shard-queue- -A 7
    "mclock-shard-queue-0": {
        "mclock_immediate_queue_len": 0,
        "mclock_client_queue_len": 0,
        "mclock_store_db_queue_len": 0,
        "mclock_recovery_queue_len": 0,
        "mclock_best_effort_queue_len": 0,
        "mclock_all_type_queue_len": 0
    },
    "mclock-shard-queue-1": {
        "mclock_immediate_queue_len": 0,
        "mclock_client_queue_len": 2,
        "mclock_store_db_queue_len": 1,
        "mclock_recovery_queue_len": 4,
        "mclock_best_effort_queue_len": 7,
        "mclock_all_type_queue_len": 14
    },
    "mclock-shard-queue-2": {
        "mclock_immediate_queue_len": 0,
        "mclock_client_queue_len": 1,
        "mclock_store_db_queue_len": 6,
        "mclock_recovery_queue_len": 3,
        "mclock_best_effort_queue_len": 1,
        "mclock_all_type_queue_len": 11
    },
    "mclock-shard-queue-3": {
        "mclock_immediate_queue_len": 0,
        "mclock_client_queue_len": 0,
        "mclock_store_db_queue_len": 0,
        "mclock_recovery_queue_len": 0,
        "mclock_best_effort_queue_len": 14,
        "mclock_all_type_queue_len": 14
    },
    "mclock-shard-queue-4": {
        "mclock_immediate_queue_len": 0,
        "mclock_client_queue_len": 1,
        "mclock_store_db_queue_len": 0,
        "mclock_recovery_queue_len": 2,
        "mclock_best_effort_queue_len": 10,
        "mclock_all_type_queue_len": 13
    },

@jianwei1216 jianwei1216 mentioned this pull request Jun 27, 2024
Closed
@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jun 27, 2024

Old PR Closed: #55295

@jianwei1216 jianwei1216 force-pushed the feat_add_mclock_perfcounter_main branch 4 times, most recently from 61d7d56 to c951f55 Compare June 27, 2024 09:26
@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jun 27, 2024

图片

@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jun 27, 2024

@athanatos review thanks

@jianwei1216 jianwei1216 force-pushed the feat_add_mclock_perfcounter_main branch 2 times, most recently from 509b86b to fa06b83 Compare June 27, 2024 12:04
athanatos
athanatos reviewed Jun 27, 2024
View reviewed changes
@jianwei1216 jianwei1216 force-pushed the feat_add_mclock_perfcounter_main branch 6 times, most recently from 7d72bbf to 7910725 Compare June 28, 2024 02:31
sseshasa
sseshasa approved these changes Jun 28, 2024
View reviewed changes
Copy link
Contributor

@sseshasa sseshasa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jianwei1216 The changes look good to me. Thanks! I will tag the PR for it to be picked up for CI testing.

sseshasa
sseshasa reviewed Jun 28, 2024
View reviewed changes
@sseshasa sseshasa removed the needs-qa label Jun 28, 2024
@jianwei1216 jianwei1216 force-pushed the feat_add_mclock_perfcounter_main branch from 7910725 to f204ee5 Compare June 28, 2024 15:53
@github-actions github-actions bot added the tests label Jun 28, 2024
jianwei1216
jianwei1216 commented Jun 28, 2024
View reviewed changes
sseshasa
sseshasa requested changes Jun 28, 2024
View reviewed changes
@jianwei1216 jianwei1216 force-pushed the feat_add_mclock_perfcounter_main branch from f204ee5 to 16e2ec5 Compare June 29, 2024 02:09
sseshasa
sseshasa approved these changes Jul 1, 2024
View reviewed changes
Copy link
Contributor

@sseshasa sseshasa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sseshasa
Copy link
Contributor

sseshasa commented Jul 1, 2024

jenkins test API

@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jul 1, 2024

needs-qa @sseshasa

mohit84
mohit84 reviewed Jul 18, 2024
View reviewed changes
@sseshasa sseshasa removed the needs-qa label Jul 18, 2024
@jianwei1216 jianwei1216 force-pushed the feat_add_mclock_perfcounter_main branch from 16e2ec5 to fad64e4 Compare July 19, 2024 00:47
osd/scheduler: add mclock queue length perfcounter
8036426 
Easy to visualize the number of ops in each subqueue of mclock.
Add request statistics for each op_scheduler_class

daemon or tell command:
ceph daemon osd.0 perf dump mclock-0
{
    "mclock-shard-queue-0": {
        "mclock_immediate_queue_len": 0,
        "mclock_client_queue_len": 0,
        "mclock_recovery_queue_len": 0,
        "mclock_best_effort_queue_len": 0
        "mclock_all_type_queue_len": 0
    }
}

Fixes: https://tracker.ceph.com/issues/66714

Signed-off-by: zhangjianwei2 <zhangjianwei2@cmss.chinamobile.com>
@jianwei1216 jianwei1216 force-pushed the feat_add_mclock_perfcounter_main branch from fad64e4 to 6db763e Compare July 19, 2024 01:05
@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jul 19, 2024

图片

https://jenkins.ceph.com/job/ceph-pull-requests/139327/console

Fetching upstream changes from https://github.com/ceph/ceph.git
 > git --version # timeout=10
 > git --version # 'git version 2.34.1'
 > git fetch --tags --force --progress --depth=1 -- https://github.com/ceph/ceph.git +refs/pull/58302/*:refs/remotes/origin/pr/58302/* # timeout=20
ERROR: Error cloning remote repo 'origin'
hudson.plugins.git.GitException: Command "git fetch --tags --force --progress --depth=1 -- https://github.com/ceph/ceph.git +refs/pull/58302/*:refs/remotes/origin/pr/58302/*" returned status code 128:
stdout: 
stderr: fatal: unable to access 'https://github.com/ceph/ceph.git/': Could not resolve host: github.com

test host: Could not resolve host: github.com @sseshasa

mohit84
mohit84 reviewed Jul 19, 2024
View reviewed changes
@jianwei1216 jianwei1216 force-pushed the feat_add_mclock_perfcounter_main branch from 6db763e to 0c51699 Compare July 19, 2024 05:48
osd/scheduler: fix unittest_mclock_scheduler failed
16b4a89 
when unittest_mclock_scheduler,
dead loop in PerfCountersCollectionImpl::add()

Fixes: https://tracker.ceph.com/issues/66758

Signed-off-by: zhangjianwei2 <zhangjianwei2@cmss.chinamobile.com>
@jianwei1216 jianwei1216 force-pushed the feat_add_mclock_perfcounter_main branch from 0c51699 to 16b4a89 Compare July 19, 2024 06:36
@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jul 19, 2024

jenkins test make check

3 similar comments
@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jul 19, 2024

jenkins test make check

@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Jul 22, 2024

jenkins test make check

@rzarzynski
Copy link
Contributor

rzarzynski commented Jul 22, 2024

jenkins test make check

@rzarzynski
Copy link
Contributor

rzarzynski commented Jul 22, 2024

@sseshasa: is this ready for QA?

@sseshasa
Copy link
Contributor

sseshasa commented Jul 23, 2024

@sseshasa: is this ready for QA?

Yes, the latest push fixed the issue with logger removal. I will add the 'needs-qa' label.

@NitzanMordhai
Copy link
Contributor

NitzanMordhai commented Aug 4, 2024

Rados approved: https://tracker.ceph.com/projects/rados/wiki/MAIN#httpstrackercephcomissues67266

@yuriw yuriw merged commit 78e6193 into ceph:main Aug 4, 2024
@rzarzynski
Copy link
Contributor

rzarzynski commented Aug 5, 2024

@jianwei1216: do we need backports for this?

@rzarzynski
Copy link
Contributor

rzarzynski commented Aug 5, 2024

also: @sseshasa, @mohit84.

@jianwei1216
Copy link
Contributor Author

jianwei1216 commented Aug 6, 2024 •
edited
Loading

@jianwei1216: do we need backports for this?

图片

need backports this PR to reef and squid

@sseshasa
Copy link
Contributor

sseshasa commented Aug 6, 2024

also: @sseshasa, @mohit84.

@rzarzynski @jianwei1216 Yes, this can be backported to Reef and Squid. @jianwei1216 I can take this up.

This was referenced Aug 6, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@athanatos athanatos athanatos left review comments

@mohit84 mohit84 mohit84 left review comments

@sseshasa sseshasa sseshasa approved these changes

Assignees

No one assigned

Labels

core needs-qa tests wip-yuri6-testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@jianwei1216 @sseshasa @rzarzynski @NitzanMordhai @athanatos @mohit84 @yuriw @ljflores