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 commitb50241a7b2
. Closes-Bug: #1644618 Change-Id: I8351abaf0078b094bff2aa20994575c15aec213b (cherry picked from commitf15987c3f2
)
This commit is contained in:
parent
08d578a81e
commit
c02f49f40d
@ -82,7 +82,6 @@ mcollective:
|
|||||||
plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
|
plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
|
||||||
plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
|
plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
|
||||||
plugin.rabbitmq.heartbeat_interval: 30
|
plugin.rabbitmq.heartbeat_interval: 30
|
||||||
plugin.rabbitmq.max_hbrlck_fails: 0
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
factsource: yaml
|
factsource: yaml
|
||||||
plugin.yaml: /etc/mcollective/facts.yaml
|
plugin.yaml: /etc/mcollective/facts.yaml
|
||||||
|
@ -82,7 +82,6 @@ mcollective:
|
|||||||
plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
|
plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
|
||||||
plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
|
plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
|
||||||
plugin.rabbitmq.heartbeat_interval: 30
|
plugin.rabbitmq.heartbeat_interval: 30
|
||||||
plugin.rabbitmq.max_hbrlck_fails: 0
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
factsource: yaml
|
factsource: yaml
|
||||||
plugin.yaml: /etc/mcollective/facts.yaml
|
plugin.yaml: /etc/mcollective/facts.yaml
|
||||||
|
@ -82,7 +82,6 @@ mcollective:
|
|||||||
plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
|
plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
|
||||||
plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
|
plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
|
||||||
plugin.rabbitmq.heartbeat_interval: 30
|
plugin.rabbitmq.heartbeat_interval: 30
|
||||||
plugin.rabbitmq.max_hbrlck_fails: 0
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
factsource: yaml
|
factsource: yaml
|
||||||
plugin.yaml: /etc/mcollective/facts.yaml
|
plugin.yaml: /etc/mcollective/facts.yaml
|
||||||
|
@ -21,7 +21,6 @@ plugin.rabbitmq.pool.1.port = 61613
|
|||||||
plugin.rabbitmq.pool.1.user = mcollective
|
plugin.rabbitmq.pool.1.user = mcollective
|
||||||
plugin.rabbitmq.pool.1.password = marionette
|
plugin.rabbitmq.pool.1.password = marionette
|
||||||
plugin.rabbitmq.heartbeat_interval = 30
|
plugin.rabbitmq.heartbeat_interval = 30
|
||||||
plugin.rabbitmq.max_hbrlck_fails = 0
|
|
||||||
|
|
||||||
# Facts
|
# Facts
|
||||||
factsource = yaml
|
factsource = yaml
|
||||||
|
@ -21,7 +21,6 @@ plugin.rabbitmq.pool.1.port = 61613
|
|||||||
plugin.rabbitmq.pool.1.user = mcollective
|
plugin.rabbitmq.pool.1.user = mcollective
|
||||||
plugin.rabbitmq.pool.1.password = marionette
|
plugin.rabbitmq.pool.1.password = marionette
|
||||||
plugin.rabbitmq.heartbeat_interval = 30
|
plugin.rabbitmq.heartbeat_interval = 30
|
||||||
plugin.rabbitmq.max_hbrlck_fails = 0
|
|
||||||
|
|
||||||
# Facts
|
# Facts
|
||||||
factsource = yaml
|
factsource = yaml
|
||||||
|
Loading…
Reference in New Issue
Block a user