openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Defining fs.aio-max-nr for hosts with libvirt service 

When we install libvirt on a host, the system parameter ``fs.aio-max-nr`` is
to 1048576. Since we containerized libvirtd, we lost this system parameter.
We now make sure it's defined by adding it from the nova-libvirt-common
template.

Conflict:
 - roles/ComputeVdpa.yaml is only on Wallaby
 - adapted for rocky template version

Related: https://bugzilla.redhat.com/show_bug.cgi?id=2036195
Closes-Bug: 1959449
Change-Id: I4d82e2a467c4250b23cc7de97233f934b3dbbe46
(cherry picked from commit 97c1306b27)
(cherry picked from commit e8acb586dd)
This commit is contained in:
David Vallee Delisle 2022-01-18 10:17:10 -05:00
parent 371bb6528f
commit e01fe8b342
26 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
deployment/kernel/kernel-baremetal-ansible.yaml
View File

@ -102,6 +102,19 @@ parameters:
type: json
tags:
- role_specific
FsAioMaxNumber:
default: 0
description: >
The kernel allocates aio memory on demand, and this number limits the
number of parallel aio requests; the only drawback of a larger limit is
that a malicious guest could issue parallel requests to cause the kernel
to set aside memory. Set this number at least as large as
128 * (number of virtual disks on the host)
Libvirt uses a default of 1M requests to allow 8k disks, with at most
64M of kernel memory if all disks hit an aio request at the same time.
type: number
tags:
- role_specific
# DEPRECATED: the following options are deprecated and are currently maintained
# for backwards compatibility. They will be removed in future release.
@ -109,7 +122,6 @@ parameters:
default: 1024
description: Configures sysctl fs.inotify.max_user_instances key
type: number
parameter_groups:
- label: deprecated
description: Do not use deprecated params, they will be removed.
@ -120,6 +132,10 @@ conditions:
ipv6_disabled: {equals: [{get_param: KernelDisableIPv6}, 1]}
# TODO: remove when misseplt/deprecated parameter InotifyIntancesMax is removed.
is_inotify_intances_max_default: {equals: [{get_param: InotifyIntancesMax}, 1024]}
fs_aio_max_number_set:
and:
- not: {equals: [{get_param: [RoleParameters, FsAioMaxNumber]}, 0]}
- not: {equals: [{get_param: [RoleParameters, FsAioMaxNumber]}, '']}
resources:
# Merging role-specific parameters (RoleParameters) with the default parameters.
@ -192,4 +208,9 @@ outputs:
- is_inotify_intances_max_default
- {get_param: InotifyInstancesMax}
- {get_param: InotifyIntancesMax}
- if:
- fs_aio_max_number_set
- fs.aio-max-nr:
value: {get_param: [RoleParameters, FsAioMaxNumber]}
- {}
- {get_attr: [RoleParametersValue, value, extra_sysctl_settings]}

7
releasenotes/notes/fixing-fs.aio-max.nr-on-compute-06447122b8e12c71.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
When we install libvirt on a host, the system parameter ``fs.aio-max-nr`` is
to 1048576. Since we containerized libvirtd, we lost this system parameter.
We now make sure it's defined by adding it from the nova-libvirt-common
template.

1
roles/Compute.yaml
View File

@ -18,6 +18,7 @@
subnet: storage_subnet
HostnameFormatDefault: '%stackname%-novacompute-%index%'
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
# Deprecated & backward-compatible values (FIXME: Make parameters consistent)
# Set uses_deprecated_params to True if any deprecated params are used.

1
roles/ComputeAlt.yaml
View File

@ -16,6 +16,7 @@
subnet: storage_subnet
HostnameFormatDefault: '%stackname%-novacomputealt-%index%'
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
update_serial: 25
ServicesDefault:

1
roles/ComputeDVR.yaml
View File

@ -17,6 +17,7 @@
subnet: storage_subnet
HostnameFormatDefault: '%stackname%-novacompute-dvr-%index%'
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
update_serial: 25
ServicesDefault:

1
roles/ComputeHCI.yaml
View File

@ -16,6 +16,7 @@
StorageMgmt:
subnet: storage_mgmt_subnet
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "throughput-performance"
# CephOSD present so serial has to be 1
update_serial: 1

1
roles/ComputeHCIOvsDpdk.yaml
View File

@ -19,6 +19,7 @@
# CephOSD present so serial has to be 1
update_serial: 1
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "cpu-partitioning"
VhostuserSocketGroup: "hugetlbfs"
NovaLibvirtRxQueueSize: 1024

1
roles/ComputeHCISriov.yaml
View File

@ -16,6 +16,7 @@
StorageMgmt:
subnet: storage_mgmt_subnet
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "cpu-partitioning"
# CephOSD present so serial has to be 1
update_serial: 1

1
roles/ComputeInstanceHA.yaml
View File

@ -16,6 +16,7 @@
subnet: storage_subnet
HostnameFormatDefault: '%stackname%-novacomputeiha-%index%'
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
update_serial: 25
ServicesDefault:

1
roles/ComputeLocalEphemeral.yaml
View File

@ -19,6 +19,7 @@
update_serial: 25
HostnameFormatDefault: '%stackname%-novacompute-local-%index%'
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
NovaEnableRbdBackend: false
ServicesDefault:

1
roles/ComputeOvsDpdk.yaml
View File

@ -17,6 +17,7 @@
subnet: storage_subnet
deprecated_nic_config_name: 'compute-dpdk.yaml'
RoleParametersDefault:
FsAioMaxNumber: 1048576
VhostuserSocketGroup: "hugetlbfs"
TunedProfileName: "cpu-partitioning"
NovaLibvirtRxQueueSize: 1024

1
roles/ComputeOvsDpdkRT.yaml
View File

@ -17,6 +17,7 @@
subnet: storage_subnet
ImageDefault: overcloud-realtime-compute
RoleParametersDefault:
FsAioMaxNumber: 1048576
VhostuserSocketGroup: "hugetlbfs"
TunedProfileName: "realtime-virtual-host"
NovaLibvirtRxQueueSize: 1024

1
roles/ComputeOvsDpdkSriov.yaml
View File

@ -13,6 +13,7 @@
- Tenant
- Storage
RoleParametersDefault:
FsAioMaxNumber: 1048576
VhostuserSocketGroup: "hugetlbfs"
TunedProfileName: "cpu-partitioning"
NovaLibvirtRxQueueSize: 1024

1
roles/ComputeOvsDpdkSriovRT.yaml
View File

@ -14,6 +14,7 @@
- Storage
ImageDefault: overcloud-realtime-compute
RoleParametersDefault:
FsAioMaxNumber: 1048576
VhostuserSocketGroup: "hugetlbfs"
TunedProfileName: "realtime-virtual-host"
NovaLibvirtRxQueueSize: 1024

1
roles/ComputePPC64LE.yaml
View File

@ -17,6 +17,7 @@
HostnameFormatDefault: '%stackname%-novacomputeppc64le-%index%'
ImageDefault: ppc64le-overcloud-full
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
update_serial: 25
ServicesDefault:

1
roles/ComputeRBDEphemeral.yaml
View File

@ -19,6 +19,7 @@
update_serial: 25
HostnameFormatDefault: '%stackname%-novacompute-rbd-%index%'
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
NovaEnableRbdBackend: true
ServicesDefault:

1
roles/ComputeRealTime.yaml
View File

@ -21,6 +21,7 @@
HostnameFormatDefault: '%stackname%-computerealtime-%index%'
ImageDefault: overcloud-realtime-compute
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "realtime-virtual-host"
KernelArgs: "" # these must be set in an environment file or
IsolCpusList: "" # similar according to the hardware of

1
roles/ComputeSriov.yaml
View File

@ -15,6 +15,7 @@
Storage:
subnet: storage_subnet
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "cpu-partitioning"
update_serial: 25
ServicesDefault:

1
roles/ComputeSriovIB.yaml
View File

@ -15,6 +15,7 @@
Storage:
subnet: storage_subnet
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "cpu-partitioning"
update_serial: 25
ServicesDefault:

1
roles/ComputeSriovRT.yaml
View File

@ -16,6 +16,7 @@
subnet: storage_subnet
ImageDefault: overcloud-realtime-compute
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "realtime-virtual-host"
NovaLibvirtMemStatsPeriodSeconds: 0
NovaComputeDisableIrqBalance: True

1
roles/DistributedCompute.yaml
View File

@ -15,6 +15,7 @@
Storage:
subnet: storage_subnet
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
update_serial: 25
ServicesDefault:

1
roles/DistributedComputeHCI.yaml
View File

@ -16,6 +16,7 @@
StorageMgmt:
subnet: storage_mgmt_subnet
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "throughput-performance"
# CephOSD present so serial has to be 1
update_serial: 1

1
roles/DistributedComputeHCIDashboard.yaml
View File

@ -18,6 +18,7 @@
StorageDashboard:
subnet: storage_dashboard_subnet
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "throughput-performance"
# CephOSD present so serial has to be 1
update_serial: 1

1
roles/DistributedComputeHCIScaleOut.yaml
View File

@ -16,6 +16,7 @@
StorageMgmt:
subnet: storage_mgmt_subnet
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "throughput-performance"
# CephOSD present so serial has to be 1
update_serial: 1

1
roles/DistributedComputeScaleOut.yaml
View File

@ -15,6 +15,7 @@
Storage:
subnet: storage_subnet
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
update_serial: 25
ServicesDefault:

1
roles_data.yaml
View File

@ -209,6 +209,7 @@
subnet: storage_subnet
HostnameFormatDefault: '%stackname%-novacompute-%index%'
RoleParametersDefault:
FsAioMaxNumber: 1048576
TunedProfileName: "virtual-host"
# Deprecated & backward-compatible values (FIXME: Make parameters consistent)
# Set uses_deprecated_params to True if any deprecated params are used.