On Mon, 2011-09-12 at 13:26 -0700, Paul B. Henson wrote:
> > I'll try to debug this soon.
>
> Thanks; let me know if there's anything I could do to help, or if there
> are any potential fixes you would like tested.
I can't seem to be able to reproduce this. It always connects to the
second MySQL without any user visible errors. What does it log with the
attached debug patch?
diff -r d635bcf35df7 src/auth/main.c
--- a/src/auth/main.c Tue Sep 13 02:09:02 2011 +0300
+++ b/src/auth/main.c Tue Sep 13 12:43:16 2011 +0300
@@ -9,6 +9,7 @@
#include "child-wait.h"
#include "sql-api.h"
#include "module-dir.h"
+#include "hostpid.h"
#include "randgen.h"
#include "process-title.h"
#include "settings-parser.h"
@@ -282,6 +283,8 @@
while ((c = master_getopt(master_service)) > 0) {
switch (c) {
case 'w':
+ master_service_init_log(master_service,
+ t_strdup_printf("auth-worker(%s): ", my_pid));
worker = TRUE;
break;
default:
diff -r d635bcf35df7 src/lib-sql/driver-sqlpool.c
--- a/src/lib-sql/driver-sqlpool.c Tue Sep 13 02:09:02 2011 +0300
+++ b/src/lib-sql/driver-sqlpool.c Tue Sep 13 12:43:16 2011 +0300
@@ -172,6 +172,7 @@
static void sqlpool_reconnect(struct sql_db *conndb)
{
timeout_remove(&conndb->to_reconnect);
+ i_debug("reconnecting from timeout");
(void)sql_connect(conndb);
}
@@ -194,6 +195,7 @@
*host_idx_r = i;
}
}
+ i_debug("%u has least connections (%u)", *host_idx_r, min->connection_count);
return min;
}
@@ -231,10 +233,15 @@
/* if we have zero successful hosts and there still are hosts
without connections, connect to one of them. */
+ i_debug("connection failed");
if (!sqlpool_have_successful_connections(db)) {
host = sqlpool_find_host_with_least_connections(db, &host_idx);
- if (host->connection_count == 0)
+ if (host->connection_count == 0) {
+ i_debug(" - none successful, adding %u", host_idx);
(void)sqlpool_add_connection(db, host, host_idx);
+ } else {
+ i_debug(" - none successful, already added all");
+ }
}
}
@@ -264,6 +271,7 @@
struct sqlpool_connection *conn;
host->connection_count++;
+ i_debug("%u adding", host_idx);
conndb = db->driver->v.init(host->connect_string);
i_array_init(&conndb->module_contexts, 5);
@@ -311,11 +319,13 @@
if (!SQL_DB_IS_READY(conndb)) {
/* see if we could reconnect to it immediately */
+ i_debug("%u trying to connect", conns[idx].host_idx);
(void)sql_connect(conndb);
}
if (SQL_DB_IS_READY(conndb)) {
db->last_query_conn_idx = idx;
*all_disconnected_r = FALSE;
+ i_debug("%u is ready", conns[idx].host_idx);
return &conns[idx];
}
if (conndb->state != SQL_DB_STATE_DISCONNECTED)
@@ -333,6 +343,7 @@
unsigned int i, count;
bool all_disconnected;
+ i_debug("sql pool getting connection");
conn = sqlpool_find_available_connection(db, unwanted_host_idx,
&all_disconnected);
if (conn == NULL && unwanted_host_idx != -1U) {
@@ -355,11 +366,16 @@
}
if (conn == NULL) {
/* still nothing. try creating new connections */
+ i_debug("nothing, adding more");
conn = sqlpool_add_new_connection(db);
- if (conn != NULL)
+ if (conn != NULL) {
+ i_debug(" - and connecting");
(void)sql_connect(conn->db);
- if (conn == NULL || !SQL_DB_IS_READY(conn->db))
+ }
+ if (conn == NULL || !SQL_DB_IS_READY(conn->db)) {
+ i_debug(" - not ready");
return FALSE;
+ }
}
*conn_r = conn;
return TRUE;
@@ -509,10 +525,13 @@
const struct sqlpool_connection *conn;
int ret = -1, ret2;
+ i_debug("connecting to first available connection");
array_foreach(&db->all_connections, conn) {
ret2 = sql_connect(conn->db);
- if (ret2 > 0)
+ if (ret2 > 0) {
+ i_debug("%u connected", conn->host_idx);
return 1;
+ }
if (ret2 == 0)
ret = 0;
}
