sr-dev April 2012

sr-dev@lists.kamailio.org

29 participants
346 discussions

git:master: ndb_redis: support for redis array reply
by Daniel-Constantin Mierla 10 Apr '12

10 Apr '12

Module: sip-router Branch: master Commit: d54bde96285f8b0d24f00223da96e8526143a298 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d54bde9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 10 23:23:12 2012 +0200 ndb_redis: support for redis array reply - replies from redis holding arrays can be accessed now from config file, the values in array being accessible via index - the size of the array is give as a new property of the reply - patch by Vicente Hernando --- modules/ndb_redis/README | 14 ++ modules/ndb_redis/doc/ndb_redis_admin.xml | 29 +++++ modules/ndb_redis/ndb_redis_mod.c | 197 +++++++++++++++++++++++++---- modules/ndb_redis/redis_client.h | 2 + 4 files changed, 220 insertions(+), 22 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d54…

1 0

git:master: db_cluster: allow empty array in a priority slot
by Daniel-Constantin Mierla 10 Apr '12

10 Apr '12

Module: sip-router Branch: master Commit: 3d6570ce356247813d28939c90a899222cdd1719 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d6570c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 10 19:55:25 2012 +0200 db_cluster: allow empty array in a priority slot --- modules_k/db_cluster/dbcl_api.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/db_cluster/dbcl_api.c b/modules_k/db_cluster/dbcl_api.c index 9f79f35..a081009 100644 --- a/modules_k/db_cluster/dbcl_api.c +++ b/modules_k/db_cluster/dbcl_api.c @@ -50,6 +50,7 @@ ret = -1;\ for(i=DBCL_PRIO_SIZE-1; i>0; i--)\ {\ + if(cls->rlist[i].clen<=0) continue; \ switch(cls->rlist[i].mode) {\ case 's':\ case 'S':\ @@ -123,6 +124,7 @@ rc = 0;\ for(i=DBCL_PRIO_SIZE-1; i>0; i--)\ {\ + if(cls->wlist[i].clen<=0) continue; \ switch(cls->wlist[i].mode) {\ case 's':\ case 'S':\

1 0

git:master: modules_k/xcap_server: Fixed a segmentation fault in xcap_server
by Peter Dunkley 10 Apr '12

10 Apr '12

Module: sip-router Branch: master Commit: a31826badd31529197c0bc70d329ec99e234698e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a31826b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Apr 10 17:58:37 2012 +0100 modules_k/xcap_server: Fixed a segmentation fault in xcap_server - This occurs when you try to modify (with xpath) an XML document that does not exist on the server. --- modules_k/xcap_server/xcap_server.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index ff25967..7b44585 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -576,7 +576,7 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath, /* partial document upload * - fetch, update, delete and store */ - if(xcaps_get_db_doc(&turi.user, &turi.host, &xuri, &tbuf)<0) + if(xcaps_get_db_doc(&turi.user, &turi.host, &xuri, &tbuf) != 0) { LM_ERR("could not fetch xcap document\n"); goto error; @@ -1092,7 +1092,7 @@ static int w_xcaps_del(sip_msg_t* msg, char* puri, char* ppath) &xcaps_str_empty, &xcaps_str_empty); } else { /* delete element */ - if(xcaps_get_db_doc(&turi.user, &turi.host, &xuri, &tbuf)<0) + if(xcaps_get_db_doc(&turi.user, &turi.host, &xuri, &tbuf) != 0) { LM_ERR("could not fetch xcap document\n"); goto error;

1 0

git:master: modules_k/xcap_server: Added $xcapuri(u=>uri_adoc) pvar
by Peter Dunkley 10 Apr '12

10 Apr '12

Module: sip-router Branch: master Commit: 783f7987e01cdcaa680f4151f1661b6d5eee9004 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=783f798… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Tue Apr 10 17:57:25 2012 +0100 modules_k/xcap_server: Added $xcapuri(u=>uri_adoc) pvar - This gives access to the adoc field in the internal xuri data-structure (the xuri without xpath). --- modules_k/xcap_server/README | 2 +- modules_k/xcap_server/doc/xcap_server_admin.xml | 2 +- modules_k/xcap_server/xcap_misc.c | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules_k/xcap_server/README b/modules_k/xcap_server/README index 17c7296..81f931f 100644 --- a/modules_k/xcap_server/README +++ b/modules_k/xcap_server/README @@ -264,7 +264,7 @@ event_route[xhttp:request] { * $xcapuri(name=>key) - name can be any to idenitfy the XCAP uri; key can be: data, uri, root, auid, type, tree, xuid, file, node, - target, domain. + target, domain, uri_adoc. Exported pseudo-variables are documented at http://www.kamailio.org/dokuwiki/. diff --git a/modules_k/xcap_server/doc/xcap_server_admin.xml b/modules_k/xcap_server/doc/xcap_server_admin.xml index ce02e29..60decd4 100644 --- a/modules_k/xcap_server/doc/xcap_server_admin.xml +++ b/modules_k/xcap_server/doc/xcap_server_admin.xml @@ -307,7 +307,7 @@ event_route[xhttp:request] { <listitem><para> <emphasis>$xcapuri(name=>key)</emphasis> - name can be any to idenitfy the XCAP uri; key can be: data, uri, root, auid, - type, tree, xuid, file, node, target, domain. + type, tree, xuid, file, node, target, domain, uri_adoc. </para></listitem> </itemizedlist> <para> diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 0a0b559..146e941 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -814,6 +814,8 @@ int pv_parse_xcap_uri_name(pv_spec_p sp, str *in) pxs->ktype = 9; } else if(pxs->key.len==6 && strncmp(pxs->key.s, "domain", 6)==0) { pxs->ktype = 10; + } else if(pxs->key.len== 8 && strncmp(pxs->key.s, "uri_adoc", 8)==0) { + pxs->ktype = 11; } else { LM_ERR("unknown key type [%.*s]\n", in->len, in->s); goto error; @@ -917,6 +919,11 @@ int pv_get_xcap_uri(struct sip_msg *msg, pv_param_t *param, /* get domain */ if(pxs->xus->xuri.domain.len>0) return pv_get_strval(msg, param, res, &pxs->xus->xuri.domain); + case 11: + /* get xuri->adoc */ + if(pxs->xus->xuri.adoc.len>0) + return pv_get_strval(msg, param, res, &pxs->xus->xuri.adoc); + break; break; default: return pv_get_null(msg, param, res);

1 0

git:master: Added new mode to sr_init that modifies the way the pseudo-random generator behaves
by Marius Zbihlei 10 Apr '12

10 Apr '12

Module: sip-router Branch: master Commit: 7f839dab108423e47660e06459591efef41f81a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f839da… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Apr 10 17:17:56 2012 +0300 Added new mode to sr_init that modifies the way the pseudo-random generator behaves Now it can use a LFSR (Linear Feedback Shift Register) to generate pseudo random numbers --- lib/srutils/sruid.c | 36 ++++++++++++++++++++++++++++++++++-- lib/srutils/sruid.h | 5 ++++- modules_k/kex/kex_mod.c | 4 ++-- 3 files changed, 40 insertions(+), 5 deletions(-) diff --git a/lib/srutils/sruid.c b/lib/srutils/sruid.c index 682a244..d9efec8 100644 --- a/lib/srutils/sruid.c +++ b/lib/srutils/sruid.c @@ -34,10 +34,38 @@ #include "sruid.h" +/* starting polynomials */ +#define MASK_32 0xb4bcd35c +#define MASK_31 0x7a5bc2e3 + +unsigned int lfsr32, lfsr31; + +int shift_lfsr(unsigned int *lfsr, unsigned int mask){ + int feedback; + feedback = *lfsr & 0x1; + *lfsr >>=1; + if (feedback == 1) + *lfsr ^= mask; + return *lfsr; +} + +void init_lfsr(void){ + lfsr32 = (unsigned int)time(NULL); + lfsr31 = (unsigned int)getpid(); +} + +/* + * returns a 32 bit random integer + * + */ +int get_random(){ + return (shift_lfsr(&lfsr32, MASK_32) ^ shift_lfsr(&lfsr31, MASK_31)) & 0xffffffff; +} + /** * */ -int sruid_init(sruid_t *sid, char sep, char *cid) +int sruid_init(sruid_t *sid, char sep, char *cid, int mode) { int i; @@ -67,6 +95,7 @@ int sruid_init(sruid_t *sid, char sep, char *cid) } sid->out = sid->buf + i + 5; sid->uid.s = sid->buf; + sid->mode = (sruid_mode_t)mode; LM_DBG("root for sruid is [%.*s] (%u / %d)\n", i+5, sid->uid.s, sid->counter, i+5); return 0; @@ -88,7 +117,10 @@ int sruid_next(sruid_t *sid) if(sid->counter==0) sid->counter=1; - val = sid->counter; + if(sid->mode == SRUID_LFSR) + val = get_random(); + else + val = sid->counter; i = 0; while(val!=0) { diff --git a/lib/srutils/sruid.h b/lib/srutils/sruid.h index b7c49ee..16ac116 100644 --- a/lib/srutils/sruid.h +++ b/lib/srutils/sruid.h @@ -29,14 +29,17 @@ #define SRUID_SIZE 40 +typedef enum {SRUID_INC=0, SRUID_LFSR=1} sruid_mode_t; + typedef struct sruid { char buf[SRUID_SIZE]; char *out; str uid; unsigned int counter; + sruid_mode_t mode; } sruid_t; -int sruid_init(sruid_t *sid, char sep, char *cid); +int sruid_init(sruid_t *sid, char sep, char *cid, int mode); int sruid_next(sruid_t *sid); #endif diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index 82165f5..ad3cc1d 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -137,7 +137,7 @@ struct module_exports exports= { */ static int mod_init(void) { - if(sruid_init(&_kex_sruid, '-', NULL)<0) + if(sruid_init(&_kex_sruid, '-', NULL, 0)<0) return -1; if(init_mi_core()<0) return -1; @@ -158,7 +158,7 @@ static int mod_init(void) static int child_init(int rank) { LM_DBG("rank is (%d)\n", rank); - if(sruid_init(&_kex_sruid, '-', NULL)<0) + if(sruid_init(&_kex_sruid, '-', NULL, 0)<0) return -1; if (rank==PROC_INIT) return pkg_proc_stats_init();

2 1

git:master: modules:carrierroute fixed small compiler warning
by Marius Zbihlei 10 Apr '12

10 Apr '12

Module: sip-router Branch: master Commit: cc1cc78b470152d2c1231a75040b249c1b4493a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc1cc78… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Apr 9 11:52:18 2012 +0300 modules:carrierroute fixed small compiler warning --- modules/carrierroute/cr_func.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/carrierroute/cr_func.c b/modules/carrierroute/cr_func.c index 1006228..2b9a85f 100644 --- a/modules/carrierroute/cr_func.c +++ b/modules/carrierroute/cr_func.c @@ -319,7 +319,7 @@ static int actually_rewrite(const struct route_rule *rs, str *dest, len += SIP_URI.len; } if ( len > MAX_URI_SIZE ) { - LM_ERR("Calculated uri size too large: %d\n", len); + LM_ERR("Calculated uri size too large: %lu\n", (unsigned long)len); return -1; }

1 0

git:master: lib/srutils: added small api for internal unique id generator
by Daniel-Constantin Mierla 10 Apr '12

10 Apr '12

Module: sip-router Branch: master Commit: 0d544f04bb17b671341f8bff5c51cea1dba4dd35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d544f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 10 12:18:35 2012 +0200 lib/srutils: added small api for internal unique id generator - uses prefix, server id, timestamp, pid and a counter for an unique string --- lib/srutils/sruid.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ lib/srutils/sruid.h | 42 ++++++++++++++++++++ 2 files changed, 147 insertions(+), 0 deletions(-) diff --git a/lib/srutils/sruid.c b/lib/srutils/sruid.c new file mode 100644 index 0000000..682a244 --- /dev/null +++ b/lib/srutils/sruid.c @@ -0,0 +1,105 @@ +/* + * $Id$ + * + * sruid - unique id generator + * + * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> + +#include "../../dprint.h" +#include "../../globals.h" +#include "../../pt.h" + +#include "sruid.h" + +/** + * + */ +int sruid_init(sruid_t *sid, char sep, char *cid) +{ + int i; + + if(sid==NULL) + return -1; + memset(sid, 0, sizeof(sruid_t)); + memcpy(sid->buf, "srid", 4); + if(cid!=NULL) + { + for(i=0; i<4 && cid[i]!='\0'; i++) + sid->buf[i] = cid[i]; + } + sid->buf[4] = sep; + + if(server_id!=0) + i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, + "%x%c%x%c%x%c", (unsigned int)server_id, sep, + (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + else + i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, + "%x%c%x%c", + (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + if(i<=0 || i>SRUID_SIZE-13) + { + LM_ERR("could not initialize sruid struct - output len: %d\n", i); + return -1; + } + sid->out = sid->buf + i + 5; + sid->uid.s = sid->buf; + LM_DBG("root for sruid is [%.*s] (%u / %d)\n", i+5, sid->uid.s, + sid->counter, i+5); + return 0; +} + +/** + * + */ +int sruid_next(sruid_t *sid) +{ + unsigned short digit; + int i; + unsigned int val; + + if(sid==NULL) + return -1; + + sid->counter++; + if(sid->counter==0) + sid->counter=1; + + val = sid->counter; + i = 0; + while(val!=0) + { + digit = val & 0x0f; + sid->out[i++] = (digit >= 10) ? digit + 'a' - 10 : digit + '0'; + val >>= 4; + } + sid->out[i] = '\0'; + sid->uid.len = sid->out + i - sid->buf; + LM_DBG("new sruid is [%.*s] (%u / %d)\n", sid->uid.len, sid->uid.s, + sid->counter, sid->uid.len); + return 0; +} + diff --git a/lib/srutils/sruid.h b/lib/srutils/sruid.h new file mode 100644 index 0000000..b7c49ee --- /dev/null +++ b/lib/srutils/sruid.h @@ -0,0 +1,42 @@ +/* + * $Id$ + * + * sruid - unique id generator + * + * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _SRUID_H_ +#define _SRUID_H_ + +#include "../../str.h" + +#define SRUID_SIZE 40 + +typedef struct sruid { + char buf[SRUID_SIZE]; + char *out; + str uid; + unsigned int counter; +} sruid_t; + +int sruid_init(sruid_t *sid, char sep, char *cid); +int sruid_next(sruid_t *sid); + +#endif

2 2

git:master: kex: new pv $sruid to return unique strings
by Daniel-Constantin Mierla 10 Apr '12

10 Apr '12

Module: sip-router Branch: master Commit: 6c7ae21a222fc56f623e7e49bcafc94167dab9d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c7ae21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 10 12:20:58 2012 +0200 kex: new pv $sruid to return unique strings - uses lib/srutils/sruid.{c,h} with prefix 'srid' --- modules_k/kex/Makefile | 1 + modules_k/kex/kex_mod.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/modules_k/kex/Makefile b/modules_k/kex/Makefile index b06b35e..9b89954 100644 --- a/modules_k/kex/Makefile +++ b/modules_k/kex/Makefile @@ -15,4 +15,5 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi SER_LIBS+=$(SERLIBPATH)/kcore/kcore +SER_LIBS+=$(SERLIBPATH)/srutils/srutils include ../../Makefile.modules diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index 60f859a..82165f5 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -33,6 +33,7 @@ #include "../../dset.h" #include "../../mod_fix.h" #include "../../parser/parse_uri.h" +#include "../../lib/srutils/sruid.h" #include "flags.h" #include "km_core.h" @@ -55,6 +56,18 @@ static int mod_init(void); static int child_init(int rank); static void destroy(void); + +static sruid_t _kex_sruid; + +static int pv_get_sruid_val(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +static pv_export_t mod_pvs[] = { + { {"sruid", sizeof("sruid")-1}, PVT_OTHER, pv_get_sruid_val, 0, + 0, 0, 0, 0 }, + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + static cmd_export_t cmds[]={ {"setsflag", (cmd_function)w_setsflag, 1,fixup_igp_null, 0, ANY_ROUTE }, @@ -111,7 +124,7 @@ struct module_exports exports= { params, 0, /* exported statistics */ 0, /* exported MI functions */ - 0, /* exported pseudo-variables */ + mod_pvs, /* exported pseudo-variables */ 0, /* extra processes */ mod_init, /* module initialization function */ 0, @@ -124,6 +137,8 @@ struct module_exports exports= { */ static int mod_init(void) { + if(sruid_init(&_kex_sruid, '-', NULL)<0) + return -1; if(init_mi_core()<0) return -1; #ifdef STATISTICS @@ -143,6 +158,8 @@ static int mod_init(void) static int child_init(int rank) { LM_DBG("rank is (%d)\n", rank); + if(sruid_init(&_kex_sruid, '-', NULL)<0) + return -1; if (rank==PROC_INIT) return pkg_proc_stats_init(); return pkg_proc_stats_myinit(rank); @@ -207,3 +224,15 @@ int w_resetdebug(struct sip_msg *msg, char *uri, str *s2) reset_local_debug_level(); return 1; } + + +static int pv_get_sruid_val(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(res==NULL) + return -1; + if(sruid_next(&_kex_sruid)<0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &_kex_sruid.uid); +} +

1 0

git:master: db_cluster: documented inactive_interval parameter
by Daniel-Constantin Mierla 10 Apr '12

10 Apr '12

Module: sip-router Branch: master Commit: d6fa740aef22c310b851037b6687c2e4145b519c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6fa740… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 10 10:40:23 2012 +0200 db_cluster: documented inactive_interval parameter --- modules_k/db_cluster/README | 36 ++++++++++++++++++------- modules_k/db_cluster/doc/db_cluster_admin.xml | 24 +++++++++++++++- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/modules_k/db_cluster/README b/modules_k/db_cluster/README index 4533f43..6ece6af 100644 --- a/modules_k/db_cluster/README +++ b/modules_k/db_cluster/README @@ -25,8 +25,9 @@ Daniel-Constantin Mierla 3. Parameters - 3.1. connection (int) - 3.2. cluster (int) + 3.1. connection (str) + 3.2. cluster (str) + 3.3. inactive_interval (int) 4. Usage @@ -34,7 +35,8 @@ Daniel-Constantin Mierla 1.1. Set connection parameter 1.2. Set cluster parameter - 1.3. Set cluster parameter + 1.3. Set inactive_interval parameter + 1.4. Set cluster parameter Chapter 1. Admin Guide @@ -48,8 +50,9 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. connection (int) - 3.2. cluster (int) + 3.1. connection (str) + 3.2. cluster (str) + 3.3. inactive_interval (int) 4. Usage @@ -84,10 +87,11 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. connection (int) - 3.2. cluster (int) + 3.1. connection (str) + 3.2. cluster (str) + 3.3. inactive_interval (int) -3.1. connection (int) +3.1. connection (str) Specify the connection to a real database system. The format is 'conid=>DBURL' - providing a connection id and the database URL. @@ -102,7 +106,7 @@ modparam("db_cluster", "connection", "con2=>mysql://openser:openser@localhost/kamailio2") ... -3.2. cluster (int) +3.2. cluster (str) Specify the cluster definition. The format is 'clsid=>conid1=def1;conid2=def2' - providing a cluster id and the list @@ -127,6 +131,18 @@ modparam("db_cluster", "connection", modparam("db_cluster", "cluster", "cls1=>con1=9s8p;con2=9s8p") ... +3.3. inactive_interval (int) + + How long (seconds) a connection is considered inactive after a DB + operations failed on it. + + Default value is 300 (5 min). + + Example 1.3. Set inactive_interval parameter +... +modparam("db_cluster", "inactive_interval", 180) +... + 4. Usage Practically, all the modules that want to use a cluster, have to set @@ -148,7 +164,7 @@ modparam("db_cluster", "cluster", "cls1=>con1=9s8p;con2=9s8p") to be used for parallel writing from acc and round-robin reading by sqlops. - Example 1.3. Set cluster parameter + Example 1.4. Set cluster parameter ... modparam("db_cluster", "connection", "c1=>mysql://openser:openserrw@localhost/kamailio1") diff --git a/modules_k/db_cluster/doc/db_cluster_admin.xml b/modules_k/db_cluster/doc/db_cluster_admin.xml index d56a5af..eef8eb9 100644 --- a/modules_k/db_cluster/doc/db_cluster_admin.xml +++ b/modules_k/db_cluster/doc/db_cluster_admin.xml @@ -64,7 +64,7 @@ <section> <title>Parameters</title> <section> - <title><varname>connection</varname> (int)</title> + <title><varname>connection</varname> (str)</title> <para> Specify the connection to a real database system. The format is 'conid=>DBURL' - providing a connection id and the database @@ -88,7 +88,7 @@ modparam("db_cluster", "connection", </example> </section> <section> - <title><varname>cluster</varname> (int)</title> + <title><varname>cluster</varname> (str)</title> <para> Specify the cluster definition. The format is 'clsid=>conid1=def1;conid2=def2' - providing a cluster id and the list of @@ -121,6 +121,26 @@ modparam("db_cluster", "cluster", "cls1=>con1=9s8p;con2=9s8p") </programlisting> </example> </section> + <section> + <title><varname>inactive_interval</varname> (int)</title> + <para> + How long (seconds) a connection is considered inactive after a DB + operations failed on it. + </para> + <para> + <emphasis> + Default value is 300 (5 min). + </emphasis> + </para> + <example> + <title>Set <varname>inactive_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_cluster", "inactive_interval", 180) +... +</programlisting> + </example> + </section> </section> <section> <title>Usage</title>

1 0

git:master: db_cluster: new module for generic database clustering
by Juha Heinanen 10 Apr '12

10 Apr '12

in order to avoid repeatedly trying dead cluster connection, how about the following: - define by cluster module param the default order in which connections with same priority are tried - if first connection in the list fails, move that connection to the end of the list advantage would be that there is no need to periodically (by counting or timer) re-try dead connection. default order could be taken from the order in which connections having the same priority are listed in cluster param value. comments? -- juha

2 10

← Newer
1
...
27
28
29
30
31
32
33
34
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 April 2012