From c02f49f40d3c406de3011c20c39b0f45ce3090e4 Mon Sep 17 00:00:00 2001 From: Georgy Kibardin Date: Tue, 27 Dec 2016 09:30:45 +0000 Subject: [PATCH] Revert "Ignore heartbeats lock fails" It seems that there are at least two level of ruby-stomp brokenness and the fact that the mutex in original commit is locked actually means there is no heartbeat received in time and we need to do something about this. This reverts commit b50241a7b243f553cc35e521ab99bb7f94d8b54a. Closes-Bug: #1644618 Change-Id: I8351abaf0078b094bff2aa20994575c15aec213b (cherry picked from commit f15987c3f2f1e23c260726a108669df7bf1b9b81) --- cloud-init-templates/cloud_config_centos.jinja2 | 1 - cloud-init-templates/cloud_config_fuel_9.0_ubuntu.jinja2 | 1 - cloud-init-templates/cloud_config_ubuntu.jinja2 | 1 - contrib/fuel_bootstrap/files/trusty/etc/mcollective/server.cfg | 1 - contrib/fuel_bootstrap/files/xenial/etc/mcollective/server.cfg | 1 - 5 files changed, 5 deletions(-) diff --git a/cloud-init-templates/cloud_config_centos.jinja2 b/cloud-init-templates/cloud_config_centos.jinja2 index 56156d7a..851d89f5 100644 --- a/cloud-init-templates/cloud_config_centos.jinja2 +++ b/cloud-init-templates/cloud_config_centos.jinja2 @@ -82,7 +82,6 @@ mcollective: plugin.rabbitmq.pool.1.user: {{ mcollective.user }} plugin.rabbitmq.pool.1.password: {{ mcollective.password }} plugin.rabbitmq.heartbeat_interval: 30 - plugin.rabbitmq.max_hbrlck_fails: 0 {% endif %} factsource: yaml plugin.yaml: /etc/mcollective/facts.yaml diff --git a/cloud-init-templates/cloud_config_fuel_9.0_ubuntu.jinja2 b/cloud-init-templates/cloud_config_fuel_9.0_ubuntu.jinja2 index b8f475ac..f1a91cc3 100644 --- a/cloud-init-templates/cloud_config_fuel_9.0_ubuntu.jinja2 +++ b/cloud-init-templates/cloud_config_fuel_9.0_ubuntu.jinja2 @@ -82,7 +82,6 @@ mcollective: plugin.rabbitmq.pool.1.user: {{ mcollective.user }} plugin.rabbitmq.pool.1.password: {{ mcollective.password }} plugin.rabbitmq.heartbeat_interval: 30 - plugin.rabbitmq.max_hbrlck_fails: 0 {% endif %} factsource: yaml plugin.yaml: /etc/mcollective/facts.yaml diff --git a/cloud-init-templates/cloud_config_ubuntu.jinja2 b/cloud-init-templates/cloud_config_ubuntu.jinja2 index efbfb4ab..403583f0 100644 --- a/cloud-init-templates/cloud_config_ubuntu.jinja2 +++ b/cloud-init-templates/cloud_config_ubuntu.jinja2 @@ -82,7 +82,6 @@ mcollective: plugin.rabbitmq.pool.1.user: {{ mcollective.user }} plugin.rabbitmq.pool.1.password: {{ mcollective.password }} plugin.rabbitmq.heartbeat_interval: 30 - plugin.rabbitmq.max_hbrlck_fails: 0 {% endif %} factsource: yaml plugin.yaml: /etc/mcollective/facts.yaml diff --git a/contrib/fuel_bootstrap/files/trusty/etc/mcollective/server.cfg b/contrib/fuel_bootstrap/files/trusty/etc/mcollective/server.cfg index 92472e08..75887d8b 100644 --- a/contrib/fuel_bootstrap/files/trusty/etc/mcollective/server.cfg +++ b/contrib/fuel_bootstrap/files/trusty/etc/mcollective/server.cfg @@ -21,7 +21,6 @@ plugin.rabbitmq.pool.1.port = 61613 plugin.rabbitmq.pool.1.user = mcollective plugin.rabbitmq.pool.1.password = marionette plugin.rabbitmq.heartbeat_interval = 30 -plugin.rabbitmq.max_hbrlck_fails = 0 # Facts factsource = yaml diff --git a/contrib/fuel_bootstrap/files/xenial/etc/mcollective/server.cfg b/contrib/fuel_bootstrap/files/xenial/etc/mcollective/server.cfg index 8b2a4597..54942518 100644 --- a/contrib/fuel_bootstrap/files/xenial/etc/mcollective/server.cfg +++ b/contrib/fuel_bootstrap/files/xenial/etc/mcollective/server.cfg @@ -21,7 +21,6 @@ plugin.rabbitmq.pool.1.port = 61613 plugin.rabbitmq.pool.1.user = mcollective plugin.rabbitmq.pool.1.password = marionette plugin.rabbitmq.heartbeat_interval = 30 -plugin.rabbitmq.max_hbrlck_fails = 0 # Facts factsource = yaml