Skip to content

Commit 36636d5

Browse files
committed
linstor: update piraeus-server patches for v1.33.1
1 parent 38624b7 commit 36636d5

8 files changed

Lines changed: 876 additions & 541 deletions

‎packages/system/linstor/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export NAMESPACE=cozy-$(NAME)
44
include ../../../hack/common-envs.mk
55
include ../../../hack/package.mk
66

7-
LINSTOR_VERSION ?= 1.32.3
7+
LINSTOR_VERSION ?= 1.33.1
88
LINSTOR_CSI_VERSION ?= v1.10.5
99

1010
image: image-piraeus-server image-linstor-csi
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# LINSTOR Server Patches
22

3-
Custom patches for piraeus-server (linstor-server) v1.32.3.
3+
Custom patches for piraeus-server (linstor-server) v1.33.1.
44

5-
- **adjust-on-resfile-change.diff** — Use actual device path in res file during toggle-disk; fix LUKS data offset
6-
- Upstream: [#473](https://github.com/LINBIT/linstor-server/pull/473), [#472](https://github.com/LINBIT/linstor-server/pull/472)
7-
- **allow-toggle-disk-retry.diff** — Allow retry and cancellation of failed toggle-disk operations
8-
- Upstream: [#475](https://github.com/LINBIT/linstor-server/pull/475)
9-
- **force-metadata-check-on-disk-add.diff** — Create metadata during toggle-disk from diskless to diskful
10-
- Upstream: [#474](https://github.com/LINBIT/linstor-server/pull/474)
11-
- **fix-duplicate-tcp-ports.diff** — Preserve TCP ports during toggle-disk to prevent port mismatch between controller and satellites
12-
- Upstream: [#476](https://github.com/LINBIT/linstor-server/pull/476) (superseded by this expanded fix)
13-
- **skip-adjust-when-device-inaccessible.diff** — Fix resources stuck in StandAlone after reboot, Unknown state race condition, and encrypted resource deletion
14-
- Upstream: [#477](https://github.com/LINBIT/linstor-server/pull/477)
5+
- **allow-toggle-disk-retry.diff** — Backport maintainer implementation of toggle-disk retry/abort
6+
- Source PR/comment: [#475](https://github.com/LINBIT/linstor-server/pull/475), [maintainer note](https://github.com/LINBIT/linstor-server/pull/475#issuecomment-3949630419)
7+
- Backported from upstream commit: [`3d97f71c9`](https://github.com/LINBIT/linstor-server/commit/3d97f71c95a493588d3d521c63eac4d846935fb3)
8+
- **fix-duplicate-tcp-ports.diff** — Preserve DRBD TCP ports during toggle-disk and avoid redundant `ensureStackDataExists()`
9+
- Source PR/review: [#476](https://github.com/LINBIT/linstor-server/pull/476), [review suggestion](https://github.com/LINBIT/linstor-server/pull/476#discussion_r3007725079)
10+
- Backported from commits: [`79d6375c5`](https://github.com/kvaps/linstor-server/commit/79d6375c55d6181b35a7b7f0fe8dbdfb86e126cd), [`bcc89902f`](https://github.com/kvaps/linstor-server/commit/bcc89902f4f61ac1589dd07ebb7f5aae1935370d)
11+
- **fix-luks-header-size.diff** — Account for LUKS2 `--offset`, metadata/keyslots sizing, and device `optimal_io_size`
12+
- Source PR/comment: [#472](https://github.com/LINBIT/linstor-server/pull/472), [maintainer note](https://github.com/LINBIT/linstor-server/pull/472#issuecomment-3949687603)
13+
- Backported from commits: [`ccc85fbd2`](https://github.com/LINBIT/linstor-server/commit/ccc85fbd2c65f0b97c52403fa80f1efdb886ec4e), [`71b601554`](https://github.com/LINBIT/linstor-server/commit/71b601554f41bcb50cd5bd06989c5b0d3a814acd)
14+
- Note: upstream commit [`3d0402a0c`](https://github.com/LINBIT/linstor-server/commit/3d0402a0c25f0a4b57b380321f10e89982f26e7a) is already included in `v1.33.1`

‎packages/system/linstor/images/piraeus-server/patches/adjust-on-resfile-change.diff‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)