summaryrefslogtreecommitdiff
path: root/cdr
diff options
context:
space:
mode:
authorIgor Goncharovskiy <igor.goncharovsky@gmail.com>2014-06-16 09:04:05 +0000
committerIgor Goncharovskiy <igor.goncharovsky@gmail.com>2014-06-16 09:04:05 +0000
commita1e0a5e4b07387bcc59afa7c0ab9f960a389ac15 (patch)
treeb32c92f6d58fb19eaa7af132f6ad3f2f7977cf34 /cdr
parent8313964d726d2f6f3397aff12c573588a11aaea0 (diff)
We have faced situation when using CDR and CEL by sqlite3 modules. With system having high load (~100 concurrent calls created by sipp) we found many cdr and cel records missed. There is special finction in sqlite3, that make able to fix this situation - sqlite3_wait_timeout, that also can replace awful code cdr_sqlite3 ad cel_sqlite3 modules. Also this function can be used for aastdb and res_config_sqlite3 to avoid missed writes to sqlite db.
#ASTERISK-23766 #close Reported by: Igor Goncharovsky Review: https://reviewboard.asterisk.org/r/3559/ ........ Merged revisions 416336 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 416337 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 416338 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@416339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'cdr')
-rw-r--r--cdr/cdr_sqlite3_custom.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index 435f4b37e..c33601e10 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -228,7 +228,6 @@ static int write_cdr(struct ast_cdr *cdr)
int res = 0;
char *error = NULL;
char *sql = NULL;
- int count = 0;
if (db == NULL) {
/* Should not have loaded, but be failsafe. */
@@ -264,16 +263,7 @@ static int write_cdr(struct ast_cdr *cdr)
ast_free(value_string);
}
- /* XXX This seems awful arbitrary... */
- for (count = 0; count < 5; count++) {
- res = sqlite3_exec(db, sql, NULL, NULL, &error);
- if (res != SQLITE_BUSY && res != SQLITE_LOCKED) {
- break;
- }
- usleep(200);
- }
-
- if (error) {
+ if (sqlite3_exec(db, sql, NULL, NULL, &error) != SQLITE_OK) {
ast_log(LOG_ERROR, "%s. SQL: %s.\n", error, sql);
sqlite3_free(error);
}
@@ -317,7 +307,7 @@ static int load_module(void)
free_config(0);
return AST_MODULE_LOAD_DECLINE;
}
-
+ sqlite3_busy_timeout(db, 1000);
/* is the table there? */
sql = sqlite3_mprintf("SELECT COUNT(AcctId) FROM %q;", table);
res = sqlite3_exec(db, sql, NULL, NULL, NULL);