Skip to content

merge(reconcile/upstream dcbffb08)#25

Merged
rdiperri-wasabi merged 1 commit into
mainfrom
reconcile/upstream-dcbffb08
Jun 5, 2026
Merged

merge(reconcile/upstream dcbffb08)#25
rdiperri-wasabi merged 1 commit into
mainfrom
reconcile/upstream-dcbffb08

Conversation

@rdiperri-wasabi
Copy link
Copy Markdown

@rdiperri-wasabi rdiperri-wasabi commented Jun 5, 2026

Type of Change

  • New Feature
  • Bug Fix
  • Documentation
  • Performance Improvement
  • Test/CI
  • Refactor
  • Other:

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:

  • Full async xlmeta I/O: write_xlmeta converted from spawn_blocking to
    native tokio::fs::File::write_all().await (a9e62dc2, a8a5f25a).
  • Lock, lifecycle, replication, IAM, and KMS updates across 405 commits.
    Post-merge compilation fixes (8b6c964e):
  • S3VersionId/Uuid wrapping in filemeta, object_usecase, ecfs,
    lifecycle, replication.
  • ConnPoolEntry test fixture update in remote_disk.
  • ObjectLockRequest new-field defaults in fast_lock tests.
  • rustfmt indentation in set_disk.
  • Perf script updates: RPC secret wiring, -v4 loadgen flag.
    iopool experiment (1b1c868c, reverted 447c610e):
    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_blocking
    isolation (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

  • I have read and followed the CONTRIBUTING.md guidelines
  • Passed make pre-commit
  • Added/updated necessary tests
  • Documentation updated (if needed)
  • CI/CD passed (if applicable)

Impact

  • Breaking change (compatibility)
  • Requires doc/config/deployment update
  • Other impact:

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.

Copilot AI review requested due to automatic review settings June 5, 2026 01:16
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

@rdiperri-wasabi rdiperri-wasabi enabled auto-merge June 5, 2026 01:22
Copilot AI review requested due to automatic review settings June 5, 2026 02:07
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review this pull request because it exceeds the maximum number of files (300). Try reducing the number of changed files and requesting a review from Copilot again.

@rdiperri-wasabi rdiperri-wasabi added this pull request to the merge queue Jun 5, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Jun 5, 2026
@rdiperri-wasabi rdiperri-wasabi added this pull request to the merge queue Jun 5, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Jun 5, 2026
@rdiperri-wasabi rdiperri-wasabi added this pull request to the merge queue Jun 5, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Jun 5, 2026
@rdiperri-wasabi rdiperri-wasabi added this pull request to the merge queue Jun 5, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to a conflict with the base branch Jun 5, 2026
…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.
@rdiperri-wasabi rdiperri-wasabi force-pushed the reconcile/upstream-dcbffb08 branch from 48e7fbd to ae9419b Compare June 5, 2026 15:08
@rdiperri-wasabi rdiperri-wasabi added this pull request to the merge queue Jun 5, 2026
Merged via the queue into main with commit b1514c9 Jun 5, 2026
7 checks passed
@rdiperri-wasabi rdiperri-wasabi deleted the reconcile/upstream-dcbffb08 branch June 5, 2026 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants