Skip to content

feat(storage): add search conditions #2338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joseivanlopez merged 12 commits into from
May 14, 2025
Merged

feat(storage): add search conditions #2338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7931b68
schema: add search conditions
joseivanlopez May 7, 2025
0e69e06
storage: generate search conditions from json
joseivanlopez May 8, 2025
84abe81
refactor(storage): prepare search solvers for adding conditions
joseivanlopez May 9, 2025
b52aabd
storage: add search by size
joseivanlopez May 13, 2025
440a10d
storage: add search by partition number
joseivanlopez May 13, 2025
c3efd9d
storage: filter candidate devices
joseivanlopez May 13, 2025
fda022e
storage: check members of reused md raid
joseivanlopez May 13, 2025
455d4cd
storage: convert search conditions to json
joseivanlopez May 14, 2025
155b0a0
storage: raise proper exception
joseivanlopez May 14, 2025
cc47b87
storage: do not recreate a disk analyzer
joseivanlopez May 14, 2025
cdf55e4
rust: changelog
joseivanlopez May 14, 2025
55f9856
service: changelog
joseivanlopez May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions rust/agama-lib/share/examples/storage/drive_search.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"storage": {
"drives": [
{ "search": "*" },
{ "search": "/dev/vda" },
{
"search": {
"condition": { "name": "/dev/vdb" },
"ifNotFound": "skip"
}
},
{
"search": {
"condition": { "size": "10 GiB" },
"ifNotFound": "error",
"max": 2
}
},
{
"search": {
"condition": {
"size": { "equal": "10 GiB" }
}
}
},
{
"search": {
"condition": {
"size": { "greater": "10 GiB" }
}
}
},
{
"search": {
"condition": {
"size": { "less": "10 GiB" }
}
}
}
]
}
}
43 changes: 43 additions & 0 deletions rust/agama-lib/share/examples/storage/md_raid_search.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"storage": {
"mdRaids": [
{ "search": "*" },
{ "search": "/dev/md1" },
{
"search": {
"condition": { "name": "/dev/md2" },
"ifNotFound": "skip"
}
},
{
"search": {
"condition": { "size": "10 GiB" },
"ifNotFound": "error",
"max": 2
}
},
{
"search": {
"condition": {
"size": { "equal": "10 GiB" }
},
"ifNotFound": "create"
}
},
{
"search": {
"condition": {
"size": { "greater": "10 GiB" }
}
}
},
{
"search": {
"condition": {
"size": { "less": "10 GiB" }
}
}
}
]
}
}
120 changes: 120 additions & 0 deletions rust/agama-lib/share/examples/storage/partition_search.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"storage": {
"drives": [
{
"search": "/dev/vda",
"partitions": [
{ "search": "*" },
{ "search": "/dev/vda1" },
{
"search": {
"condition": { "name": "/dev/vda2" },
"ifNotFound": "skip"
}
},
{
"search": {
"condition": { "size": "10 GiB" },
"ifNotFound": "error",
"max": 2
}
},
{
"search": {
"condition": {
"size": { "equal": "10 GiB" }
},
"ifNotFound": "create"
}
},
{
"search": {
"condition": {
"size": { "greater": "10 GiB" }
}
}
},
{
"search": {
"condition": {
"size": { "less": "10 GiB" }
}
}
},
{
"search": {
"max": 1,
"ifNotFound": "error"
},
"delete": true
},
{
"search": {
"max": 1,
"ifNotFound": "skip"
},
"deleteIfNeeded": true
}
]
}
],
"mdRaids": [
{
"search": "/dev/md1",
"partitions": [
{ "search": "*" },
{ "search": "/dev/md1-p1" },
{
"search": {
"condition": { "name": "/dev/md1-p2" },
"ifNotFound": "skip"
}
},
{
"search": {
"condition": { "size": "10 GiB" },
"ifNotFound": "error",
"max": 2
}
},
{
"search": {
"condition": {
"size": { "equal": "10 GiB" }
},
"ifNotFound": "create"
}
},
{
"search": {
"condition": {
"size": { "greater": "10 GiB" }
}
}
},
{
"search": {
"condition": {
"size": { "less": "10 GiB" }
}
}
},
{
"search": {
"max": 1,
"ifNotFound": "error"
},
"delete": true
},
{
"search": {
"max": 1,
"ifNotFound": "skip"
},
"deleteIfNeeded": true
}
]
}
]
}
}
Loading
Loading