mds: include cleanup by MaxKellermann · Pull Request #62870 · ceph/ceph

MaxKellermann · 2025-04-17T16:59:13Z

Another PR split from #60490

Checklist

Tracker (select at least one)
- References tracker ticket
- Very recent bug; references commit where it was introduced
- New feature (ticket optional)
- Doc update (no ticket needed)
- Code cleanup (no ticket needed)
Component impact
- Affects Dashboard, opened tracker ticket
- Affects Orchestrator, opened tracker ticket
- No impact that needs to be tracked
Documentation (select at least one)
- Updates relevant documentation
- No doc update is appropriate
Tests (select at least one)
- Includes unit test(s)
- Includes integration test(s)
- Includes bug reproducer
- No tests

Show available Jenkins commands

jenkins retest this please
jenkins test classic perf
jenkins test crimson perf
jenkins test signed
jenkins test make check
jenkins test make check arm64
jenkins test submodules
jenkins test dashboard
jenkins test dashboard cephadm
jenkins test api
jenkins test docs
jenkins render docs
jenkins test ceph-volume all
jenkins test ceph-volume tox
jenkins test windows
jenkins test rook e2e

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

This avoids the heavy include in a commonly used header. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

By un-inlining the constructor and destructor, the header dependency on "common/bloom_filter.hpp" can be eliminated. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Mutation.h and SimpleLock.h have a circular dependency and we have to resolve it using forward-declarations. To make that possible, move print() to Mutation.cc. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Un-inline the destructor to eliminate a few more dependencies from the public header. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Defaulting a `MDRequestRef` parameter works only if the type is fully defined and thus disallows forward declarations. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Commit e8bc284 added a forward declaration for `MutationRef` but that doesn't work as long as the header constructs and destructs instances, causing errors such as: build/debug/boost/include/boost/smart_ptr/intrusive_ptr.hpp: In instantiation of ‘boost::intrusive_ptr<T>::~intrusive_ptr() [with T = MutationImpl]’: src/mds/SimpleLock.h:424:5: required from here 424 | ceph_assert(!get_xlock_by()); | ~~~~~~~~~~~~^~ build/debug/boost/include/boost/smart_ptr/intrusive_ptr.hpp:100:44: error: ‘intrusive_ptr_release’ was not declared in this scope; did you mean ‘ceph::common::intrusive_ptr_release’? 100 | if( px != 0 ) intrusive_ptr_release( px ); | ~~~~~~~~~~~~~~~~~~~~~^~~~~~ | ceph::common::intrusive_ptr_release This never occurred previously because `Mutation.h` happened to be already included by somebody else. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Prepare for eliminating the header dependency on MDSContext.h. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

batrick

great work!

MaxKellermann · 2025-04-17T22:00:42Z

jenkins test make check arm64

batrick · 2025-04-21T18:41:12Z

This PR is under test in https://tracker.ceph.com/issues/71000.

MaxKellermann · 2025-04-22T15:28:17Z

Thanks @batrick. All results on https://shaman.ceph.com/builds/ceph/wip-pdonnell-testing-20250421.184056-debug/ are successful - I'm going to merge this PR now.

MaxKellermann added 30 commits April 17, 2025 15:59

ceph_mds: add missing include

4138a97

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MDSRank: forward-declare boost::asio::io_context

91894c1

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MDSContext: include cleanup

5ad5708

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MDSTable: include cleanup

64692f0

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MDSTableClient: include cleanup

446464e

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MDSDaemon: include cleanup

e10cc44

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MDSCacheObject: include cleanup

f98af4b

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/mdstypes: un-inline functions that use CachedStackStringStream

f0eebfa

This avoids the heavy include in a commonly used header. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/FSMap: add missing include

9f19e3a

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/inode_backtrace: add missing includes

1bdd6e9

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/inode_backtrace: un-inline methods to reduce header dependencies

a9dab35

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/SessionMap: include cleanup

c065856

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/CInode: add missing includes

7523a6e

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/CDir: include cleanup

6f22117

By un-inlining the constructor and destructor, the header dependency on "common/bloom_filter.hpp" can be eliminated. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/Beacon: include cleanup

f771245

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/PurgeQueue: include cleanup

04fa5c8

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

msg/ScrubStack: include cleanup

c642e33

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MDBalancer: include cleanup

d92d38f

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

msg/RecoveryQueue: include cleanup

39d09be

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

msg/MDSRank: include cleanup

e354f1b

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/CDentry: add missing includes

eea840a

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MDCache: include cleanup

4f8fef5

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/OpenFileTable: include cleanup

9d4e680

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/Mutation: add missing includes

2d3487b

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/Mutation: un-inline print() to resolve circular dependency

c358dc0

Mutation.h and SimpleLock.h have a circular dependency and we have to resolve it using forward-declarations. To make that possible, move print() to Mutation.cc. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/SimpleLock: add missing includes

e3f9a08

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/CInode: include cleanup

d3f5db5

Un-inline the destructor to eliminate a few more dependencies from the public header. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/CDentry: include cleanup

9ad1ba7

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/SessionMap: un-inline methods to reduce header dependencies

acdc6ce

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/flock: un-inline methods to reduce header dependencies

b10cccd

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

MaxKellermann added 11 commits April 17, 2025 18:00

mds/CInode: un-inline methods to reduce header dependencies

2d8dfff

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/CInode: remove the default value from will_block_for_quiesce()

5955f1f

Defaulting a `MDRequestRef` parameter works only if the type is fully defined and thus disallows forward declarations. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/Locker: add missing includes

afe97cf

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/Locker: forward-declare types from CInode.h

b24085f

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/Server: add missing includes

ab04bdb

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/Server: forward-declare types from CInode.h

886c7e6

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/cephfs_features.h: do not include cephfs/metrics/Types.h

cc0647f

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MD{Cache,SRank}: move classes to Retry{Message,Request}.h

856ce1b

Prepare for eliminating the header dependency on MDSContext.h. Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/*: forward-declare MDSContext

8e96db1

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

mds/MDSMap: un-inline methods to reduce compile times

2366c19

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

github-actions bot added the cephfs Ceph File System label Apr 17, 2025

batrick approved these changes Apr 17, 2025

View reviewed changes

batrick added the needs-qa label Apr 17, 2025

batrick added the wip-pdonnell-testing label Apr 21, 2025

This was referenced Apr 21, 2025

Add missing includes to various libraries #62627

Closed

common: include cleanup #62915

Merged

MaxKellermann merged commit 06b6b33 into ceph:main Apr 22, 2025
13 checks passed

MaxKellermann deleted the mds_includes branch April 22, 2025 15:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mds: include cleanup#62870

mds: include cleanup#62870
MaxKellermann merged 41 commits intoceph:mainfrom
MaxKellermann:mds_includes

MaxKellermann commented Apr 17, 2025

Uh oh!

batrick left a comment

Uh oh!

MaxKellermann commented Apr 17, 2025

Uh oh!

batrick commented Apr 21, 2025

Uh oh!

MaxKellermann commented Apr 22, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

MaxKellermann commented Apr 17, 2025

Checklist

Uh oh!

batrick left a comment

Choose a reason for hiding this comment

Uh oh!

MaxKellermann commented Apr 17, 2025

Uh oh!

batrick commented Apr 21, 2025

Uh oh!

MaxKellermann commented Apr 22, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants