sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

by Luis Azedo

Hi List, kazoo module was always using the same timeouts from parameter when making a send/receive call to amqp broker. there are some use cases where a larger timeout is required but only for that query. this was corrected by adding a new parameter amqp_query_timeout_avp. current behavior is preserved. i would like to backport this commit to 4.2. does anyone have anything against ? Best

9 years, 9 months

git:master:f9c248a6: kazoo : less agressive log

by lazedo

Module: kamailio Branch: master Commit: f9c248a66fdca5317e8820e53f1a0f99cd58ef8a URL: https://github.com/kamailio/kamailio/commit/f9c248a66fdca5317e8820e53f1a0f9… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2015-02-05T22:34:32Z kazoo : less agressive log changed log from INFO to DEBUG when timeout is set --- Modified: modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/f9c248a66fdca5317e8820e53f1a0f9… Patch: https://github.com/kamailio/kamailio/commit/f9c248a66fdca5317e8820e53f1a0f9… --- diff --git a/modules/kazoo/kz_amqp.c b/modules/kazoo/kz_amqp.c index 1c109bb..29028d4 100644 --- a/modules/kazoo/kz_amqp.c +++ b/modules/kazoo/kz_amqp.c @@ -851,7 +851,7 @@ int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, cha if((pv_val.flags & PV_VAL_INT) && pv_val.ri != 0 ) { kz_timeout.tv_usec = 0; kz_timeout.tv_sec = pv_val.ri; - LM_INFO("SET TIMEOUT TO %i\n", kz_timeout.tv_sec); + LM_DBG("SET TIMEOUT TO %i\n", (int) kz_timeout.tv_sec); } } }

9 years, 9 months

git:master:7da783ac: modules/cdp: added new counter(stat) for worker queuelenght

by Jason Penton

Module: kamailio Branch: master Commit: 7da783ac03329f4934d36c9a574bb2cd44019688 URL: https://github.com/kamailio/kamailio/commit/7da783ac03329f4934d36c9a574bb2c… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: 2015-02-06T00:27:07+02:00 modules/cdp: added new counter(stat) for worker queuelenght - this will give an indication that workers are not keeping up with load if it gets too big --- Modified: modules/cdp/cdp_stats.c Modified: modules/cdp/cdp_stats.h Modified: modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/7da783ac03329f4934d36c9a574bb2c… Patch: https://github.com/kamailio/kamailio/commit/7da783ac03329f4934d36c9a574bb2c… --- diff --git a/modules/cdp/cdp_stats.c b/modules/cdp/cdp_stats.c index 6e2985d..37087bc 100644 --- a/modules/cdp/cdp_stats.c +++ b/modules/cdp/cdp_stats.c @@ -12,6 +12,8 @@ counter_def_t cdp_cnt_defs[] = { "total number of replies received"}, {&cdp_cnts_h.replies_response_time, "replies_response_time", 0, 0, 0, "total time waiting for replies"}, + {&cdp_cnts_h.queuelength, "queuelength", 0, 0, 0, + "current length of worker queue tasks"}, {0, "average_response_time", 0, cdp_internal_stats, (void*) (long) CDP_AVG_RSP, "average response time for CDP replies"}, diff --git a/modules/cdp/cdp_stats.h b/modules/cdp/cdp_stats.h index e6747fe..f85f17a 100644 --- a/modules/cdp/cdp_stats.h +++ b/modules/cdp/cdp_stats.h @@ -8,8 +8,11 @@ struct cdp_counters_h { counter_handle_t replies_received; counter_handle_t replies_response_time; counter_handle_t avg_response_time; + counter_handle_t queuelength; }; -#endif /* CDP_STATS_H */ int cdp_init_counters(); -void cdp_destroy_counters(); \ No newline at end of file +void cdp_destroy_counters(); + +#endif /* CDP_STATS_H */ + diff --git a/modules/cdp/worker.c b/modules/cdp/worker.c index 4a45bc4..cc1617d 100644 --- a/modules/cdp/worker.c +++ b/modules/cdp/worker.c @@ -58,12 +58,14 @@ #include "diameter_api.h" #include "../../cfg/cfg_struct.h" +#include "cdp_stats.h" /* defined in ../diameter_peer.c */ int dp_add_pid(pid_t pid); void dp_del_pid(pid_t pid); extern dp_config *config; /**< Configuration for this diameter peer */ +extern struct cdp_counters_h cdp_cnts_h; task_queue_t *tasks; /**< queue of tasks */ @@ -231,6 +233,8 @@ int put_task(peer *p, AAAMessage *msg) { lock_get(tasks->lock); } + + counter_inc(cdp_cnts_h.queuelength); gettimeofday(&stop, NULL); elapsed_useconds = stop.tv_usec - start.tv_usec; @@ -250,7 +254,7 @@ int put_task(peer *p, AAAMessage *msg) { lock_release(tasks->lock); if(workerq_length_threshold_percentage > 0) { - num_tasks = tasks->end - tasks->start; + num_tasks = tasks->end - tasks->start; length_percentage = num_tasks/tasks->max*100; if(length_percentage > workerq_length_threshold_percentage) { LM_WARN("Queue length has exceeded length threshold percentage [%i] and is length [%i]", length_percentage, num_tasks); @@ -286,6 +290,7 @@ task_t take_task() { lock_get(tasks->lock); } + counter_add(cdp_cnts_h.queuelength, -1); t = tasks->queue[tasks->start]; tasks->queue[tasks->start].msg = 0; tasks->start = (tasks->start + 1) % tasks->max;

9 years, 9 months

[kamailio] use of ssl causes increase of mysql connections (#58)

by juha-h

Below is an example kamailio.conf, where addition of [group] to "db_url" value increases number of mysql connections from 36 to 70. [group] is defined in in my.cfg as: [group] ssl-ca=/etc/mysql/ca-cert.pem ssl-cert=/etc/mysql/client-cert.pem ssl-key=/etc/mysql/client-key.pem With sqlops module alone the number of mysql connections is the same with or without [group]. kamailio.conf: listen=192.98.102.33:5060 fork=yes log_stderror=no log_facility=LOG_LOCAL0 debug=2 loadmodule "tm" loadmodule "auth" loadmodule "sl" loadmodule "pv" loadmodule "auth_db" loadmodule "dialplan" loadmodule "domain" loadmodule "htable" loadmodule "permissions" loadmodule "pua" loadmodule "db_mysql" loadmodule "sqlops" loadmodule "xlog" modparam("auth_db|dialplan|domain|htable|permissions|pua", "db_url", "mysql://user:pass@[group]127.0.0.1/sip_proxy") modparam("sqlops", "sqlcon", "sip_proxy => mysql://user:pass@[group]127.0.0.1/sip_proxy") route { sql_query("sip_proxy", "show status like 'ssl_cipher'", "result"); xlog("L_INFO", "**** got result <variable=$dbr(result=>[0, 0])/value=$dbr(result=>[0, 1])>\n"); sql_result_free("result"); exit; } --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/58

9 years, 9 months

git:master:3ee47957: Merge branch 'master' of https://github.com/kamailio/kamailio

by Luis Azedo

Module: kamailio Branch: master Commit: 3ee47957201cb5cc2824a82a94832a526aba0ccb URL: https://github.com/kamailio/kamailio/commit/3ee47957201cb5cc2824a82a94832a5… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2015-02-05T19:35:48Z Merge branch 'master' of https://github.com/kamailio/kamailio # By Jason Penton # Via Jason Penton * 'master' of https://github.com/kamailio/kamailio: modules/cdp: changed stats to use internal counters instead --- Modified: modules/dialog_ng/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/3ee47957201cb5cc2824a82a94832a5… Patch: https://github.com/kamailio/kamailio/commit/3ee47957201cb5cc2824a82a94832a5… --- diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index ff39104..01d3cd4 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -557,7 +557,7 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { } counter_add(dialog_ng_cnts_h.early, -1); - counter_inc(dialog_ng_counters_h.active); + counter_inc(dialog_ng_cnts_h.active); run_dlg_callbacks(DLGCB_CONFIRMED, dlg, req, rpl, DLG_DIR_UPSTREAM, 0); if (unref) unref_dlg(dlg, unref);

9 years, 9 months

git:master:45c3dbee: libkcore Disable checking of /proc files on non-linux systems

by Olle E. Johansson

Module: kamailio Branch: master Commit: 45c3dbee619f999ddafc79a88d1a49141b76fa9f URL: https://github.com/kamailio/kamailio/commit/45c3dbee619f999ddafc79a88d1a491… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-05T21:18:07+01:00 libkcore Disable checking of /proc files on non-linux systems --- Modified: lib/kcore/statistics.c --- Diff: https://github.com/kamailio/kamailio/commit/45c3dbee619f999ddafc79a88d1a491… Patch: https://github.com/kamailio/kamailio/commit/45c3dbee619f999ddafc79a88d1a491… --- diff --git a/lib/kcore/statistics.c b/lib/kcore/statistics.c index 6c63a43..d18b804 100644 --- a/lib/kcore/statistics.c +++ b/lib/kcore/statistics.c @@ -371,6 +371,12 @@ static int get_used_waiting_queue( int waitingQueueSize = 0; +#ifndef __OS_linux + /* /proc/net/tcp and /proc/net/udp only exists on Linux systems, so don't bother with + trying to open these files */ + return 0; +#endif + /* Set up the file we want to open. */ if (forTCP) { fileToOpen = "/proc/net/tcp";

9 years, 9 months

git:master:ea93f1c6: ratelimit Document dependency on sl

by Olle E. Johansson

Module: kamailio Branch: master Commit: ea93f1c6da68943fc71de07d9c45c74af697acb3 URL: https://github.com/kamailio/kamailio/commit/ea93f1c6da68943fc71de07d9c45c74… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-05T21:11:52+01:00 ratelimit Document dependency on sl --- Modified: modules/ratelimit/README Modified: modules/ratelimit/doc/ratelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ea93f1c6da68943fc71de07d9c45c74… Patch: https://github.com/kamailio/kamailio/commit/ea93f1c6da68943fc71de07d9c45c74… --- diff --git a/modules/ratelimit/README b/modules/ratelimit/README index 3051560..fe4ee88 100644 --- a/modules/ratelimit/README +++ b/modules/ratelimit/README @@ -245,7 +245,7 @@ Chapter 1. Admin Guide 4.1. Kamailio Modules The following modules must be loaded before this module: - * No dependencies on other Kamailio modules. + * SL: Stateless request handling. 4.2. External Libraries or Applications @@ -327,7 +327,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") 6.1. rl_check([pvar]) 6.2. rl_check_pipe([pipe_no]) -6.1. rl_check([pvar]) +6.1. rl_check([pvar]) Check the current request against the matched ratelimit algorithm. If no parameter is provided, the queue will be matched based on method @@ -374,7 +374,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") }; ... -6.2. rl_check_pipe([pipe_no]) +6.2. rl_check_pipe([pipe_no]) Check the current request against the matched ratelimit algorithm. If no parameter is provided, the queue will be matched based on method @@ -419,7 +419,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") 7.8. rl.push_load 7.9. rl.set_dbg -7.1. rl.stats +7.1. rl.stats Lists the parameters and variables in the ratelimit module. @@ -430,7 +430,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") RPC Command Format: kamcmd rl.stats -7.2. rl.set_pipe +7.2. rl.set_pipe Sets the pipe parameters for the given pipe id. @@ -444,7 +444,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") RPC Command Format: kamcmd rl.set_pipe 2 RED 10 -7.3. rl.get_pipes +7.3. rl.get_pipes Gets the list of in use pipes. @@ -455,7 +455,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") RPC Command Format: kamcmd rl.get_pipes -7.4. rl.set_queue +7.4. rl.set_queue Sets the queue parameters for the given queue id. @@ -469,7 +469,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") RPC Command Format: kamcmd rl.set_queue 3 INVITE 2 -7.5. rl.get_queues +7.5. rl.get_queues Gets the list of in use queues. @@ -480,7 +480,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") RPC Command Format: kamcmd rl.get_queues -7.6. rl.set_pid +7.6. rl.set_pid Sets the PID Controller parameters for the Feedback Algorithm. @@ -494,7 +494,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") RPC Command Format: kamcmd rl.set_pid 0.5 0.5 0.5 -7.7. rl.get_pid +7.7. rl.get_pid Gets the list of in use PID Controller parameters. @@ -505,7 +505,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") RPC Command Format: kamcmd rl.get_pid -7.8. rl.push_load +7.8. rl.push_load Force the value of the load parameter. This method is useful for testing the Feedback algorithm. @@ -519,7 +519,7 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") RPC Command Format: kamcmd rl.push_load 0.85 -7.9. rl.set_dbg +7.9. rl.set_dbg This function will enable/disable a WARNING debug log exposing the internal counters for each pipe (useful in monitoring the ratelimit diff --git a/modules/ratelimit/doc/ratelimit_admin.xml b/modules/ratelimit/doc/ratelimit_admin.xml index 52843a6..865fc16 100644 --- a/modules/ratelimit/doc/ratelimit_admin.xml +++ b/modules/ratelimit/doc/ratelimit_admin.xml @@ -163,7 +163,7 @@ <itemizedlist> <listitem> <para> - <emphasis>No dependencies on other &kamailio; modules</emphasis>. + <emphasis>SL: Stateless request handling</emphasis>. </para> </listitem> </itemizedlist>

9 years, 9 months

[kamailio] Pipelimit on non-Linux: Repeating warning messages endlessly (#38)

by Olle E. Johansson

Pipelimit on non-Linux keeps complaining that it can't read files in /proc/net - repeatedly. While one warning is a good one, repeating it and filling log files is not a good thing imho. Tested with git head master --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/38

9 years, 9 months

[kamailio] SCA crash when db not configured (#57)

by Olle E. Johansson

Loading the module in small config with no modparams crash. Updated and installed latest git head after patch to sca for previous crash. #0 0x000000010a294823 in sca_db_get_connection () at sca_db.c:158 No locals. #1 0x000000010a2ac1e7 in sca_subscription_db_update () at sca_subscribe.c:493 db_con = (db1_con_t *) 0x0 ht = (sca_hash_table *) 0x69687720726f7272 entry = (sca_hash_entry *) 0x65203a524f525245 sub = (sca_subscription *) 0x7fff8c8362dd i = 0 rc = -1 now = 1422480694 #2 0x000000010a23f4d9 in sca_mod_destroy () at sca.c:370 No locals. #3 0x000000010932fe49 in destroy_modules () at sr_module.c:788 t = (struct sr_module *) 0x10977b620 foo = (struct sr_module *) 0x10977b090 #4 0x0000000109185dfb in cleanup (show_status=0) at main.c:512 memlog = 0 #5 0x000000010918d75b in shutdown_children (sig=15, show_status=0) at main.c:654 No locals. #6 0x00000001091a264d in main (argc=3, argv=0x7fff56b61a98) at main.c:2541 --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/57

9 years, 9 months

[kamailio] pipelimit: Depends on SL module (#69)

by Olle E. Johansson

A not documented dependency ' 0(32734) ERROR: pipelimit [./../../modules/sl/sl.h:111]: sl_load_api(): cannot find bind_sl 0(32734) ERROR: pipelimit [pipelimit.c:374]: mod_init(): cannot bind to SL API 0(32734) ERROR: <core> [sr_module.c:945]: init_mod(): Error while initializing module pipelimit (/usr/local/lib64/kamailio/modules/pipelimit.so) ' Assigned to oej. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/69

9 years, 9 months

← Newer
1
...
23
24
25
26
27
28
29
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015