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.


			
			
				changes/76/76/1
			
			
		
Igor Goncharovskiy 11 years ago
parent 6b782f84b8
commit b718f91873

@ -229,7 +229,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. */
@ -265,16 +264,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);
}
@ -316,7 +306,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);

@ -231,7 +231,6 @@ static void write_cel(const struct ast_event *event, void *userdata)
{
char *error = NULL;
char *sql = NULL;
int count = 0;
if (db == NULL) {
/* Should not have loaded, but be failsafe. */
@ -266,18 +265,7 @@ static void write_cel(const struct ast_event *event, void *userdata)
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);
}
@ -285,6 +273,7 @@ static void write_cel(const struct ast_event *event, void *userdata)
if (sql) {
sqlite3_free(sql);
}
ast_mutex_unlock(&lock);
return;
}
@ -319,7 +308,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);

Loading…
Cancel
Save