kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 11:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
#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
This commit is contained in:
Igor Goncharovskiy
2014-06-16 09:04:05 +00:00
parent 8313964d72
commit a1e0a5e4b0
4 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cdr/cdr_sqlite3_custom.c
View File

@@ -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);

17
cel/cel_sqlite3_custom.c
View File

@@ -234,7 +234,6 @@ static void write_cel(struct ast_event *event)
{
char *error = NULL;
char *sql = NULL;
int count = 0;
if (db == NULL) {
/* Should not have loaded, but be failsafe. */
@@ -269,18 +268,7 @@ static void write_cel(struct ast_event *event)
ast_free(value_string);
}
/* XXX This seems awful arbitrary... */
for (count = 0; count < 5; count++) {
int res = sqlite3_exec(db, sql, NULL, NULL, &error);
if (res != SQLITE_BUSY && res != SQLITE_LOCKED) {
break;
}
usleep(200);
}
ast_mutex_unlock(&lock);
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);
}
@@ -288,6 +276,7 @@ static void write_cel(struct ast_event *event)
if (sql) {
sqlite3_free(sql);
}
ast_mutex_unlock(&lock);
return;
}
@@ -320,7 +309,7 @@ static int load_module(void)
free_config();
return AST_MODULE_LOAD_DECLINE;
}
sqlite3_busy_timeout(db, 1000);
/* is the table there? */
sql = sqlite3_mprintf("SELECT COUNT(*) FROM %q;", table);
res = sqlite3_exec(db, sql, NULL, NULL, NULL);

6
main/db.c
View File

@@ -257,6 +257,7 @@ static int db_open(void)
ast_mutex_unlock(&dblock);
return -1;
}
ast_mutex_unlock(&dblock);
return 0;
@@ -283,9 +284,8 @@ static int db_execute_sql(const char *sql, int (*callback)(void *, int, char **,
char *errmsg = NULL;
int res =0;
sqlite3_exec(astdb, sql, callback, arg, &errmsg);
if (errmsg) {
ast_log(LOG_WARNING, "Error executing SQL: %s\n", errmsg);
if (sqlite3_exec(astdb, sql, callback, arg, &errmsg) != SQLITE_OK) {
ast_log(LOG_WARNING, "Error executing SQL (%s): %s\n", sql, errmsg);
sqlite3_free(errmsg);
res = -1;
}

1
res/res_config_sqlite3.c
View File

@@ -324,6 +324,7 @@ static int db_open(struct realtime_sqlite3_db *db)
ao2_unlock(db);
return -1;
}
sqlite3_busy_timeout(db->handle, 1000);
if (db->debug) {
sqlite3_trace(db->handle, trace_cb, db);