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

Added retry of sensor connection for performance reports on failure. (backport #1633) #1634

Merged
merged 6 commits into from
Jul 19, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 19, 2021

This is an automatic backport of pull request #1633 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

In manage.c in function get_osp_performance_string (..):
  The installation of the connection to the sensor via
  osp_connect_with_data (..) and the access to the
  performance data via osp_get_performance_ext (..) are
  now retried several times on failure.

(cherry picked from commit ede0f95)
in manage.c, in function get_osp_performance_string(..):
  Moved the declaration of the variable "return_value"
  to the top of the function.

(cherry picked from commit 50ee82b)
In manage.c, in function get_osp_performance_string (..):
  Replaced the assignment of value "connection_retry =
  SCANNER_CONNECTION_RETRY_DEFAULT;" by
  "connection_retry = get_scanner_connection_retry();".

(cherry picked from commit 3fa7218)
In manage.c in function get_osp_performance_string (..):
  Amended the formatting of a while statement and the calls
  of get_scanner_connection_retry ().

(cherry picked from commit 2d13c54)
In manage.c, in function get_osp_performance_string (..):
  Rebuild the logic of the connection retries for
  osp_connect_with_data (..) and osp_get_performance_ext (..)
  slightly.

(cherry picked from commit 0d06084)
@mergify mergify bot requested a review from a team as a code owner July 19, 2021 15:02
@timopollmeier timopollmeier merged commit e7260f7 into master Jul 19, 2021
@timopollmeier timopollmeier deleted the mergify/bp/master/pr-1633 branch July 19, 2021 15:10
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.

2 participants