[asterisk-commits] igorg: trunk r416339 - in /trunk: ./ cdr/ cel/ main/ res/

[SVN commits to the Asterisk project]

Author: igorg
Date: Mon Jun 16 04:04:05 2014
New Revision: 416339

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416339
Log:

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

Modified:
    trunk/   (props changed)
    trunk/cdr/cdr_sqlite3_custom.c
    trunk/cel/cel_sqlite3_custom.c
    trunk/main/db.c
    trunk/res/res_config_sqlite3.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/cdr/cdr_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_sqlite3_custom.c?view=diff&rev=416339&r1=416338&r2=416339
==============================================================================
--- trunk/cdr/cdr_sqlite3_custom.c (original)
+++ trunk/cdr/cdr_sqlite3_custom.c Mon Jun 16 04:04:05 2014
@@ -228,7 +228,6 @@
 	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 @@
 		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 @@
 		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);

Modified: trunk/cel/cel_sqlite3_custom.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cel/cel_sqlite3_custom.c?view=diff&rev=416339&r1=416338&r2=416339
==============================================================================
--- trunk/cel/cel_sqlite3_custom.c (original)
+++ trunk/cel/cel_sqlite3_custom.c Mon Jun 16 04:04:05 2014
@@ -234,7 +234,6 @@
 {
 	char *error = NULL;
 	char *sql = NULL;
-	int count = 0;
 
 	if (db == NULL) {
 		/* Should not have loaded, but be failsafe. */
@@ -269,18 +268,7 @@
 		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 @@
 	if (sql) {
 		sqlite3_free(sql);
 	}
+	ast_mutex_unlock(&lock);
 
 	return;
 }
@@ -320,7 +309,7 @@
 		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);

Modified: trunk/main/db.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/db.c?view=diff&rev=416339&r1=416338&r2=416339
==============================================================================
--- trunk/main/db.c (original)
+++ trunk/main/db.c Mon Jun 16 04:04:05 2014
@@ -257,6 +257,7 @@
 		ast_mutex_unlock(&dblock);
 		return -1;
 	}
+
 	ast_mutex_unlock(&dblock);
 
 	return 0;
@@ -283,9 +284,8 @@
 	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;
 	}

Modified: trunk/res/res_config_sqlite3.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_config_sqlite3.c?view=diff&rev=416339&r1=416338&r2=416339
==============================================================================
--- trunk/res/res_config_sqlite3.c (original)
+++ trunk/res/res_config_sqlite3.c Mon Jun 16 04:04:05 2014
@@ -324,6 +324,7 @@
 		ao2_unlock(db);
 		return -1;
 	}
+	sqlite3_busy_timeout(db->handle, 1000);
 
 	if (db->debug) {
 		sqlite3_trace(db->handle, trace_cb, db);