Skip to content

Commit 366c5da

Browse files
committed
osbuild: set agcount=2 for XFS filesystems
In the past the agcount has been 4 (I think the default), but I've been told that it may also depend on your the number of processors in the host where you run mkfs.xfs, so it could be higher than that. We want to set it to the lowest possible value here (2) so growing filesystems won't cause our agcount to increase as dramatically as it has in the past. Closes coreos/fedora-coreos-tracker#1993
1 parent a6bc7f6 commit 366c5da

File tree

5 files changed

+45
-0
lines changed

5 files changed

+45
-0
lines changed

src/osbuild-manifests/coreos.osbuild.aarch64.mpp.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ mpp-vars:
2323
boot_fs_label: boot
2424
root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
2525
root_fs_label: root
26+
# The agcount of the XFS root filesystem. Set this to a smaller value
27+
# than the default (4) so we grown filesystems (most of our user
28+
# base) will have a lower overall agcount for their grown filesystem.
29+
# See https://github.com/coreos/fedora-coreos-tracker/issues/1993
30+
root_fs_agcount: 2
2631
# For some stages (i.e. the qemu stages) we'll use the host as
2732
# the buildroot (i.e. COSA in most cases but sometimes just
2833
# the actual HOST filesystem like in coreos/custom-coreos-disk-images).
@@ -304,6 +309,8 @@ pipelines:
304309
mpp-format-int: '{image.layout[''root''].size}'
305310
lock: true
306311
options:
312+
agcount:
313+
mpp-format-int: '{root_fs_agcount}'
307314
uuid:
308315
mpp-format-string: '{root_fs_uuid}'
309316
label:
@@ -554,6 +561,8 @@ pipelines:
554561
sector-size:
555562
mpp-format-int: "{four_k_sector_size}"
556563
options:
564+
agcount:
565+
mpp-format-int: '{root_fs_agcount}'
557566
uuid:
558567
mpp-format-string: '{root_fs_uuid}'
559568
label:

src/osbuild-manifests/coreos.osbuild.ppc64le.mpp.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ mpp-vars:
2323
boot_fs_label: boot
2424
root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
2525
root_fs_label: root
26+
# The agcount of the XFS root filesystem. Set this to a smaller value
27+
# than the default (4) so we grown filesystems (most of our user
28+
# base) will have a lower overall agcount for their grown filesystem.
29+
# See https://github.com/coreos/fedora-coreos-tracker/issues/1993
30+
root_fs_agcount: 2
2631
# For some stages (i.e. the qemu stages) we'll use the host as
2732
# the buildroot (i.e. COSA in most cases but sometimes just
2833
# the actual HOST filesystem like in coreos/custom-coreos-disk-images).
@@ -298,6 +303,8 @@ pipelines:
298303
mpp-format-int: '{image.layout[''root''].size}'
299304
lock: true
300305
options:
306+
agcount:
307+
mpp-format-int: '{root_fs_agcount}'
301308
uuid:
302309
mpp-format-string: '{root_fs_uuid}'
303310
label:
@@ -517,6 +524,8 @@ pipelines:
517524
sector-size:
518525
mpp-format-int: "{four_k_sector_size}"
519526
options:
527+
agcount:
528+
mpp-format-int: '{root_fs_agcount}'
520529
uuid:
521530
mpp-format-string: '{root_fs_uuid}'
522531
label:

src/osbuild-manifests/coreos.osbuild.riscv64.mpp.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ mpp-vars:
2323
boot_fs_label: boot
2424
root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
2525
root_fs_label: root
26+
# The agcount of the XFS root filesystem. Set this to a smaller value
27+
# than the default (4) so we grown filesystems (most of our user
28+
# base) will have a lower overall agcount for their grown filesystem.
29+
# See https://github.com/coreos/fedora-coreos-tracker/issues/1993
30+
root_fs_agcount: 2
2631
# For some stages (i.e. the qemu stages) we'll use the host as
2732
# the buildroot (i.e. COSA in most cases but sometimes just
2833
# the actual HOST filesystem like in coreos/custom-coreos-disk-images).
@@ -304,6 +309,8 @@ pipelines:
304309
mpp-format-int: '{image.layout[''root''].size}'
305310
lock: true
306311
options:
312+
agcount:
313+
mpp-format-int: '{root_fs_agcount}'
307314
uuid:
308315
mpp-format-string: '{root_fs_uuid}'
309316
label:
@@ -554,6 +561,8 @@ pipelines:
554561
sector-size:
555562
mpp-format-int: "{four_k_sector_size}"
556563
options:
564+
agcount:
565+
mpp-format-int: '{root_fs_agcount}'
557566
uuid:
558567
mpp-format-string: '{root_fs_uuid}'
559568
label:

src/osbuild-manifests/coreos.osbuild.s390x.mpp.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ mpp-vars:
2727
boot_fs_label: boot
2828
root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
2929
root_fs_label: root
30+
# The agcount of the XFS root filesystem. Set this to a smaller value
31+
# than the default (4) so we grown filesystems (most of our user
32+
# base) will have a lower overall agcount for their grown filesystem.
33+
# See https://github.com/coreos/fedora-coreos-tracker/issues/1993
34+
root_fs_agcount: 2
3035
# For some stages (i.e. the qemu stages) we'll use the host as
3136
# the buildroot (i.e. COSA in most cases but sometimes just
3237
# the actual HOST filesystem like in coreos/custom-coreos-disk-images).
@@ -300,6 +305,8 @@ pipelines:
300305
mpp-format-int: '{image.layout[''root''].size}'
301306
lock: true
302307
options:
308+
agcount:
309+
mpp-format-int: '{root_fs_agcount}'
303310
uuid:
304311
mpp-format-string: '{root_fs_uuid}'
305312
label:
@@ -490,6 +497,8 @@ pipelines:
490497
sector-size:
491498
mpp-format-int: "{four_k_sector_size}"
492499
options:
500+
agcount:
501+
mpp-format-int: '{root_fs_agcount}'
493502
uuid:
494503
mpp-format-string: '{root_fs_uuid}'
495504
label:

src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ mpp-vars:
2323
boot_fs_label: boot
2424
root_fs_uuid: 910678ff-f77e-4a7d-8d53-86f2ac47a823
2525
root_fs_label: root
26+
# The agcount of the XFS root filesystem. Set this to a smaller value
27+
# than the default (4) so we grown filesystems (most of our user
28+
# base) will have a lower overall agcount for their grown filesystem.
29+
# See https://github.com/coreos/fedora-coreos-tracker/issues/1993
30+
root_fs_agcount: 2
2631
# For some stages (i.e. the qemu stages) we'll use the host as
2732
# the buildroot (i.e. COSA in most cases but sometimes just
2833
# the actual HOST filesystem like in coreos/custom-coreos-disk-images).
@@ -306,6 +311,8 @@ pipelines:
306311
mpp-format-int: '{image.layout[''root''].size}'
307312
lock: true
308313
options:
314+
agcount:
315+
mpp-format-int: '{root_fs_agcount}'
309316
uuid:
310317
mpp-format-string: '{root_fs_uuid}'
311318
label:
@@ -558,6 +565,8 @@ pipelines:
558565
sector-size:
559566
mpp-format-int: "{four_k_sector_size}"
560567
options:
568+
agcount:
569+
mpp-format-int: '{root_fs_agcount}'
561570
uuid:
562571
mpp-format-string: '{root_fs_uuid}'
563572
label:

0 commit comments

Comments
 (0)