sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
346 discussions

git:master:a4ec3b5b: Merge pull request #664 from kamailio/luismartingil/dispatcher_reload
by GitHub 14 Jun '16

14 Jun '16

Module: kamailio Branch: master Commit: a4ec3b5baeb4b4fdce44dab0dc2e776d2e4fd595 URL: https://github.com/kamailio/kamailio/commit/a4ec3b5baeb4b4fdce44dab0dc2e776… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-06-14T15:02:50+02:00 Merge pull request #664 from kamailio/luismartingil/dispatcher_reload Exporting ds_reload to cfg script --- Modified: modules/dispatcher/dispatcher.c Modified: modules/dispatcher/doc/dispatcher.xml Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a4ec3b5baeb4b4fdce44dab0dc2e776… Patch: https://github.com/kamailio/kamailio/commit/a4ec3b5baeb4b4fdce44dab0dc2e776… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index 5220fdb..69ba1ec 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -161,6 +161,7 @@ static int w_ds_is_from_list1(struct sip_msg*, char*, char*); static int w_ds_is_from_list2(struct sip_msg*, char*, char*); static int w_ds_is_from_list3(struct sip_msg*, char*, char*, char*); static int w_ds_list_exist(struct sip_msg*, char*); +static int w_ds_reload(struct sip_msg* msg); static int fixup_ds_is_from_list(void** param, int param_no); static int fixup_ds_list_exist(void** param,int param_no); @@ -211,6 +212,8 @@ static cmd_export_t cmds[]={ 0, 0, ANY_ROUTE}, {"bind_dispatcher", (cmd_function)bind_dispatcher, 0, 0, 0, 0}, + {"ds_reload", (cmd_function)w_ds_reload, 0, + 0, 0, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -822,6 +825,21 @@ static int ds_warn_fixup(void** param, int param_no) return 0; } +static int w_ds_reload(struct sip_msg* msg) +{ + if(!ds_db_url.s) { + if (ds_load_list(dslistfile)!=0) + LM_ERR("Error reloading from list\n"); + return -1; + } else { + if(ds_reload_db()<0) + LM_ERR("Error reloading from db\n"); + return -1; + } + LM_DBG("reloaded dispatcher\n"); + return 1; +} + /************************** MI STUFF ************************/ static struct mi_root* ds_mi_set(struct mi_root* cmd_tree, void* param) diff --git a/modules/dispatcher/doc/dispatcher.xml b/modules/dispatcher/doc/dispatcher.xml index 471ebbe..6e9212b 100644 --- a/modules/dispatcher/doc/dispatcher.xml +++ b/modules/dispatcher/doc/dispatcher.xml @@ -47,6 +47,13 @@ <email>alezzandro(a)gmail.com</email> </address> </editor> + <editor> + <firstname>Luis</firstname> + <surname>Martin</surname> + <address> + <email>martingil.luis(a)gmail.com</email> + </address> + </editor> </authorgroup> <copyright> <year>2004</year> diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 8368bb7..c10b502 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1350,6 +1350,21 @@ onreply_route { </programlisting> </example> </section> + <section id="dispatcher.f.ds_reload"> + <title> + <function moreinfo="none">ds_reload()</function> + </title> + <para> + Reloads the groups and included destinations. + </para> + <para> + Name: <emphasis>ds_reload</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> + <para> + This function can be used from ANY_ROUTE. + </para> + </section> </section> <section>

1 0

git:master:8c4d2ca3: dispatcher: docs updated missing /section
by Luis Martin Gil 14 Jun '16

14 Jun '16

Module: kamailio Branch: master Commit: 8c4d2ca3dc6eb38ec3dd60e704aa39d65a9032b5 URL: https://github.com/kamailio/kamailio/commit/8c4d2ca3dc6eb38ec3dd60e704aa39d… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: 2016-06-10T12:31:59+02:00 dispatcher: docs updated missing /section --- Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8c4d2ca3dc6eb38ec3dd60e704aa39d… Patch: https://github.com/kamailio/kamailio/commit/8c4d2ca3dc6eb38ec3dd60e704aa39d… --- diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index f7e0d3e..c10b502 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1365,6 +1365,7 @@ onreply_route { This function can be used from ANY_ROUTE. </para> </section> + </section> <section> <title>MI Commands</title>

1 0

git:master:7128ffd7: dispatcher: ds_reload added debug information
by Luis Martin Gil 14 Jun '16

14 Jun '16

Module: kamailio Branch: master Commit: 7128ffd7be00c39b62163a1bbcb141650bfae014 URL: https://github.com/kamailio/kamailio/commit/7128ffd7be00c39b62163a1bbcb1416… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: 2016-06-10T09:44:15+02:00 dispatcher: ds_reload added debug information --- Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/7128ffd7be00c39b62163a1bbcb1416… Patch: https://github.com/kamailio/kamailio/commit/7128ffd7be00c39b62163a1bbcb1416… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index cc5ca26..69ba1ec 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -836,6 +836,7 @@ static int w_ds_reload(struct sip_msg* msg) LM_ERR("Error reloading from db\n"); return -1; } + LM_DBG("reloaded dispatcher\n"); return 1; }

1 0

git:master:7287da30: dispatcher: ds_reload added using from ANY_ROUTE, removed algorithm 10
by Luis Martin Gil 14 Jun '16

14 Jun '16

Module: kamailio Branch: master Commit: 7287da30d4c4129353e62477fb8de049ab94bbd9 URL: https://github.com/kamailio/kamailio/commit/7287da30d4c4129353e62477fb8de04… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: 2016-06-10T08:41:41+02:00 dispatcher: ds_reload added using from ANY_ROUTE, removed algorithm 10 --- Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7287da30d4c4129353e62477fb8de04… Patch: https://github.com/kamailio/kamailio/commit/7287da30d4c4129353e62477fb8de04… --- diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 9bd6cc8..f7e0d3e 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1355,15 +1355,15 @@ onreply_route { <function moreinfo="none">ds_reload()</function> </title> <para> - Reloads the groups and included destinations. The command is - disabled for call load based dispatching (algorithm 10) since - removal of destinations may leave the list of active - calls with broken references. + Reloads the groups and included destinations. </para> <para> Name: <emphasis>ds_reload</emphasis> </para> <para>Parameters: <emphasis>none</emphasis></para> + <para> + This function can be used from ANY_ROUTE. + </para> </section> <section>

1 0

git:master:1f54ffa3: dispatcher: Doc typo fixed
by Luis Martin Gil 14 Jun '16

14 Jun '16

Module: kamailio Branch: master Commit: 1f54ffa3a903098512dac2bd8aaa5a6f04968f1c URL: https://github.com/kamailio/kamailio/commit/1f54ffa3a903098512dac2bd8aaa5a6… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: 2016-06-09T15:22:04+02:00 dispatcher: Doc typo fixed --- Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1f54ffa3a903098512dac2bd8aaa5a6… Patch: https://github.com/kamailio/kamailio/commit/1f54ffa3a903098512dac2bd8aaa5a6… --- diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index dc4dd9c..9bd6cc8 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1350,7 +1350,7 @@ onreply_route { </programlisting> </example> </section> - <section id="dispatcher.f.reload"> + <section id="dispatcher.f.ds_reload"> <title> <function moreinfo="none">ds_reload()</function> </title>

1 0

git:master:7cf474fd: dispatcher: added ds_reload
by Luis Martin Gil 14 Jun '16

14 Jun '16

Module: kamailio Branch: master Commit: 7cf474fdac56db2fcba80a45d99422bcc32c4c0a URL: https://github.com/kamailio/kamailio/commit/7cf474fdac56db2fcba80a45d99422b… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: 2016-06-09T13:08:43+02:00 dispatcher: added ds_reload --- Modified: modules/dispatcher/dispatcher.c Modified: modules/dispatcher/doc/dispatcher.xml Modified: modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7cf474fdac56db2fcba80a45d99422b… Patch: https://github.com/kamailio/kamailio/commit/7cf474fdac56db2fcba80a45d99422b… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index 5220fdb..cc5ca26 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -161,6 +161,7 @@ static int w_ds_is_from_list1(struct sip_msg*, char*, char*); static int w_ds_is_from_list2(struct sip_msg*, char*, char*); static int w_ds_is_from_list3(struct sip_msg*, char*, char*, char*); static int w_ds_list_exist(struct sip_msg*, char*); +static int w_ds_reload(struct sip_msg* msg); static int fixup_ds_is_from_list(void** param, int param_no); static int fixup_ds_list_exist(void** param,int param_no); @@ -211,6 +212,8 @@ static cmd_export_t cmds[]={ 0, 0, ANY_ROUTE}, {"bind_dispatcher", (cmd_function)bind_dispatcher, 0, 0, 0, 0}, + {"ds_reload", (cmd_function)w_ds_reload, 0, + 0, 0, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -822,6 +825,20 @@ static int ds_warn_fixup(void** param, int param_no) return 0; } +static int w_ds_reload(struct sip_msg* msg) +{ + if(!ds_db_url.s) { + if (ds_load_list(dslistfile)!=0) + LM_ERR("Error reloading from list\n"); + return -1; + } else { + if(ds_reload_db()<0) + LM_ERR("Error reloading from db\n"); + return -1; + } + return 1; +} + /************************** MI STUFF ************************/ static struct mi_root* ds_mi_set(struct mi_root* cmd_tree, void* param) diff --git a/modules/dispatcher/doc/dispatcher.xml b/modules/dispatcher/doc/dispatcher.xml index 471ebbe..6e9212b 100644 --- a/modules/dispatcher/doc/dispatcher.xml +++ b/modules/dispatcher/doc/dispatcher.xml @@ -47,6 +47,13 @@ <email>alezzandro(a)gmail.com</email> </address> </editor> + <editor> + <firstname>Luis</firstname> + <surname>Martin</surname> + <address> + <email>martingil.luis(a)gmail.com</email> + </address> + </editor> </authorgroup> <copyright> <year>2004</year> diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index 8368bb7..dc4dd9c 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1350,6 +1350,20 @@ onreply_route { </programlisting> </example> </section> + <section id="dispatcher.f.reload"> + <title> + <function moreinfo="none">ds_reload()</function> + </title> + <para> + Reloads the groups and included destinations. The command is + disabled for call load based dispatching (algorithm 10) since + removal of destinations may leave the list of active + calls with broken references. + </para> + <para> + Name: <emphasis>ds_reload</emphasis> + </para> + <para>Parameters: <emphasis>none</emphasis></para> </section> <section>

1 0

[kamailio/kamailio] Exporting ds_reload to cfg script (#664)
by Luis Martin Gil 14 Jun '16

14 Jun '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/664 -- Commit Summary -- * dispatcher: added ds_reload -- File Changes -- M modules/dispatcher/dispatcher.c (17) M modules/dispatcher/doc/dispatcher.xml (7) M modules/dispatcher/doc/dispatcher_admin.xml (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/664.patch https://github.com/kamailio/kamailio/pull/664.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/664

3 13

git:master:8a724a70: kamdbctl: more error help for missing .pgpass file
by Daniel-Constantin Mierla 13 Jun '16

13 Jun '16

Module: kamailio Branch: master Commit: 8a724a70859f68431094acab2a8f9ce000bbd89b URL: https://github.com/kamailio/kamailio/commit/8a724a70859f68431094acab2a8f9ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-13T12:50:04+02:00 kamdbctl: more error help for missing .pgpass file --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/8a724a70859f68431094acab2a8f9ce… Patch: https://github.com/kamailio/kamailio/commit/8a724a70859f68431094acab2a8f9ce… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index d6452ba..cf3309c 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -43,8 +43,10 @@ fi if [ -z "$DBROOTUSER" ]; then DBROOTUSER="postgres" if [ ! -r ~/.pgpass ]; then - merr "~/.pgpass does not exist, please create this file and support proper credentials for user postgres." + merr "~/.pgpass does not exist" + merr "create this file and add proper credentials for user postgres" merr "Note: you need at least postgresql>= 7.3" + merr "Hint: .pgpass hostname must match DBHOST" exit 1 fi fi

1 0

git:master:631b69c4: kamdbct: fixed typo in pgpass name
by Daniel-Constantin Mierla 13 Jun '16

13 Jun '16

Module: kamailio Branch: master Commit: 631b69c43ffccbcecc3f43c3ebe4e614fe5f105d URL: https://github.com/kamailio/kamailio/commit/631b69c43ffccbcecc3f43c3ebe4e61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-13T12:33:28+02:00 kamdbct: fixed typo in pgpass name --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/631b69c43ffccbcecc3f43c3ebe4e61… Patch: https://github.com/kamailio/kamailio/commit/631b69c43ffccbcecc3f43c3ebe4e61… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index d8250f6..d6452ba 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -43,7 +43,7 @@ fi if [ -z "$DBROOTUSER" ]; then DBROOTUSER="postgres" if [ ! -r ~/.pgpass ]; then - merr "~./pgpass does not exist, please create this file and support proper credentials for user postgres." + merr "~/.pgpass does not exist, please create this file and support proper credentials for user postgres." merr "Note: you need at least postgresql>= 7.3" exit 1 fi

1 0

MySQL deadlock in RLS module
by M S 13 Jun '16

13 Jun '16

Hi, We have XCAP + RLS based presence setup which seems to work perfectly fine in our dev environment, however same setup in identical production environment gives no presence for contact list. When we do RLS subscribe, we receive initial Notify with full contact list retrieved from XCAP backend but aggregated presence Notify either does not come at all (most of the time) or it comes too late (sometime and take over 3-5 minutes). We see following error in syslogs, -- ERROR: db_mysql [km_dbase.c:129]: db_mysql_submit_query(): ERROR: driver error on query: Deadlock found when trying to get lock; try restarting transaction (1213) ERROR: <core> [db_query.c:386]: db_do_replace(): error while submitting query ERROR: rls [resource_notify.c:808]: rls_handle_notify(): in sql replace -- This is quite strange since we are using db_mode = 0 in all presence related modules e.g. presence, presence_xml, pua and rls. So ideally the entire presence should be managed in in-memory hash tables and there should be no DB query, right? Tracing mysql db scoket we identified at lease following presence tables are accessed, - pua - presentity - watchers - rls_watchers - rls_presentity The presence related tables are accessed / updated by both dev and production setups but mysql deadlock appears only on production. The only notice-able different between our dev and production setup is that on production we have more then 25% users in contact list online (20-30 out of 80 users in contact list) while on dev setup we have too few online (5-10 out of 60 users in contact list). So my question is, 1. What is the purpose of db_mode = 0 if presence setup is going to use db tables any way? 2. What could be the possible cause of MySQL deadlock? 3. Is this deadlock the only possible problem for receiving no aggregate notify at all or there may be some other reason(s)? How can i debug these issues? These are happening ONLY in production environment and every attempt to reproduce them in dev environment has failed so far. :( Platform: Debian 7.x 32bit on KVM. Version: Kamailio v4.4.1 rev.12b048 Thank you.

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2016