<!-- Kamailio Pull Request Template -->
<!-- IMPORTANT: - for detailed contributing guidelines, read: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md - pull requests must be done to master branch, unless they are backports of fixes from master branch to a stable branch - backports to stable branches must be done with 'git cherry-pick -x ...' - code is contributed under BSD for core and main components (tm, sl, auth, tls) - code is contributed GPLv2 or a compatible license for the other components - GPL code is contributed with OpenSSL licensing exception -->
#### Pre-Submission Checklist <!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply --> <!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above--> <!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list --> - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist: <!-- Go over all points below, and after creating the PR, tick the checkboxes that apply --> - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail -->
Do not recheck node later, if is disabled permanent. @rfuchs let me know what you think of this.
Thank you, Stefan You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/2886
-- Commit Summary --
* <a href="https://github.com/kamailio/kamailio/pull/2886/commits/04f30dce5f161ab3984cbace99779871e3e5ea1f">rtpengine: Don't recheck node if disabled permanently</a>
-- File Changes --
M src/modules/rtpengine/rtpengine.c (3)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/2886.patch https://github.com/kamailio/kamailio/pull/2886.diff
LGTM. I guess this is for the allow_op=1 use case?
Yes, is needed for the manually disabled nodes, under maintenance, to give them as much time as necessary, until a manual enable.
Thanks for the pull request and the comments. The automatic re-enabling happened rarely, like only in certain conditions or after some time? Just wondering about the effect on users.
Hi @henningw,
The automatic re-enabling happens in certain conditions *and* after some time: 1. the conditions depend on: 1.1 `rtpengine_allow_op` to be set, so the manually disabled node can be returned (e.g. to allow his sessions to finish) 1.2 `send_rtpp_command()` function, when it returns NULL -> not sure exactly which one happened to us here. 2. the time depends on `rtpengine_disable_tout` configured param.
So what happens is that on conditions 1. the `disabled (permanent)` (under maintenance) node becomes `disabled (temporary)` with ```rn_recheck_ticks``` updated with time 2. The (under maintenance) node is rechecked after that time and finds it still up and enables it (so new sessions can now be sent to it) -> though the desired behavior for the (under maintenance) node is just to let the existing one finish, not to accept new ones.
Hope this makes it a bit more clear.
Thank you, Stefan
I guess this can be merged.
Thanks for the clarifications @smititelu
Merged #2886 into master.
-
Daniel-Constantin Mierla -
Henning Westerholt
-
Richard Fuchs
-
Stefan Mititelu