openstack/openstack-ansible-ops
Code Issues Proposed changes

Allow longer timeouts for elasticsearch.service

Browse Source 
/usr/lib/systemd/system/elasticsearch.service comes with a
TimeoutStartSec=75, which is not enough time for a somewhat busy
E5-2430L v2 @ 2.40GHz to get things going.

We don't want to permanently override that with a default of 75 in
case they decide to bump or remove that timeout in the future.

Change-Id: Ida8668f5548a15a8f597839bd9002585aeea5d1a
This commit is contained in:
Erik Berg 2021-01-07 10:44:29 +01:00
parent 397ed3f1eb
commit de88293f24
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elk_metrics_7x/roles/elasticsearch/defaults/main.yml
View File

@ -39,10 +39,14 @@ elastic_plugins:
# of the available RAM for elasticsearch. The value is expected to be in MiB. # of the available RAM for elasticsearch. The value is expected to be in MiB.
# elastic_heap_size: 10240 # type `int` # elastic_heap_size: 10240 # type `int`
# Set the addresses/interfaces for elasticsearch to bind to. If undefined, this binds to # Set the addresses/interfaces for elasticsearch to bind to. If undefined, this
# localhost and the ansible_host and ansible_hostname addresses. # binds to localhost and the ansible_host and ansible_hostname addresses.
elasticsearch_bind_addresses: ["127.0.0.1", "{{ ansible_host }}", "{{ ansible_hostname }}"] elasticsearch_bind_addresses: ["127.0.0.1", "{{ ansible_host }}", "{{ ansible_hostname }}"]
# Set a master-eligible node to be voting only # Set a master-eligible node to be voting only
# By default this is set to False - all masters can be elected by default # By default this is set to False - all masters can be elected by default
# elasticsearch_voting_only: true # elasticsearch_voting_only: true
# Allow a slow startup before the systemd notifier module kicks in to extend
# the timeout.
#elastic_systemd_timeout: 75

5
elk_metrics_7x/roles/elasticsearch/templates/systemd.elasticsearch-overrides.conf.j2
View File

@ -12,3 +12,8 @@ LimitMEMLOCK=infinity
# Number of File Descriptors # Number of File Descriptors
LimitNOFILE=65536 LimitNOFILE=65536
{% if elastic_systemd_timeout is defined %}
# Allow a slow startup before the systemd notifier module kicks in to extend the timeout
TimeoutStartSec={{ elastic_systemd_timeout }}
{% endif %}

1
elk_metrics_7x/tests/test-vars.yml
View File

@ -20,5 +20,6 @@ physical_host: localhost
q_storage: 1 q_storage: 1
elastic_memory_lower_limit: 1024 elastic_memory_lower_limit: 1024
elastic_memory_upper_limit: 1024 elastic_memory_upper_limit: 1024
elastic_systemd_timeout: 240
osa_test_repo: "openstack/openstack-ansible-ops" osa_test_repo: "openstack/openstack-ansible-ops"