sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

git:master:99a73cb4: Merge pull request #1115 from claudiupb/fix_redis_pipeline
by GitHub 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 99a73cb42e6cf786ea5a2a7ffb7577145b0e7f46 URL: https://github.com/kamailio/kamailio/commit/99a73cb42e6cf786ea5a2a7ffb75771… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-02T17:48:52+02:00 Merge pull request #1115 from claudiupb/fix_redis_pipeline Fix redis pipeline --- Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/99a73cb42e6cf786ea5a2a7ffb75771… Patch: https://github.com/kamailio/kamailio/commit/99a73cb42e6cf786ea5a2a7ffb75771…

1 0

git:master:26b072c7: ndb_redis: fix memory leak
by Claudiu Boriga 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 26b072c7c84c03d034cd31cd80ef2d78ecb76dce URL: https://github.com/kamailio/kamailio/commit/26b072c7c84c03d034cd31cd80ef2d7… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-02T17:55:01+03:00 ndb_redis: fix memory leak - fix memory leak when re-using a reply-id --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/26b072c7c84c03d034cd31cd80ef2d7… Patch: https://github.com/kamailio/kamailio/commit/26b072c7c84c03d034cd31cd80ef2d7… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 4998e65..4ebdeb1 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -599,6 +599,12 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) for (i=1;i<rsrv->piped.pending_commands;i++) { rpl=rsrv->piped.replies[i]; + if(rpl->rplRedis!=NULL) + { + /* clean up previous redis reply */ + freeReplyObject(rpl->rplRedis); + rpl->rplRedis = NULL; + } if (redisGetReplyFromReader(rsrv->ctxRedis, (void**) &rpl->rplRedis) != REDIS_OK) { LM_ERR("Unable to read reply\n");

1 0

git:master:9a6c06a5: ndb_redis: fix connection problems with pipelining
by Claudiu Boriga 02 May '17

02 May '17

Module: kamailio Branch: master Commit: 9a6c06a5d70e643d6485ffe013008dd1b6f82708 URL: https://github.com/kamailio/kamailio/commit/9a6c06a5d70e643d6485ffe013008dd… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-02T17:55:01+03:00 ndb_redis: fix connection problems with pipelining -fix problem when a connection with a REDIS server fails and the pipelined command line is lost, while a new connection will not be established --- Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/9a6c06a5d70e643d6485ffe013008dd… Patch: https://github.com/kamailio/kamailio/commit/9a6c06a5d70e643d6485ffe013008dd…

1 0

[kamailio/kamailio] Fix redis pipeline (#1115)
by Paul Claudiu Boriga 02 May '17

02 May '17

Hello, I have found some bugs with the original commit that adds redis_pipe_cmd. If a command to the server fails, this may leave the redisContext in an invalid state, and this means that a reconnect to the server needs to be performed. The problem is that when reconnecting, a new context is created, and all the contents of old redisContext is lost, including the hiredis output buffer (obuf) which stored the piped commands. This means that all the commands are lost, and when a second retry is made this contains no commands and may fail, leaving the redisContext in an invalid state. This can in some cases break the REDIS pipelining feature, and cause all commands sent using redis_pipe_cmd()/redis_execute() to fail from that point onwards. The solution is to make sure that the connection is active when adding commands to the hiredis output buffer. For this, commands are stored in a separate buffer, and are only added to the redisContext when actually sending the command (when calling redis_execute). This way it is possible to see if any errors exist by checking the err member of the redisContext structure before appending the commands, and also commands are not lost since they are stored separately and if reconnecting the new commands can be appended to the output buffer of the new redisContext. Commands are stored in buffers using the sds format hiredis offers (by calling redisFormatCommand function offered by hiredis). This way they can be directly appended to the output buffer using redisAppendFormattedCommand. There is a problem on older hiredis versions (older than 0.12) because redisAppendFormattedCommand was not exported to the library API, so for older hiredis version the buffers are appended in our code. We tested the code using hiredis library version 0.10.1 and 0.12.1 and there is no problem with this approach. In the second commit we fixed a memory leak when re-using reply ids in the same pipeline command sequence occurs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1115 -- Commit Summary -- * ndb_redis: fix connection problems with pipelining * ndb_redis: fix memory leak -- File Changes -- M src/modules/ndb_redis/redis_client.c (116) M src/modules/ndb_redis/redis_client.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1115.patch https://github.com/kamailio/kamailio/pull/1115.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/1115

2 1

git:4.4:e0dc5f12: Merge pull request #1114 from sergey-safarov/spec_update9-44
by GitHub 02 May '17

02 May '17

Module: kamailio Branch: 4.4 Commit: e0dc5f12d6bca304ad359d955ce24948613c2055 URL: https://github.com/kamailio/kamailio/commit/e0dc5f12d6bca304ad359d955ce2494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-02T17:03:54+02:00 Merge pull request #1114 from sergey-safarov/spec_update9-44 pkg/kamailio/centos/7: mod kazoo enabled default build --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e0dc5f12d6bca304ad359d955ce2494… Patch: https://github.com/kamailio/kamailio/commit/e0dc5f12d6bca304ad359d955ce2494… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index ff0b7a6..9e68eae 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -2,7 +2,6 @@ %define ver 4.4.5 %define rel 1%{dist} %bcond_with dnssec -%bcond_with kazoo @@ -23,9 +22,7 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver -%if %{with kazoo} Conflicts: kamailio-kazoo < %ver -%endif Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -210,7 +207,6 @@ BuildRequires: json-c-devel, libevent-devel json string handling and RPC modules for Kamailio. -%if %{with kazoo} %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons @@ -219,7 +215,6 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio. -%endif %package lcr @@ -552,10 +547,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress kims kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -575,10 +567,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress kims kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1060,12 +1049,10 @@ fi %{_libdir}/kamailio/modules/jsonrpc-c.so -%if %{with kazoo} %files kazoo %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.kazoo %{_libdir}/kamailio/modules/kazoo.so -%endif %files lcr

1 0

git:4.4:d432ecbd: pkg/kamailio/centos/7: mod kazoo enabled default build
by Sergey Safarov 02 May '17

02 May '17

Module: kamailio Branch: 4.4 Commit: d432ecbded84fcf68668de0db3a4ba13f9745da2 URL: https://github.com/kamailio/kamailio/commit/d432ecbded84fcf68668de0db3a4ba1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2017-05-02T10:07:22-04:00 pkg/kamailio/centos/7: mod kazoo enabled default build --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/d432ecbded84fcf68668de0db3a4ba1… Patch: https://github.com/kamailio/kamailio/commit/d432ecbded84fcf68668de0db3a4ba1… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index ff0b7a6..9e68eae 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -2,7 +2,6 @@ %define ver 4.4.5 %define rel 1%{dist} %bcond_with dnssec -%bcond_with kazoo @@ -23,9 +22,7 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lua < %ver -%if %{with kazoo} Conflicts: kamailio-kazoo < %ver -%endif Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver @@ -210,7 +207,6 @@ BuildRequires: json-c-devel, libevent-devel json string handling and RPC modules for Kamailio. -%if %{with kazoo} %package kazoo Summary: Kazoo middle layer connector support for Kamailio Group: System Environment/Daemons @@ -219,7 +215,6 @@ BuildRequires: libuuid-devel, librabbitmq-devel, json-c-devel, libevent-devel %description kazoo Kazoo module for Kamailio. -%endif %package lcr @@ -552,10 +547,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kdnssec \ %endif kgeoip kgzcompress kims kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -575,10 +567,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kdnssec \ %endif kgeoip kgzcompress kims kjson kjsonrpcs \ -%if %{with kazoo} - kkazoo \ -%endif - kldap klua kmemcached \ + kkazoo kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp kuuid" @@ -1060,12 +1049,10 @@ fi %{_libdir}/kamailio/modules/jsonrpc-c.so -%if %{with kazoo} %files kazoo %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.kazoo %{_libdir}/kamailio/modules/kazoo.so -%endif %files lcr

1 0

[kamailio/kamailio] pkg/kamailio/centos/7: mod kazoo enabled default build (#1114)
by sergey-safarov 02 May '17

02 May '17

backport of commit de323d80a9fc76d5bea625b1a3ad28a30dda0ea4 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1114 -- Commit Summary -- * pkg/kamailio/centos/7: mod kazoo enabled default build -- File Changes -- M pkg/kamailio/centos/7/kamailio.spec (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1114.patch https://github.com/kamailio/kamailio/pull/1114.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/1114

2 1

git:master:b8b900a9: modules: readme files regenerated - ndb_redis ... [skip ci]
by Kamailio Dev 02 May '17

02 May '17

Module: kamailio Branch: master Commit: b8b900a960e315e15f6ff2947e2ff64881882e8b URL: https://github.com/kamailio/kamailio/commit/b8b900a960e315e15f6ff2947e2ff64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-02T16:16:21+02:00 modules: readme files regenerated - ndb_redis ... [skip ci] --- Modified: src/modules/ndb_redis/README --- Diff: https://github.com/kamailio/kamailio/commit/b8b900a960e315e15f6ff2947e2ff64… Patch: https://github.com/kamailio/kamailio/commit/b8b900a960e315e15f6ff2947e2ff64… --- diff --git a/src/modules/ndb_redis/README b/src/modules/ndb_redis/README index 1c6027e..280a6f4 100644 --- a/src/modules/ndb_redis/README +++ b/src/modules/ndb_redis/README @@ -51,7 +51,7 @@ Carsten Bock 4.1. redis_cmd(srvname, command, ..., replyid) 4.2. redis_pipe_cmd(srvname, command, ..., replyid) - 4.3. redis_execute([srvname]) + 4.3. redis_execute(srvname) 4.4. redis_free(replyid) List of Examples @@ -87,7 +87,7 @@ Chapter 1. Admin Guide 4.1. redis_cmd(srvname, command, ..., replyid) 4.2. redis_pipe_cmd(srvname, command, ..., replyid) - 4.3. redis_execute([srvname]) + 4.3. redis_execute(srvname) 4.4. redis_free(replyid) 1. Overview @@ -215,7 +215,7 @@ modparam("ndb_redis", "cluster", 1) 4.1. redis_cmd(srvname, command, ..., replyid) 4.2. redis_pipe_cmd(srvname, command, ..., replyid) - 4.3. redis_execute([srvname]) + 4.3. redis_execute(srvname) 4.4. redis_free(replyid) 4.1. redis_cmd(srvname, command, ..., replyid) @@ -293,17 +293,13 @@ if(redis_cmd("srvN", "HMGET foo_key field1 field3", "r")) { If cluster parameter is set to 1, this function will log an error and do nothing. -4.3. redis_execute([srvname]) +4.3. redis_execute(srvname) Sends commands to REDIS server identified by srvname. Commands are added with redis_pipe_cmd function, and will be stored for an existing REDIS server. When this function is called all the commands will be sent in a single message to the REDIS server. - If this function is called without any parameters, it will iterate - through all existing servers and send the existing pipelined commands - for them. - When using redis_cmd together with redis_pipe_cmd it is recommended that a call to redis_execute is made before calling redis_cmd in case there are pipelined commands, otherwise when calling redis_cmd, if @@ -321,14 +317,14 @@ After several redis command calls: redis_pipe_cmd("srvB", "SET ruri $ru", "r2"); - redis_pipe_cmd("srvC", "GET foo", "r3"); + redis_pipe_cmd("srvB", "GET foo", "r3"); Send the data and retrieve the results: redis_execute("srvA"); //send command to srvA and wait for reply. Store the reply in r1 - redis_execute(); //send remaining commands (the set to srvB and get to s -rvC), wait for replies, and store the replies in r2 and r3 + redis_execute("srvB"); //send command to srvA and wait for reply. Store +the replies in r2 (for SET ruri $ru) and r3 (for GET foo) Using both redis_cmd and redis_pipe_cmd: redis_pipe_cmd("srvA", "SET foo bar", "r1");

1 0

git:master:ec0953c4: Merge pull request #1112 from claudiupb/redis_rm_execute
by GitHub 02 May '17

02 May '17

Module: kamailio Branch: master Commit: ec0953c48da112a87e2ec7bfbfbd9d8df6d81959 URL: https://github.com/kamailio/kamailio/commit/ec0953c48da112a87e2ec7bfbfbd9d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-05-02T16:06:42+02:00 Merge pull request #1112 from claudiupb/redis_rm_execute Redis remove redis_execute() command with no arguments --- Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/ec0953c48da112a87e2ec7bfbfbd9d8… Patch: https://github.com/kamailio/kamailio/commit/ec0953c48da112a87e2ec7bfbfbd9d8…

1 0

git:master:be59c13f: ndb_redis: make redis_execute() return negative value on error
by Claudiu Boriga 02 May '17

02 May '17

Module: kamailio Branch: master Commit: be59c13f0d710df1be9c68af53f4167f575d5ae5 URL: https://github.com/kamailio/kamailio/commit/be59c13f0d710df1be9c68af53f4167… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-05-02T15:13:55+03:00 ndb_redis: make redis_execute() return negative value on error --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/be59c13f0d710df1be9c68af53f4167… Patch: https://github.com/kamailio/kamailio/commit/be59c13f0d710df1be9c68af53f4167… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 4d655ad..36b4efd 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -546,6 +546,7 @@ static int w_redis_pipe_cmd6(struct sip_msg* msg, char* ssrv, char* scmd, static int w_redis_execute(struct sip_msg* msg, char* ssrv) { str s; + int rv; if (redis_cluster_param) { @@ -557,7 +558,9 @@ static int w_redis_execute(struct sip_msg* msg, char* ssrv) LM_ERR("no redis server name\n"); return -1; } - redisc_exec_pipelined_cmd(&s); + rv=redisc_exec_pipelined_cmd(&s); + if (rv) + return rv; return 1; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017