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

mimic: mds: high debug logging with many subtrees is slow #29219

Merged
merged 3 commits into from Oct 23, 2019

Conversation

@smithfarm
Copy link
Contributor

smithfarm commented Jul 23, 2019

@smithfarm smithfarm self-assigned this Jul 23, 2019
@smithfarm smithfarm added this to the mimic milestone Jul 23, 2019
@smithfarm smithfarm added bug fix core cephfs and removed bug fix core labels Jul 23, 2019
@smithfarm smithfarm requested review from batrick and rishabh-d-dave and removed request for batrick Jul 23, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Jul 23, 2019

/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc: In member function 'void MDCache::show_subtrees(int, bool)':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:12182:15: error: 'g_conf' cannot be used as a function
       !g_conf()->subsys.should_gather<ceph_subsys_mds, 25>()) {
               ^
@smithfarm smithfarm force-pushed the smithfarm:wip-38875-mimic branch 2 times, most recently from 8072e0d to 2a3f4d2 Jul 23, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Aug 7, 2019

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 15, 2019

@smithfarm pls rebase

--- pr 29219 --- pulling https://github.com/smithfarm/ceph.git branch wip-38875-mimic
remote: Enumerating objects: 15, done.
remote: Counting objects: 100% (15/15), done.
remote: Total 18 (delta 15), reused 15 (delta 15), pack-reused 3
Unpacking objects: 100% (18/18), done.
From https://github.com/smithfarm/ceph

  • branch wip-38875-mimic -> FETCH_HEAD
    Auto-merging src/mds/MDCache.h
    Auto-merging src/mds/MDCache.cc
    Auto-merging src/mds/MDBalancer.cc
    CONFLICT (content): Merge conflict in src/mds/MDBalancer.cc
    Automatic merge failed; fix conflicts and then commit the result.
    Traceback (most recent call last):
    File "/home/yuriw/wip_master/src/script/build-integration-branch", line 62, in
    assert not r
    AssertionError
@smithfarm smithfarm force-pushed the smithfarm:wip-38875-mimic branch from 2a3f4d2 to e6cf4c4 Oct 16, 2019
@smithfarm smithfarm removed the needs-rebase label Oct 16, 2019
@smithfarm

This comment has been minimized.

Copy link
Contributor Author

smithfarm commented Oct 16, 2019

/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc: In member function 'void MDCache::show_subtrees(int, bool)':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:12241:15: error: 'g_conf' cannot be used as a function
       !g_conf()->subsys.should_gather<ceph_subsys_mds, 25>()) {
               ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:12241:38: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
       !g_conf()->subsys.should_gather<ceph_subsys_mds, 25>()) {
                                      ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:12241:60: error: expected primary-expression before ')' token
       !g_conf()->subsys.should_gather<ceph_subsys_mds, 25>()) {
                                                            ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:12297:15: error: 'g_conf' cannot be used as a function
       !g_conf()->subsys.should_gather<ceph_subsys_mds, 25>()) {
               ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:12297:38: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
       !g_conf()->subsys.should_gather<ceph_subsys_mds, 25>()) {
                                      ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mds/MDCache.cc:12297:60: error: expected primary-expression before ')' token
       !g_conf()->subsys.should_gather<ceph_subsys_mds, 25>()) {
                                                            ^
src/mds/CMakeFiles/mds.dir/build.make:179: recipe for target 'src/mds/CMakeFiles/mds.dir/MDCache.cc.o' failed
make[3]: *** [src/mds/CMakeFiles/mds.dir/MDCache.cc.o] Error 1
Also, add an argument to force print subtrees and let
MDBalancer::tick() always print subtrees.

Fixes: https://tracker.ceph.com/issues/37726
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 50d28ec)

Conflicts:
    src/mds/MDCache.cc
- g_conf
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 13c4152)

Conflicts:
	src/mds/MDBalancer.cc
- g_conf
- authsubs in method MDBalancer::handle_export_pins() is redeclared from set
  to vector in master branch. Removed vector declaration as per the luminous
  backport.
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 46fb907)

Conflicts:
    src/mds/MDCache.cc
- g_conf-> instead of g_conf()->
@smithfarm smithfarm force-pushed the smithfarm:wip-38875-mimic branch from e6cf4c4 to ad5c1cd Oct 16, 2019
@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 17, 2019

@yuriw yuriw merged commit ba343da into ceph:mimic Oct 23, 2019
4 checks passed
4 checks passed
Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
@smithfarm smithfarm deleted the smithfarm:wip-38875-mimic branch Oct 23, 2019
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.