octopus: mds: do not submit omap_rm_keys if the dir is the basedir of merge #37034
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: https://tracker.ceph.com/issues/46273 Signed-off-by: Chencan <chen.can2@zte.com.cn> (cherry picked from commit d8a6715)
Fixes: https://tracker.ceph.com/issues/47201 Signed-off-by: "Yan, Zheng" <zyan@redhat.com> (cherry picked from commit cb2cc22) Conflicts: src/mds/CDir.cc - op.stat() takes different kind of null arguments in octopus, but this is not relevant to the backport - newline was missing at the very end of the file: added it
smithfarm
force-pushed
the
wip-46520-octopus
branch
from
e8089f6
to
57e79ec
Compare
smithfarm
changed the title
batrick
approved these changes
Oct 5, 2020
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.
backport trackers:
backport of
parent trackers:
this backport was staged using ceph-backport.sh version 15.1.1.389
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh