Use Docker healthchecks for storm services

This change enables the use of Docker healthchecks for storm services.
Implements: blueprint container-health-check

Change-Id: I417ab0ba0d865c3bcb56ba46c7b2ebefdb381264
This commit is contained in:
LinPeiWen 2021-03-11 13:05:04 +00:00
parent cef8c8b3de
commit 225a0e861e
4 changed files with 38 additions and 0 deletions

View File

@ -12,6 +12,7 @@ storm_services:
STORM_LOG4J_PROP: "{{ storm_log_settings }}" STORM_LOG4J_PROP: "{{ storm_log_settings }}"
volumes: "{{ storm_worker_default_volumes + storm_nimbus_extra_volumes }}" volumes: "{{ storm_worker_default_volumes + storm_nimbus_extra_volumes }}"
dimensions: "{{ storm_worker_dimensions }}" dimensions: "{{ storm_worker_dimensions }}"
healthcheck: "{{ storm_worker_healthcheck }}"
storm-nimbus: storm-nimbus:
container_name: storm_nimbus container_name: storm_nimbus
group: storm-nimbus group: storm-nimbus
@ -22,6 +23,8 @@ storm_services:
STORM_LOG4J_PROP: "{{ storm_log_settings }}" STORM_LOG4J_PROP: "{{ storm_log_settings }}"
volumes: "{{ storm_nimbus_default_volumes + storm_nimbus_extra_volumes }}" volumes: "{{ storm_nimbus_default_volumes + storm_nimbus_extra_volumes }}"
dimensions: "{{ storm_nimbus_dimensions }}" dimensions: "{{ storm_nimbus_dimensions }}"
healthcheck: "{{ storm_nimbus_healthcheck }}"
#################### ####################
# Storm # Storm
@ -40,6 +43,32 @@ storm_image_full: "{{ storm_image }}:{{ storm_tag }}"
storm_worker_dimensions: "{{ default_container_dimensions }}" storm_worker_dimensions: "{{ default_container_dimensions }}"
storm_nimbus_dimensions: "{{ default_container_dimensions }}" storm_nimbus_dimensions: "{{ default_container_dimensions }}"
storm_worker_enable_healthchecks: "{{ enable_container_healthchecks }}"
storm_worker_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
storm_worker_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
storm_worker_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
storm_worker_healthcheck_test: ["CMD-SHELL", "healthcheck_port java {{ zookeeper_client_port }}"]
storm_worker_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
storm_worker_healthcheck:
interval: "{{ storm_worker_healthcheck_interval }}"
retries: "{{ storm_worker_healthcheck_retries }}"
start_period: "{{ storm_worker_healthcheck_start_period }}"
test: "{% if storm_worker_enable_healthchecks | bool %}{{ storm_worker_healthcheck_test }}{% else %}NONE{% endif %}"
timeout: "{{ storm_worker_healthcheck_timeout }}"
storm_nimbus_enable_healthchecks: "{{ enable_container_healthchecks }}"
storm_nimbus_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
storm_nimbus_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
storm_nimbus_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
storm_nimbus_healthcheck_test: ["CMD-SHELL", "healthcheck_listen java {{ storm_nimbus_thrift_port }}"]
storm_nimbus_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
storm_nimbus_healthcheck:
interval: "{{ storm_nimbus_healthcheck_interval }}"
retries: "{{ storm_nimbus_healthcheck_retries }}"
start_period: "{{ storm_nimbus_healthcheck_start_period }}"
test: "{% if storm_nimbus_enable_healthchecks | bool %}{{ storm_nimbus_healthcheck_test }}{% else %}NONE{% endif %}"
timeout: "{{ storm_nimbus_healthcheck_timeout }}"
storm_worker_default_volumes: storm_worker_default_volumes:
- "{{ node_config_directory }}/storm-worker/:{{ container_config_directory }}/" - "{{ node_config_directory }}/storm-worker/:{{ container_config_directory }}/"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"

View File

@ -12,6 +12,7 @@
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config" - kolla_action != "config"
@ -28,5 +29,6 @@
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
volumes: "{{ service.volumes }}" volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}" dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}"
when: when:
- kolla_action != "config" - kolla_action != "config"

View File

@ -9,6 +9,7 @@
volumes: "{{ item.value.volumes }}" volumes: "{{ item.value.volumes }}"
environment: "{{ item.value.environment }}" environment: "{{ item.value.environment }}"
dimensions: "{{ item.value.dimensions }}" dimensions: "{{ item.value.dimensions }}"
healthcheck: "{{ item.value.healthcheck | default(omit) }}"
when: when:
- inventory_hostname in groups[item.value.group] - inventory_hostname in groups[item.value.group]
- item.value.enabled | bool - item.value.enabled | bool

View File

@ -0,0 +1,6 @@
---
features:
- |
Implements container healthchecks for storm services.
See `blueprint
<https://blueprints.launchpad.net/kolla-ansible/+spec/container-health-check>`__