revert-precommit - #476
revert-precommit#476
Conversation
WalkthroughThe pull request modifies the Changes
Possibly related PRs
Suggested reviewers
Poem
📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (1)
💤 Files with no reviewable changes (1)
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
Update piraeus-server patches to address critical production issues: - Add fix-duplicate-tcp-ports.diff to prevent duplicate TCP ports after toggle-disk operations (upstream PR #476) - Update skip-adjust-when-device-inaccessible.diff with comprehensive fixes for resources stuck in StandAlone after reboot, Unknown state race condition, and encrypted LUKS resource deletion (upstream PR #477) ```release-note [linstor] Fix DRBD resources stuck in StandAlone state after reboot and encrypted resource deletion issues ``` Co-Authored-By: Claude <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]>
## What this PR does This PR updates piraeus-server patches to address several critical production issues with DRBD resources and LUKS encryption: 1. **Add fix-duplicate-tcp-ports.diff** - Prevents duplicate TCP ports after toggle-disk operations (upstream PR #476) 2. **Update skip-adjust-when-device-inaccessible.diff** - Comprehensive fix for multiple issues: - Resources stuck in StandAlone state after node reboot - Unknown state race condition during satellite restart - Encrypted LUKS resource deletion failures - Network reconnect blocked by unavailable child device checks These patches resolve scenarios where DRBD resources fail to automatically reconnect after node reboots and improve LUKS resource lifecycle management. Upstream PRs: - LINBIT/linstor-server#476 - LINBIT/linstor-server#477 ### Release note ```release-note [linstor] Fix DRBD resources stuck in StandAlone state after reboot and encrypted resource deletion issues ``` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Prevents duplicate TCP port conflicts after disk toggle operations * Fixes resources stuck in StandAlone or Unknown state after reboot * Resolves issues with encrypted resource deletion * Improves handling of temporarily inaccessible storage devices <sub>✏️ Tip: You can customize this high-level summary in your review settings.</sub> <!-- end of auto-generated comment: release notes by coderabbit.ai -->
Update piraeus-server patches to address critical production issues: - Add fix-duplicate-tcp-ports.diff to prevent duplicate TCP ports after toggle-disk operations (upstream PR #476) - Update skip-adjust-when-device-inaccessible.diff with comprehensive fixes for resources stuck in StandAlone after reboot, Unknown state race condition, and encrypted LUKS resource deletion (upstream PR #477) ```release-note [linstor] Fix DRBD resources stuck in StandAlone state after reboot and encrypted resource deletion issues ``` Co-Authored-By: Claude <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]> (cherry picked from commit dc2773b)
Update piraeus-server patches to address critical production issues: - Add fix-duplicate-tcp-ports.diff to prevent duplicate TCP ports after toggle-disk operations (upstream PR #476) - Update skip-adjust-when-device-inaccessible.diff with comprehensive fixes for resources stuck in StandAlone after reboot, Unknown state race condition, and encrypted LUKS resource deletion (upstream PR #477) ```release-note [linstor] Fix DRBD resources stuck in StandAlone state after reboot and encrypted resource deletion issues ``` Co-Authored-By: Claude <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]> (cherry picked from commit dc2773b)
Update fix-duplicate-tcp-ports.diff to match upstream PR #476 after maintainer review: - Add copyDrbdSettings() wrapper instead of calling copyDrbdTcpPortsIfExists from within copyDrbdNodeIdIfExists - Make ensureStackDataExists() optional in resetStoragePools() via boolean parameter instead of removing it entirely Update README.md with PR #490 link for ConfFileBuilder fix. Co-Authored-By: Claude <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]>
) ## Summary - update `packages/system/linstor` to `linstor-server` `v1.33.1` - keep only the selected `piraeus-server` backports needed for this update - document the upstream/source commits for each retained patch - drop the older local patch set that is no longer carried in this package revision ## Selected backports - PR #475: backport maintainer implementation from `3d97f71c95a493588d3d521c63eac4d846935fb3` - PR #476: backport the TCP port preservation fix from `79d6375c55d6181b35a7b7f0fe8dbdfb86e126cd` and `bcc89902f4f61ac1589dd07ebb7f5aae1935370d` - PR #472: backport the LUKS header sizing fix from `ccc85fbd2c65f0b97c52403fa80f1efdb886ec4e` plus the required `optimal_io_size` dependency from `71b601554f41bcb50cd5bd06989c5b0d3a814acd` ## Verification - applied all retained patches on top of upstream `v1.33.1` with `git apply --check` - verified the combined backport builds with `./gradlew --no-daemon compileJava` - ran `make image` in `packages/system/linstor` successfully <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Upgraded LINSTOR server to v1.33.2 and refreshed related package metadata. * **Bug Fixes / Reliability** * Safer toggle-disk flows with retry/abort handling and preservation of DRBD TCP ports. * Automatic retry/cleanup for stale bitmap attach errors to improve recovery. * **Storage / Compatibility** * Improved LUKS2 header sizing, optimal I/O size detection, and related patches for more reliable disk formatting and alignment. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
Summary by CodeRabbit
gen-versions-maphook for maintaining version consistency.