mds: fix ceph-mds static build #57578
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
May 20, 2024 23:10
BOOST_SPIRIT_THREADSAFE requires linking against Boost.Threads. Due to complicated deps, everything links fine with ENABLE_SHARED. However certain targets (ceph-mds) break with static linking enabled. Signed-off-by: Anatoly Scheglov <finch@mts.ru>
src/mds/QuiesceDbEncoding.h is included in both src/mds/MDSRankQuiesce.cc and src/msg/Message.cc which works for .so but breaks static linking. Signed-off-by: Anatoly Scheglov <finch@mts.ru>
batrick
reviewed
May 28, 2024
| @@ -15,81 +15,81 @@ | |||
| #include "include/encoding.h" | |||
| #include <stdint.h> | |||
|
|
|||
| void encode(QuiesceDbVersion const& v, bufferlist& bl, uint64_t features = 0) | |||
| inline void encode(QuiesceDbVersion const& v, bufferlist& bl, uint64_t features = 0) | |||
There was a problem hiding this comment.
I'm not certain but I think conventionally it would be:
Suggested change
| inline void encode(QuiesceDbVersion const& v, bufferlist& bl, uint64_t features = 0) | |
| static inline void encode(QuiesceDbVersion const& v, bufferlist& bl, uint64_t features = 0) |
There was a problem hiding this comment.
While static inline is possible, for the exact purpose of preventing ODR violations, inline is all that is needed here. Surely static would also fix the ODR issue, but by creating a copy of the function in every TU. After all, static is for preventing a name clash of different functions is different TUs.
Also please see this SO answer - https://stackoverflow.com/a/22103109
There was a problem hiding this comment.
Also, I think you'll want this squid as well because this QuiesceDbEncoding.h file was recently backported there. Let's create a tracker ticket?
batrick
approved these changes
May 29, 2024
| @@ -15,81 +15,81 @@ | |||
| #include "include/encoding.h" | |||
| #include <stdint.h> | |||
|
|
|||
| void encode(QuiesceDbVersion const& v, bufferlist& bl, uint64_t features = 0) | |||
| inline void encode(QuiesceDbVersion const& v, bufferlist& bl, uint64_t features = 0) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix ceph-mds build with -DENABLE_SHARED=NO
Contribution Guidelines
To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an
xbetween the brackets:[x]. Spaces and capitalization matter when checking off items this way.Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume toxjenkins test windowsjenkins test rook e2e