rgw: Backport of issue 57562 to Pacific#49682
Merged
yuriw merged 7 commits intoceph:pacificfrom Mar 13, 2023
Merged
Conversation
Fix logic error where disjunction was used instead of conjunction. Fixes: https://tracker.ceph.com/issues/57562 Signed-off-by: Adam C. Emerson <aemerson@redhat.com> (cherry picked from commit dae8e78) Fixes: https://tracker.ceph.com/issues/58403 Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Part tags make part creation and setting the head non-idempotent, leading to issues where racing RGWs may get confused about the correct tag for a part. (Or worse, potentially have the metadata header hold different value for a part than the part's header.) Consistently only requires that all nodes agree on the number. Fixes: https://tracker.ceph.com/issues/57562 Signed-off-by: Adam C. Emerson <aemerson@redhat.com> (cherry picked from commit f89a6d1) Conflicts: src/neorados/cls/fifo.cc src/neorados/cls/fifo.h src/test/cls_fifo/bench_cls_fifo.cc src/test/cls_fifo/test_cls_fifo.cc - Upstream deleted version has changes not in downstream src/cls/fifo/cls_fifo_ops.h - Upstream std:: src/cls/fifo/cls_fifo_types.h - Upstream friend operator - Upstream std:: src/rgw/CMakeLists.txt - Downstream unneeded library dependency src/rgw/cls_fifo_legacy.h - Upstream dpp src/rgw/cls_fifo_legacy.cc - Upstream C++20 - Upstream dpp Fixes: https://tracker.ceph.com/issues/58403 Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Since we no longer use tags, journal entries are just an operation and a part number. If an entry being added is already in the journal, skip it. Fixes: https://tracker.ceph.com/issues/57562 Signed-off-by: Adam C. Emerson <aemerson@redhat.com> (cherry picked from commit ade8909) Conflicts: src/rgw/cls_fifo_legacy.cc - Upstream dpp Fixes: https://tracker.ceph.com/issues/58403 Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Only increment the version if we make an actual change. Return whether we have changed something or not so the OSD side can skip writing if there's no change. Fixes: https://tracker.ceph.com/issues/57562 Signed-off-by: Adam C. Emerson <aemerson@redhat.com> (cherry picked from commit 32b514c) Fixes: https://tracker.ceph.com/issues/58403 Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
We don't really need the overhead and complexity of a multimap. Fixes: https://tracker.ceph.com/issues/57562 Signed-off-by: Adam C. Emerson <aemerson@redhat.com> (cherry picked from commit fcaa45d) Conflicts: src/rgw/cls_fifo_legacy.cc src/cls/fifo/cls_fifo_types.h - Upstream C++20 - Have to write our own less-than since upstream uses the Spaceship Operator Fixes: https://tracker.ceph.com/issues/58403 Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
First, make `_prepare_new_head` take the new head part number, so two calls racing from the same push will attempt to create the same head. Also remove the neorados FIFO since it doesn't have all the bug fixes in the legacy version and will be rewritten in terms of `async_compose` anyway. Fixes: https://tracker.ceph.com/issues/57562 Signed-off-by: Adam C. Emerson <aemerson@redhat.com> (cherry picked from commit bf22290) Conflicts: src/rgw/cls_fifo_legacy.cc - Upstream C++20 - Upstream DPP Fixes: https://tracker.ceph.com/issues/58403 Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
A racing client may delete the part we're trying to push to. Use `assert_exists()` to check, and re-read metadata if we receive -ENOENT. Fixes: https://tracker.ceph.com/issues/57562 Signed-off-by: Adam C. Emerson <aemerson@redhat.com> (cherry picked from commit 3493e04) Conflicts: src/rgw/cls_fifo_legacy.cc - Upstream dpp Fixes: https://tracker.ceph.com/issues/58403 Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Contributor
Author
|
jenkins test api |
smanjara
approved these changes
Mar 13, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 of https://tracker.ceph.com/issues/57562 to Pacific
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. "pacific"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
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 windows