<!-- 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 --> - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description <!-- Describe your changes in detail --> In usrloc module we have server_id_filter parameter which switches on filtering of location records by server id during load. This fix improves this functionality to use this filter in cleanup procedure to avoid cleaning of expired db records which are written by another kamailio instance to keep their cache correct.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1480
-- Commit Summary --
* usrloc: cleanup by server_id.
-- File Changes --
M src/modules/usrloc/README (4) M src/modules/usrloc/doc/usrloc_admin.xml (4) M src/modules/usrloc/udomain.c (19) M src/modules/usrloc/usrloc_mod.c (2) M src/modules/usrloc/usrloc_mod.h (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1480.patch https://github.com/kamailio/kamailio/pull/1480.diff
linuxmaniac requested changes on this pull request.
@@ -1001,7 +1001,9 @@ modparam("usrloc", "rm_expired_delay", 30)
3.47. server_id_filter (int)
- Enable (1) or disable (0) filter records by server_id on load. + Enable (1) or disable (0) filter records by server_id on load and during cleaning of expired db records.
You should not change README directly https://www.kamailio.org/wiki/devel/git-commit-guidelines#generic_guidelines
@tiglat pushed 1 commit.
1f68009 usrloc: reverted README file changes.
miconda commented on this pull request.
if (ul_dbf.use_table(ul_dbh, _d->name) < 0) {
LM_ERR("use_table failed\n"); return -1; } + + if (ul_db_srvid != 0) { + key_num = 3; + }
I think it is better to move this `if` bloc at line 913 above and have those assignements for keys/ops/vals with index `[2]` inside it. It is better to see have related operations grouped together, avoiding also useless operations if ul_db_srvid is 0.
@tiglat pushed 1 commit.
a03f7cc usrloc: moved server_id db request assignment under conditional command.
tiglat commented on this pull request.
if (ul_dbf.use_table(ul_dbh, _d->name) < 0) {
LM_ERR("use_table failed\n"); return -1; } + + if (ul_db_srvid != 0) { + key_num = 3; + }
Agree. Done.
Thanks!
Merged #1480.
-
Daniel-Constantin Mierla -
Konstantin
-
Victor Seva