From df66357b3fd652344a0dcb02a9789415d78f6846 Mon Sep 17 00:00:00 2001 From: Stefanie Forrester Date: Thu, 6 Aug 2015 09:41:23 -0700 Subject: added pause before td-agent restart --- roles/fluentd_master/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'roles/fluentd_master') diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml index d828db52a..0fcd1c65c 100644 --- a/roles/fluentd_master/tasks/main.yml +++ b/roles/fluentd_master/tasks/main.yml @@ -39,6 +39,9 @@ owner: 'td-agent' mode: 0444 +- name: "Pause before restarting td-agent, since openshift-master needs more time to start" + pause: seconds=20 + - name: ensure td-agent is running service: name: 'td-agent' -- cgit v1.2.3 From 17dedcf5beebd945cf3e5ca586d1092f3b1bfb8d Mon Sep 17 00:00:00 2001 From: Stefanie Forrester Date: Fri, 7 Aug 2015 11:49:22 -0700 Subject: take number of nodes into account when pausing --- roles/fluentd_master/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/fluentd_master') diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml index 0fcd1c65c..d64900eb0 100644 --- a/roles/fluentd_master/tasks/main.yml +++ b/roles/fluentd_master/tasks/main.yml @@ -39,8 +39,8 @@ owner: 'td-agent' mode: 0444 -- name: "Pause before restarting td-agent, since openshift-master needs more time to start" - pause: seconds=20 +- name: "Pause before restarting td-agent and openshift-master, depending on the number of nodes." + pause: seconds={{ num_nodes|int * 5 }} - name: ensure td-agent is running service: -- cgit v1.2.3 From 6248101e89cb2feb63692b7ff396d2cf4f6466fb Mon Sep 17 00:00:00 2001 From: Stefanie Forrester Date: Thu, 13 Aug 2015 11:15:16 -0700 Subject: pause for a minimum of 15 seconds --- roles/fluentd_master/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/fluentd_master') diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml index d64900eb0..9c21c06fe 100644 --- a/roles/fluentd_master/tasks/main.yml +++ b/roles/fluentd_master/tasks/main.yml @@ -40,7 +40,7 @@ mode: 0444 - name: "Pause before restarting td-agent and openshift-master, depending on the number of nodes." - pause: seconds={{ num_nodes|int * 5 }} + pause: seconds={{ ( num_nodes|int < 3 ) | ternary(15, (num_nodes * 5)) }} - name: ensure td-agent is running service: -- cgit v1.2.3 From 089d368d2976818d08c656f45711e25e70cf7a35 Mon Sep 17 00:00:00 2001 From: Stefanie Forrester Date: Thu, 13 Aug 2015 12:14:02 -0700 Subject: make sure that number is an int --- roles/fluentd_master/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/fluentd_master') diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml index 9c21c06fe..d592dc306 100644 --- a/roles/fluentd_master/tasks/main.yml +++ b/roles/fluentd_master/tasks/main.yml @@ -40,7 +40,7 @@ mode: 0444 - name: "Pause before restarting td-agent and openshift-master, depending on the number of nodes." - pause: seconds={{ ( num_nodes|int < 3 ) | ternary(15, (num_nodes * 5)) }} + pause: seconds={{ ( num_nodes|int < 3 ) | ternary(15, (num_nodes|int * 5)) }} - name: ensure td-agent is running service: -- cgit v1.2.3 From 21596a2dd2ef0239592f9376223a993cab5e9944 Mon Sep 17 00:00:00 2001 From: Stefanie Forrester Date: Mon, 24 Aug 2015 13:48:13 -0700 Subject: wait for ports instead of waiting for an arbitrary period of time --- roles/fluentd_master/tasks/main.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'roles/fluentd_master') diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml index d592dc306..69f8eceab 100644 --- a/roles/fluentd_master/tasks/main.yml +++ b/roles/fluentd_master/tasks/main.yml @@ -39,8 +39,13 @@ owner: 'td-agent' mode: 0444 -- name: "Pause before restarting td-agent and openshift-master, depending on the number of nodes." - pause: seconds={{ ( num_nodes|int < 3 ) | ternary(15, (num_nodes|int * 5)) }} +- name: wait for etcd to start up + wait_for: port=4001 delay=10 + when: embedded_etcd | bool + +- name: wait for etcd peer to start up + wait_for: port=7001 delay=10 + when: embedded_etcd | bool - name: ensure td-agent is running service: -- cgit v1.2.3 From 44f2904159c5a3e0045eb413287a9c1778f91adb Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 10 Sep 2015 10:27:35 -0400 Subject: Upgrades --- roles/fluentd_master/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) (limited to 'roles/fluentd_master') diff --git a/roles/fluentd_master/tasks/main.yml b/roles/fluentd_master/tasks/main.yml index 69f8eceab..55cd94460 100644 --- a/roles/fluentd_master/tasks/main.yml +++ b/roles/fluentd_master/tasks/main.yml @@ -52,4 +52,3 @@ name: 'td-agent' state: started enabled: yes - -- cgit v1.2.3