From 250c7125613fc0fc26b72f68a7d0bd63a4a1b430 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Mon, 7 Dec 2015 22:23:41 +0100 Subject: [PATCH 1/2] db_mysql: if autoreconnect is set, then attemt 3 times if mysql ping fails - it should help stalled/broken mysql tls connections to recover --- modules/db_mysql/km_dbase.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 9b220c3650e..2b3d1c9bc9e 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -80,9 +80,13 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) if (my_ping_interval) { t = time(0); if ((t - CON_TIMESTAMP(_h)) > my_ping_interval) { - if (mysql_ping(CON_CONNECTION(_h))) { - LM_WARN("driver error on ping: %s\n", mysql_error(CON_CONNECTION(_h))); - counter_inc(mysql_cnts_h.driver_err); + for (i=0; i < (db_mysql_auto_reconnect ? 3 : 1); i++) { + if (mysql_ping(CON_CONNECTION(_h))) { + LM_WARN("driver error on ping: %s\n", mysql_error(CON_CONNECTION(_h))); + counter_inc(mysql_cnts_h.driver_err); + } else { + break; + } } } /* From 5816e6852306c943f9b39cf8d8243201bbbdc132 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Tue, 8 Dec 2015 22:56:53 +0100 Subject: [PATCH 2/2] kamctl: updated version of the scripts --- utils/kamctl/kamctl | 2 +- utils/kamctl/kamdbctl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 22d9643a307..974f4576072 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='4.2.0' +VERSION='4.4.0' PATH=$PATH:/usr/local/sbin/ diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index e8915d14695..224111b9fb2 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='4.2.0' +VERSION='4.4.0' PATH=$PATH:/usr/local/sbin/