From 9fa52e46fadb251be7fc6b07a2be8a153c3fc2fd Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Wed, 26 Oct 2016 12:10:48 -0300 Subject: Change HA master controller service to restart always. Restarts of systemd-journald can cause the master controllers service to die in HA environments, due to a SIGPIPE and how it's handled. (seemingly by default in golang) on-failure does not trigger in this situation, instead we set to Restart=always in the systemd unit, which matches the non-HA service definitions as well. --- .../docker-cluster/atomic-openshift-master-controllers.service.j2 | 2 +- .../native-cluster/atomic-openshift-master-controllers.service.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_master/templates') diff --git a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 index a8f5d7351..088e8db43 100644 --- a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 +++ b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 @@ -18,7 +18,7 @@ LimitNOFILE=131072 LimitCORE=infinity WorkingDirectory={{ openshift.common.data_dir }} SyslogIdentifier={{ openshift.common.service_type }}-master-controllers -Restart=on-failure +Restart=always RestartSec=5s [Install] diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 index bf62696f0..94928f88c 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 @@ -19,7 +19,7 @@ LimitNOFILE=131072 LimitCORE=infinity WorkingDirectory={{ openshift.common.data_dir }} SyslogIdentifier={{ openshift.common.service_type }}-master-controllers -Restart=on-failure +Restart=always RestartSec=5s [Install] -- cgit v1.2.1