merge(reconcile/upstream dcbffb08)#25
Merged
Merged
Conversation
…fixes Reconciles 405 upstream commits (c244943..dcbffb0). See https://github.com/wasabi/rdiperri-rustfs-fork-diff for conflict resolutions. Notable upstream changes: - Full async xlmeta I/O: write_xlmeta converted from spawn_blocking to native tokio::fs::File::write_all().await (a9e62dc, a8a5f25). - Lock, lifecycle, replication, IAM, and KMS updates across 405 commits. Post-merge fixes: - S3VersionId/Uuid wrapping in filemeta, object_usecase, ecfs, lifecycle, replication (8b6c964, 1777165). - Unused imports removed from ecstore disk (48e7fbd). iopool experiment (committed and immediately reverted, preserved for traceability): per-disk io_uring runtime experiment was net-zero or net-negative on the merged binary at 8d/100t; the pre-merge gain depended on spawn_blocking isolation removed by this upstream range.
48e7fbd to
ae9419b
Compare
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
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.
Type of Change
Related Issues
Summary of Changes
Reconciles 405 upstream commits
see https://github.com/wasabi/rdiperri-rustfs-fork-diff for details of resolutions
Notable upstream changes in this range:
write_xlmetaconverted fromspawn_blockingtonative
tokio::fs::File::write_all().await(a9e62dc2,a8a5f25a).Post-merge compilation fixes (
8b6c964e):S3VersionId/Uuidwrapping infilemeta,object_usecase,ecfs,lifecycle,replication.ConnPoolEntrytest fixture update inremote_disk.ObjectLockRequestnew-field defaults infast_locktests.rustfmtindentation inset_disk.-v4loadgen flag.iopool experiment (
1b1c868c, reverted447c610e):An xlmeta per-disk io_uring runtime experiment was committed and immediately
reverted. The revert is preserved in history for traceability. Post-merge
perf investigation confirmed the optimization provides no throughput benefit
on the merged binary: the pre-merge gain depended on
spawn_blockingisolation (Effect 2), which this upstream range correctly removed. All
investigated levers (ring isolation, op-count reduction, CBW parallelism)
were net-zero or net-negative on the merged binary at 8d/100t.
Checklist
make pre-commitImpact
Additional Notes
Thank you for your contribution! Please ensure your PR follows the community standards (CODE_OF_CONDUCT.md). If this is your first contribution, review the CLA document and sign it by commenting
I have read and agree to the CLA.on the PR.