From 1bb6a4663e942d41d5756370b601c5cff0cbd3a9 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Wed, 20 Feb 2019 19:36:12 +0000 Subject: [PATCH] badges: fedmsg-hub: try to add systemd environment variables to limit 2 am work --- .../files/systemd/systemd-memory-limit.conf | 2 + roles/badges/backend/tasks/main.yml | 55 +++++++++++++++++++ .../templates/systemd-environment.conf.j2 | 0 .../templates/systemd-restart-limit.conf.j2 | 6 ++ 4 files changed, 63 insertions(+) create mode 100644 roles/badges/backend/files/systemd/systemd-memory-limit.conf create mode 100644 roles/badges/backend/templates/systemd-environment.conf.j2 create mode 100644 roles/badges/backend/templates/systemd-restart-limit.conf.j2 diff --git a/roles/badges/backend/files/systemd/systemd-memory-limit.conf b/roles/badges/backend/files/systemd/systemd-memory-limit.conf new file mode 100644 index 0000000000..6a91cce212 --- /dev/null +++ b/roles/badges/backend/files/systemd/systemd-memory-limit.conf @@ -0,0 +1,2 @@ +[Service] +MemoryLimit=8G diff --git a/roles/badges/backend/tasks/main.yml b/roles/badges/backend/tasks/main.yml index 7befdbbfbb..87d8952608 100644 --- a/roles/badges/backend/tasks/main.yml +++ b/roles/badges/backend/tasks/main.yml @@ -14,6 +14,61 @@ - badges - badges/backend +- name: create systemd config directories + file: > + path="/etc/systemd/system/{{ item }}.service.d" + state=directory + with_items: + - fedmsg-hub + notify: + - reload systemd + tags: + - badges/backend + - config + - service + +- name: install systemd config files (memory) + copy: > + src=systemd/systemd-memory-limit.conf + dest=/etc/systemd/system/{{ item }}.service.d/memory-limit.conf + with_items: + - fedmsg-hub + notify: + - reload systemd + - restart fedmsg-hub + tags: + - badges/backend + - config + - service + +- name: install systemd config files (restart) + template: > + src=systemd-restart-limit.conf.j2 + dest=/etc/systemd/system/{{ item }}.service.d/restart.conf + with_items: + - fedmsg-hub + notify: + - reload systemd + tags: + - badges/backend + - config + - service + +- name: install systemd config files (environment) + template: > + src=systemd-environment.conf.j2 + dest=/etc/systemd/system/{{ item }}.service.d/environment.conf + with_items: + - fedmsg-hub + notify: + - reload systemd + - restart fedmsg-hub + tags: + - badges/backend + - config + - service + + - name: copy database configuration template: > src={{ item }} dest="/etc/fedmsg.d/{{ item }}" diff --git a/roles/badges/backend/templates/systemd-environment.conf.j2 b/roles/badges/backend/templates/systemd-environment.conf.j2 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/roles/badges/backend/templates/systemd-restart-limit.conf.j2 b/roles/badges/backend/templates/systemd-restart-limit.conf.j2 new file mode 100644 index 0000000000..9cf6fd950d --- /dev/null +++ b/roles/badges/backend/templates/systemd-restart-limit.conf.j2 @@ -0,0 +1,6 @@ +[Service] +{% if env == 'staging' %} +RestartSec=600 +{% else %} +RestartSec=10 +{% endif %}