Skip to content

Commit 43f4e31

Browse files
laurazardsmira
authored andcommitted
fix: race between VolumeConfigController and UserVolumeConfigController
Previously, system volumes (`META`, `STATE`, etc.) were created by `VolumeConfigController` and user volumes were created by `UserVolumeConfigController`. This resulted in these controllers racing to create volumes, which could cause partitions to be created in an incorrect order. This patch fixes this potential race by merging these two controllers into a single controller, and refactoring a lot of the similar code paths into one single pipeline for volume config handling. Signed-off-by: Laura Brehm <laurabrehm@hey.com>
1 parent 66c01a7 commit 43f4e31

File tree

11 files changed

+1176
-1160
lines changed

11 files changed

+1176
-1160
lines changed

internal/app/machined/pkg/controllers/block/system_volumes.go

Lines changed: 453 additions & 0 deletions
Large diffs are not rendered by default.

internal/app/machined/pkg/controllers/block/user_volume_config.go

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

internal/app/machined/pkg/controllers/block/user_volume_config_test.go

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

0 commit comments

Comments
 (0)