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 osbuild#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 2e82de9 commit 5d665d7
Show file tree
Hide file tree
Showing 387 changed files with 3,341 additions and 3,341 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": "37cb38b9-8c29-4d40-807b-01fb1aa45661",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
},
{
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "bcd7f438-47c4-4ccd-bfa4-19eb47f2c3ff",
"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": "ca131c38-55dc-4031-8544-3910e3a4a73a",
"partitions": [
{
"size": 409600,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "55afa538-83dd-4074-9b7d-1c1fbfa7e611"
},
{
"size": 1024000,
"start": 411648,
"type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
"uuid": "845227b4-2ad8-48cb-b1ad-23519722f7c4"
},
{
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "368ab1af-7beb-44c7-ab22-384b36cc7d60"
}
]
},
Expand Down Expand Up @@ -4949,7 +4949,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "bcd7f438-47c4-4ccd-bfa4-19eb47f2c3ff",
"label": "boot"
},
"devices": {
Expand All @@ -4967,7 +4967,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"uuid": "37cb38b9-8c29-4d40-807b-01fb1aa45661",
"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": "37cb38b9-8c29-4d40-807b-01fb1aa45661"
},
{
"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": "bcd7f438-47c4-4ccd-bfa4-19eb47f2c3ff"
}
],
"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": "688acc8e-b7ed-4836-ac4b-995b17d445e7",
"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": "0eabf570-5ce8-4e9e-b3dd-8bef7e7af7b1",
"label": "Anaconda"
},
"devices": {
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": "57e78fd7-5b14-463e-a4eb-8d6216c84db1",
"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": "e135b792-962f-4f57-bf19-ffc96a8cdfbe",
"partitions": [
{
"size": 204800,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "208380f8-07b7-462a-b82f-6369530c362b"
},
{
"size": 8181727,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "0602db84-5db2-4722-8650-2b14bca85032"
}
]
},
Expand Down Expand Up @@ -5107,7 +5107,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "57e78fd7-5b14-463e-a4eb-8d6216c84db1",
"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": "57e78fd7-5b14-463e-a4eb-8d6216c84db1"
},
{
"bootable": false,
Expand Down
12 changes: 6 additions & 6 deletions manifest-db/centos_8-aarch64-qcow2-boot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4905,7 +4905,7 @@
"options": {
"filesystems": [
{
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "05309baa-588a-40e0-a497-4954ef095bf7",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
Expand Down Expand Up @@ -4963,19 +4963,19 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "cd6b633f-453a-4bd2-9277-45ce0a711a35",
"partitions": [
{
"size": 204800,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "393d7d08-7957-4a88-8ac6-9c31d8c53d61"
},
{
"size": 20764639,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "92772380-7d0a-446b-92f4-d4d55330623d"
}
]
},
Expand Down Expand Up @@ -5009,7 +5009,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "05309baa-588a-40e0-a497-4954ef095bf7",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7130,7 +7130,7 @@
"size": 10631495168,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "05309baa-588a-40e0-a497-4954ef095bf7"
},
{
"bootable": false,
Expand Down
26 changes: 13 additions & 13 deletions manifest-db/centos_8-aarch64-qcow2_customize-boot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5350,19 +5350,19 @@
"options": {
"filesystems": [
{
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "f72c2391-96c0-4bdc-8954-0868bd83993b",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
},
{
"uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4",
"uuid": "ebe27a12-4d9a-4e81-ac45-5967fdc30693",
"vfs_type": "xfs",
"path": "/boot",
"options": "defaults"
},
{
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"uuid": "1ddd53ad-2a80-4879-89b3-5235fc1be174",
"vfs_type": "xfs",
"path": "/opt",
"options": "defaults"
Expand Down Expand Up @@ -5567,25 +5567,25 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "d47950d7-d518-4b61-9040-365b802acc24",
"partitions": [
{
"size": 204800,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "df10c7a1-1a6c-44f3-a4c4-1ff21bbe0e18"
},
{
"size": 19716063,
"start": 1255424,
"type": "E6D6D379-F507-44C2-A23C-238F2A3DF928",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "865804a9-fd48-4447-abae-99bee231de3f"
},
{
"size": 1048576,
"start": 206848,
"type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
"uuid": "a178892e-e285-4ce1-9114-55780875d64e"
"uuid": "87c672b2-6a8e-4ed6-b7ec-6a0aaddb1768"
}
]
},
Expand Down Expand Up @@ -5645,7 +5645,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "f72c2391-96c0-4bdc-8954-0868bd83993b",
"label": "root"
},
"devices": {
Expand All @@ -5670,7 +5670,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
"uuid": "1ddd53ad-2a80-4879-89b3-5235fc1be174"
},
"devices": {
"device": {
Expand All @@ -5694,7 +5694,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4"
"uuid": "ebe27a12-4d9a-4e81-ac45-5967fdc30693"
},
"devices": {
"device": {
Expand Down Expand Up @@ -8097,12 +8097,12 @@
"optlv": {
"fstype": "xfs",
"label": null,
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
"uuid": "1ddd53ad-2a80-4879-89b3-5235fc1be174"
},
"rootlv": {
"fstype": "xfs",
"label": "root",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "f72c2391-96c0-4bdc-8954-0868bd83993b"
}
},
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
Expand All @@ -8129,7 +8129,7 @@
"size": 536870912,
"start": 105906176,
"type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
"uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4"
"uuid": "ebe27a12-4d9a-4e81-ac45-5967fdc30693"
}
],
"passwd": [
Expand Down
12 changes: 6 additions & 6 deletions manifest-db/centos_8-aarch64-vhd-boot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6479,7 +6479,7 @@
"options": {
"filesystems": [
{
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "a9432e41-e670-46b7-be03-875081432957",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
Expand Down Expand Up @@ -6555,19 +6555,19 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "939bb7c7-59b1-49a2-89d9-f4ac7e45a63d",
"partitions": [
{
"size": 204800,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "21625c9f-a579-4efa-8016-f2b4d7fafe76"
},
{
"size": 8181727,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "2c62f2a4-fe73-4bfe-bc65-1bb935fadfd6"
}
]
},
Expand Down Expand Up @@ -6601,7 +6601,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "a9432e41-e670-46b7-be03-875081432957",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -9468,7 +9468,7 @@
"size": 4189044224,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "a9432e41-e670-46b7-be03-875081432957"
},
{
"bootable": false,
Expand Down
6 changes: 3 additions & 3 deletions manifest-db/centos_8-ppc64le-qcow2-boot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5856,7 +5856,7 @@
"options": {
"filesystems": [
{
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "b3394741-a940-4acc-a62f-a3a661eb921f",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
Expand Down Expand Up @@ -5926,7 +5926,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "b3394741-a940-4acc-a62f-a3a661eb921f"
},
"devices": {
"device": {
Expand Down Expand Up @@ -8311,7 +8311,7 @@
"size": 10732175360,
"start": 5242880,
"type": "83",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "b3394741-a940-4acc-a62f-a3a661eb921f"
}
],
"passwd": [
Expand Down
Loading

0 comments on commit 5d665d7

Please sign in to comment.