mimic: mds: add magic to header of open file table #22841
Merged
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
Fixes: http://tracker.ceph.com/issues/24240 Signed-off-by: "Yan, Zheng" <zyan@redhat.com> (cherry picked from commit c60d55d) Conflicts: src/mds/OpenFileTable.cc: Resolved in _load_finish
|
Conflict resolution looks good to me. |
|
Alternatively we could cherry-pick 94e4928 (the absence of which causes the conflict) first, since it appears to be a cleanup commit that will cause lots of conflicts throughout the mimic release cycle if we don't cherry-pick it now. What does anybody think about that idea? |
|
(Bringing in @tchaikov to comment on the idea presented in the previous comment.) |
|
@smithfarm we can not single out 94e4928 and only cherry pick that very commit, as it depends on #22015, which is a massive but relatively simple change . i am good either way. but in long term, it might be advisable to backport #22015 for easier mimic backport . |
batrick
approved these changes
Jul 9, 2018
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.
http://tracker.ceph.com/issues/24541