summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-26 10:48:16 -0400
committerGitHub <noreply@github.com>2017-07-26 10:48:16 -0400
commitb70e033ee5df2e27038fe49100bbabd8562b1010 (patch)
tree226fcef881e9e252939f30544772eb6e003711df
parent7e7998b8b9c10e334f5afb2e8e752e0efbd3e9ea (diff)
parentd85ee728dede32e6a5f4ae93960245ef96b5d8c1 (diff)
downloadopenshift-b70e033ee5df2e27038fe49100bbabd8562b1010.tar.gz
openshift-b70e033ee5df2e27038fe49100bbabd8562b1010.tar.bz2
openshift-b70e033ee5df2e27038fe49100bbabd8562b1010.tar.xz
openshift-b70e033ee5df2e27038fe49100bbabd8562b1010.zip
Merge pull request #4813 from sdodson/log-dumper
Fix log dumping on service failure
-rw-r--r--roles/openshift_master/tasks/main.yml20
-rw-r--r--roles/openshift_node/tasks/main.yml2
2 files changed, 21 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index c643c6c46..0c4ee319c 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -206,6 +206,10 @@
delay: 60
notify: Verify API Server
+- name: Dump logs from master service if it failed
+ command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-master
+ when: start_result | failed
+
- name: Stop and disable non-HA master when running HA
systemd:
name: "{{ openshift.common.service_type }}-master"
@@ -239,6 +243,10 @@
retries: 1
delay: 60
+- name: Dump logs from master-api if it failed
+ command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-master-api
+ when: start_result | failed
+
- set_fact:
master_api_service_status_changed: "{{ start_result | changed }}"
when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' and inventory_hostname == openshift_master_hosts[0]
@@ -258,6 +266,10 @@
retries: 1
delay: 60
+- name: Dump logs from master-api if it failed
+ command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-master-api
+ when: start_result | failed
+
- set_fact:
master_api_service_status_changed: "{{ start_result | changed }}"
when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' and inventory_hostname != openshift_master_hosts[0]
@@ -294,6 +306,10 @@
retries: 1
delay: 60
+- name: Dump logs from master-controllers if it failed
+ command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-master-controllers
+ when: start_result | failed
+
- name: Wait for master controller service to start on first master
pause:
seconds: 15
@@ -310,6 +326,10 @@
retries: 1
delay: 60
+- name: Dump logs from master-controllers if it failed
+ command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-master-controllers
+ when: start_result | failed
+
- set_fact:
master_controllers_service_status_changed: "{{ start_result | changed }}"
when: openshift_master_ha | bool and openshift.master.cluster_method == 'native'
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml
index 879f6c207..0133533fc 100644
--- a/roles/openshift_node/tasks/main.yml
+++ b/roles/openshift_node/tasks/main.yml
@@ -230,7 +230,7 @@
ignore_errors: true
- name: Dump logs from node service if it failed
- command: journalctl --no-pager -n 100 {{ openshift.common.service_type }}-node
+ command: journalctl --no-pager -n 100 -u {{ openshift.common.service_type }}-node
when: node_start_result | failed
- name: Abort if node failed to start