Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'heartbeat_timeout_threshold` option #588

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

nicolasbock
Copy link
Contributor

This change adds the heartbeat_timeout_threshold option to the
oslo_messaging_rabbit section.

Closes-Bug: #1918673

Signed-off-by: Nicolas Bock [email protected]

@nicolasbock nicolasbock force-pushed the heartbeat branch 3 times, most recently from c7ee659 to 43f5cca Compare March 12, 2021 14:15
@@ -768,6 +768,8 @@ def __call__(self):
if send_notifications_to_logs:
ctxt['send_notifications_to_logs'] = send_notifications_to_logs

ctxt['rabbit_heartbeat_timeout_threshold'] = conf.get('rabbit_heartbeat_timeout_threshold')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the charm's configuration we should use rabbit-heartbeat-timeout-threshold to keep the consistency.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@freyes
Copy link
Collaborator

freyes commented Mar 12, 2021

LGTM.

Copy link
Contributor

@ajkavanagh ajkavanagh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the patch; please see the comment about the default value of None. Thanks.

@@ -768,6 +768,8 @@ def __call__(self):
if send_notifications_to_logs:
ctxt['send_notifications_to_logs'] = send_notifications_to_logs

ctxt['rabbit_heartbeat_timeout_threshold'] = conf.get('rabbit-heartbeat-timeout-threshold')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of the above versions of conf.get() include the default 'None' parameter. For consistency, we should probably include that, please.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

This change adds the `heartbeat_timeout_threshold` option to the
`oslo_messaging_rabbit` section.

It also cleans some uses of `conf.get()` to make use of the default
`scope=None` parameter.

Closes-Bug: #1918673

Signed-off-by: Nicolas Bock <[email protected]>
@gnuoy
Copy link
Contributor

gnuoy commented May 20, 2021

Looks like unit tests need updating

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants