Skip to content

Commit

Permalink
manifest-db: make all UUIDs unique
Browse files Browse the repository at this point in the history 
We get regular failures in the manifest-db run. With the extra
visibility from #123
it seems the errors we get (sometimes) are related to an xfs mount
```
mount/- (org.osbuild.xfs): mounting /dev/98302bc3-1aa3-4eab-96e9-9f1c6eb539ce/rootlv -> /var/lib/osbuild/store/tmp/buildroot-tmp-3y2wyhos/mounts/
mount/- (org.osbuild.xfs): already unmounted: /var/lib/osbuild/store/tmp/buildroot-tmp-3y2wyhos/mounts/
```
which looks similar the UUID clashes we observed in
osbuild/osbuild#1641

Upon inspecting the manifests it seems we have quite a few UUIDs in
our manifests. Those *might* explain the issues that we sometimes
see because the UUIDs is global to the host so running multiple tests
in parallel can lead to clashes when xfs/btrfs assume that the
mount is already done when in fact it was a different loopdevice
that just happend to clash with the UUID.

This commit creates a new UUID for each file where a duplicated
UUID is found (but keeps that UUID inside the same file stable).

We could make this smaller by limiting this to only xfs/btfs which
(AFAIK) are the only systems affected by UUID clashes but my
script is not smart enough for this.
  • Loading branch information
@mvo5
mvo5 committed May 2, 2024
1 parent c15cf3e commit 9fecc0f
Show file tree
Hide file tree
Showing 552 changed files with 5,322 additions and 5,322 deletions.
20 changes: 10 additions & 10 deletions manifest-db/centos_8-aarch64-ami-boot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4821,13 +4821,13 @@
"options": {
"filesystems": [
{
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"uuid": "6053e3ca-2a1a-4c49-9952-9e425d328c60",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
},
{
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "0e6f4804-2579-48ed-8647-6caf3a60051c",
"vfs_type": "xfs",
"path": "/boot",
"options": "defaults"
Expand Down Expand Up @@ -4897,25 +4897,25 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "626e1792-74ab-497a-a8b5-90dc172328ea",
"partitions": [
{
"size": 409600,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "77771927-79c4-4d03-a57d-d7828d7f7874"
},
{
"size": 1024000,
"start": 411648,
"type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
"uuid": "0ba20969-cbb1-477f-b7b1-94b90441eb1f"
},
{
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "16c458d0-4c83-48eb-81cd-220ce9716fd3"
}
]
},
Expand Down Expand Up @@ -4949,7 +4949,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "0e6f4804-2579-48ed-8647-6caf3a60051c",
"label": "boot"
},
"devices": {
Expand All @@ -4967,7 +4967,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"uuid": "6053e3ca-2a1a-4c49-9952-9e425d328c60",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7018,7 +7018,7 @@
"size": 10002349568,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
"uuid": "6053e3ca-2a1a-4c49-9952-9e425d328c60"
},
{
"bootable": false,
Expand All @@ -7038,7 +7038,7 @@
"size": 524288000,
"start": 210763776,
"type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "0e6f4804-2579-48ed-8647-6caf3a60051c"
}
],
"passwd": [
Expand Down
20 changes: 10 additions & 10 deletions manifest-db/centos_8-aarch64-ami-empty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4821,13 +4821,13 @@
"options": {
"filesystems": [
{
"uuid": "308f6813-e223-438d-a043-a32c3a016c05",
"uuid": "76a84636-e7bb-4bf7-9fa7-b50450e07cf4",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
},
{
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"uuid": "839edddd-4e99-4df4-b7e6-57e52600f52a",
"vfs_type": "xfs",
"path": "/boot",
"options": "defaults"
Expand Down Expand Up @@ -4897,25 +4897,25 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "e22df9fb-b630-4cf7-a70c-5090221c5ffd",
"partitions": [
{
"size": 409600,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "6907bf0a-f26c-4d5c-9b96-df429188b037"
},
{
"size": 2097152,
"start": 411648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
"uuid": "d5105275-4952-4613-8fce-c83f66d1b0ad"
},
{
"size": 18462687,
"start": 2508800,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "59217e4b-30c4-40b3-83ec-f8290c2b5112"
}
]
},
Expand Down Expand Up @@ -4949,7 +4949,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180"
"uuid": "839edddd-4e99-4df4-b7e6-57e52600f52a"
},
"devices": {
"device": {
Expand All @@ -4966,7 +4966,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "308f6813-e223-438d-a043-a32c3a016c05",
"uuid": "76a84636-e7bb-4bf7-9fa7-b50450e07cf4",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7038,7 +7038,7 @@
"size": 9452895744,
"start": 1284505600,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "308f6813-e223-438d-a043-a32c3a016c05"
"uuid": "76a84636-e7bb-4bf7-9fa7-b50450e07cf4"
},
{
"bootable": false,
Expand All @@ -7058,7 +7058,7 @@
"size": 1073741824,
"start": 210763776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180"
"uuid": "839edddd-4e99-4df4-b7e6-57e52600f52a"
}
],
"passwd": [
Expand Down
2 changes: 1 addition & 1 deletion manifest-db/centos_8-aarch64-image_installer-boot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8723,7 +8723,7 @@
{
"type": "org.osbuild.mkfs.ext4",
"options": {
"uuid": "2fe99653-f7ff-44fd-bea8-fa70107524fb",
"uuid": "28143c21-c0eb-4bd1-bf42-a9d476720ca0",
"label": "Anaconda"
},
"devices": {
Expand Down
2 changes: 1 addition & 1 deletion manifest-db/centos_8-aarch64-image_installer-empty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8907,7 +8907,7 @@
{
"type": "org.osbuild.mkfs.ext4",
"options": {
"uuid": "2fe99653-f7ff-44fd-bea8-fa70107524fb",
"uuid": "88156399-c55b-4ffc-ba4f-50ddc388e92f",
"label": "Anaconda"
},
"devices": {
Expand Down
2 changes: 1 addition & 1 deletion manifest-db/centos_8-aarch64-image_installer-unattended_iso.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8907,7 +8907,7 @@
{
"type": "org.osbuild.mkfs.ext4",
"options": {
"uuid": "2fe99653-f7ff-44fd-bea8-fa70107524fb",
"uuid": "3d36910c-721c-48a3-b7b9-82a4eb43591c",
"label": "Anaconda"
},
"devices": {
Expand Down
2 changes: 1 addition & 1 deletion manifest-db/centos_8-aarch64-image_installer_with_users-boot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8723,7 +8723,7 @@
{
"type": "org.osbuild.mkfs.ext4",
"options": {
"uuid": "2fe99653-f7ff-44fd-bea8-fa70107524fb",
"uuid": "46ecc7f8-6dfe-4243-b3a0-79a6696f5070",
"label": "Anaconda"
},
"devices": {
Expand Down
12 changes: 6 additions & 6 deletions manifest-db/centos_8-aarch64-minimal_raw-empty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5199,7 +5199,7 @@
"options": {
"filesystems": [
{
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"uuid": "1e290158-01e7-4d27-b7f8-8554ba5e9567",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
Expand Down Expand Up @@ -5296,19 +5296,19 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "18479e5e-7afe-4f24-8295-c004cd4533a3",
"partitions": [
{
"size": 204800,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "a9f5125a-8bab-4509-8959-c297c19815d8"
},
{
"size": 6293471,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "2db5c621-393e-4bc2-a02e-ff8c18dfe344"
}
]
},
Expand Down Expand Up @@ -5342,7 +5342,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"uuid": "1e290158-01e7-4d27-b7f8-8554ba5e9567",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7531,7 +7531,7 @@
"size": 3222257152,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180"
"uuid": "1e290158-01e7-4d27-b7f8-8554ba5e9567"
},
{
"bootable": false,
Expand Down
12 changes: 6 additions & 6 deletions manifest-db/centos_8-aarch64-openstack-boot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5009,7 +5009,7 @@
"options": {
"filesystems": [
{
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "a2dc423e-457d-4b83-8b78-d12e078a6d98",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
Expand Down Expand Up @@ -5061,19 +5061,19 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "0e03d12a-0bef-42c8-b540-d736296bd521",
"partitions": [
{
"size": 204800,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "7a55e03a-0b80-4c57-bce4-b7a222d4b950"
},
{
"size": 8181727,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "0942564a-62f6-4eab-a138-b229da0db0dc"
}
]
},
Expand Down Expand Up @@ -5107,7 +5107,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "a2dc423e-457d-4b83-8b78-d12e078a6d98",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7277,7 +7277,7 @@
"size": 4189044224,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "a2dc423e-457d-4b83-8b78-d12e078a6d98"
},
{
"bootable": false,
Expand Down
12 changes: 6 additions & 6 deletions manifest-db/centos_8-aarch64-openstack-empty.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4999,7 +4999,7 @@
"options": {
"filesystems": [
{
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"uuid": "f76a8008-d5b3-4786-b8dc-0b44772dc2bf",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
Expand Down Expand Up @@ -5051,19 +5051,19 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "a50b98fe-5812-49e8-936b-79d989ce7262",
"partitions": [
{
"size": 204800,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "3267581c-915d-4762-8e83-b8546a4b2810"
},
{
"size": 8181727,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "13404217-463c-4ff4-a893-5eb32f25ad58"
}
]
},
Expand Down Expand Up @@ -5097,7 +5097,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"uuid": "f76a8008-d5b3-4786-b8dc-0b44772dc2bf",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7287,7 +7287,7 @@
"size": 4189044224,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180"
"uuid": "f76a8008-d5b3-4786-b8dc-0b44772dc2bf"
},
{
"bootable": false,
Expand Down
Loading

0 comments on commit 9fecc0f

Please sign in to comment.