starlingx/config
Code Issues Proposed changes

Merge "AIO-SX Regression: Memory usage exceed alarms appeared during test run"

Browse Source
This commit is contained in:
Zuul 2018-06-27 16:15:01 +00:00 committed by Gerrit Code Review
commit 7a12c4aaae
3 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
puppet-manifests/src/modules/openstack/manifests/ceilometer.pp
View File

@ -118,13 +118,19 @@ class openstack::ceilometer::collector {
notification_workers => $::platform::params::eng_workers_by_2, notification_workers => $::platform::params::eng_workers_by_2,
} }
if $::platform::params::system_type == 'All-in-one' {
$batch_timeout = 25
} else {
$batch_timeout = 5
}
# FIXME(mpeters): generic parameter can be moved to the puppet module # FIXME(mpeters): generic parameter can be moved to the puppet module
ceilometer_config { ceilometer_config {
'DEFAULT/csv_location': value => "${ceilometer_directory_csv}"; 'DEFAULT/csv_location': value => "${ceilometer_directory_csv}";
'DEFAULT/csv_location_strict': value => true; 'DEFAULT/csv_location_strict': value => true;
'service_credentials/interface': value => 'internalURL'; 'service_credentials/interface': value => 'internalURL';
'notification/batch_size': value => 100; 'notification/batch_size': value => 100;
'notification/batch_timeout': value => 5; 'notification/batch_timeout': value => $batch_timeout;
} }
} }

2
puppet-manifests/src/modules/openstack/manifests/nova.pp
View File

@ -608,7 +608,7 @@ class openstack::nova::api::services
sync_db => $::platform::params::init_database, sync_db => $::platform::params::init_database,
sync_db_api => $::platform::params::init_database, sync_db_api => $::platform::params::init_database,
osapi_compute_workers => $::platform::params::eng_workers, osapi_compute_workers => $::platform::params::eng_workers,
metadata_workers => $::platform::params::eng_workers, metadata_workers => $::platform::params::eng_workers_by_2,
} }
} }

45
puppet-manifests/src/modules/platform/manifests/params.pp
View File

@ -34,41 +34,50 @@ class platform::params (
$phys_core_count = 0 + $::physical_core_count $phys_core_count = 0 + $::physical_core_count
$plat_res_mem = 0 + $::platform_res_mem $plat_res_mem = 0 + $::platform_res_mem
# Engineering parameters common to openstack services: # Engineering parameters common to openstack services:
# max number of workers # max number of workers
$eng_max_workers = 20 $eng_max_workers = 20
# min number of workers
$eng_min_workers = 1
# total system memory per worker # total system memory per worker
$eng_worker_mb = 2000 $eng_worker_mb = 2000
# memory headroom per worker (e.g., buffers, cached) # memory headroom per worker (e.g., buffers, cached)
$eng_overhead_mb = 1000 $eng_overhead_mb = 1000
# number of workers we can support based on memory # number of workers we can support based on memory
if $::personality == 'controller' and str2bool($::is_compute_subfunction) { if $system_type == 'All-in-one' {
# Controller memory available for small footprint # Controller memory available for AIO
# Consistent with sysinv get_platform_reserved_memory() # Consistent with sysinv get_platform_reserved_memory()
if str2bool($::is_virtual) { $eng_controller_mem = 10500
$eng_controller_mem = 6000 if $system_mode == 'simplex' or ($phys_core_count <= 8 and $plat_res_mem < 14500) or str2bool($::is_virtual) {
$small_footprint = true
} else { } else {
#If we have a reduced footprint xeon-d and if the platform memory # For AIO duplex, keep $eng_workers at 3 for now
#has not been increased by the user to the standard 14.5GB we use a $small_footprint = false
#lowered worker count to save memory
if $phys_core_count <= 8 and $plat_res_mem < 14500 {
$eng_controller_mem = 7000
} else {
$eng_controller_mem = 10500
}
} }
} else { } else {
$small_footprint = false
$eng_controller_mem = $::memorysize_mb $eng_controller_mem = $::memorysize_mb
} }
$eng_workers_mem = floor($eng_controller_mem) / ($eng_worker_mb + $eng_overhead_mb) $eng_workers_mem = floor($eng_controller_mem) / ($eng_worker_mb + $eng_overhead_mb)
# number of workers per service # number of workers per service
$eng_workers = min($eng_max_workers, $eng_workers_mem, max($phys_core_count, 2)) if $small_footprint {
$eng_workers_by_2 = min($eng_max_workers, $eng_workers_mem, max($phys_core_count/2, 2)) # Limit eng_workers and its derivatives to 2 and 1 respectively for simplex, Xeon-D and AIO in virtual box.
$eng_workers_by_4 = min($eng_max_workers, $eng_workers_mem, max($phys_core_count/4, 2)) $eng_workers = 2
$eng_workers_by_5 = min($eng_max_workers, $eng_workers_mem, max($phys_core_count/5, 2)) $eng_workers_by_2 = $eng_min_workers
$eng_workers_by_6 = min($eng_max_workers, $eng_workers_mem, max($phys_core_count/6, 2)) $eng_workers_by_4 = $eng_min_workers
$eng_workers_by_5 = $eng_min_workers
$eng_workers_by_6 = $eng_min_workers
} else {
$eng_workers = min($eng_max_workers, $eng_workers_mem, max($phys_core_count, 2))
$eng_workers_by_2 = min($eng_max_workers, $eng_workers_mem, max($phys_core_count/2, 2))
$eng_workers_by_4 = min($eng_max_workers, $eng_workers_mem, max($phys_core_count/4, 2))
$eng_workers_by_5 = min($eng_max_workers, $eng_workers_mem, max($phys_core_count/5, 2))
$eng_workers_by_6 = min($eng_max_workers, $eng_workers_mem, max($phys_core_count/6, 2))
}
$init_database = (str2bool($::is_initial_config_primary) or $controller_upgrade) $init_database = (str2bool($::is_initial_config_primary) or $controller_upgrade)
$init_keystone = (str2bool($::is_initial_config_primary) or $controller_upgrade) $init_keystone = (str2bool($::is_initial_config_primary) or $controller_upgrade)