Merge lp:~ramon-van-alteren/mysql-proxy/funnel-private-backend into lp:~trickie/mysql-proxy/funnel

[Ramon]

[Ramon (ramon-van-alteren)]

As the commit statement reads...

=== modified file 'plugins/funnel/funnel-plugin.c'
--- plugins/funnel/funnel-plugin.c	2009-03-24 10:44:50 +0000
+++ plugins/funnel/funnel-plugin.c	2009-04-06 12:00:28 +0000
@@ -390,6 +390,7 @@
 	
 	/* try for a pooled connection and possibly go to backlog */
 	if (!con->server) {
+        network_socket_set_keepalive(con->client);
 		g_static_mutex_lock(&current_backend_cons_mutex);
 		if (current_backend_cons >= con->config->min_backend_cons) { /* we want to get a minimum in our pool */
 			
@@ -413,6 +414,7 @@
 	stats->no_of_frontend_conns++;
 
 	if (!con->server) {
+        network_socket_set_keepalive(con->client);
 		current_backend_cons++;
 		g_static_mutex_unlock(&current_backend_cons_mutex);
 		con->server = network_socket_new();
@@ -995,9 +997,15 @@
 		return -1;
 	}
 
+    /** Set listen socket to do tcp_keepalive
+     * This should be inherited by all subsequent sockets
+     **/
+
+     // network_socket_set_keepalive(listen_sock);
+
 	/**
 	 * call network_mysqld_con_accept() with this connection when we are done
-	 */
+	 **/
 
 	event_set(&(listen_sock->event), listen_sock->fd, EV_READ|EV_PERSIST, network_mysqld_con_accept, con);
 	event_base_set(chas->event_base, &(listen_sock->event));

=== modified file 'src/network-socket.c'
--- src/network-socket.c	2009-02-23 23:58:26 +0000
+++ src/network-socket.c	2009-04-06 12:00:28 +0000
@@ -279,6 +279,60 @@
 }
 
 /**
+ * set keepalive properties on the socket
+ *
+ * @param fd	socket-fd
+ * @return	0
+ */
+network_socket_retval_t network_socket_set_keepalive(network_socket *sock) {
+    int optval = 1;
+    int optlen = sizeof(optval);
+
+#ifdef linux
+	if(setsockopt(sock->fd, SOL_SOCKET, SO_KEEPALIVE, &optval, optlen) < 0) {
+   		g_critical("%s.%d: set_keepalive() failed: %s (%d)",
+                                __FILE__, __LINE__,
+                                g_strerror(errno), errno);
+		return NETWORK_SOCKET_ERROR;
+	}
+
+	/* start sending keepalive ack's after 2 minutes */
+	optval = 120;
+    optlen = sizeof(optval);
+
+	if(setsockopt(sock->fd, IPPROTO_TCP, TCP_KEEPIDLE, &optval, optlen) < 0) {
+                g_critical("%s.%d: set_keepalive() failed: %s (%d)",
+                                __FILE__, __LINE__,
+                                g_strerror(errno), errno);
+                return NETWORK_SOCKET_ERROR;
+        }
+
+	/* send keepalive every 2 minutes when idle */
+	if(setsockopt(sock->fd, IPPROTO_TCP, TCP_KEEPINTVL, &optval, optlen) < 0) {
+                g_critical("%s.%d: set_keepalive() failed: %s (%d)",
+                                __FILE__, __LINE__,
+                                g_strerror(errno), errno);
+                return NETWORK_SOCKET_ERROR;
+        }
+
+	/* fail after 1 failed keepalive packet */
+	optval = 1;
+
+	if(setsockopt(sock->fd, IPPROTO_TCP, TCP_KEEPCNT, &optval, optlen) < 0) {
+                g_critical("%s.%d: set_keepalive() failed: %s (%d)",
+                                __FILE__, __LINE__,
+                                g_strerror(errno), errno);
+                return NETWORK_SOCKET_ERROR;
+        }
+
+        return NETWORK_SOCKET_SUCCESS;
+#else 
+        //todo, fix this on other platforms
+        return NETWORK_SOCKET_SUCCESS;
+#endif
+}
+
+/**
  * accept a connection
  *
  * event handler for listening connections
@@ -300,13 +354,16 @@
 
 		return NULL;
 	}
-
+	
 	network_socket_set_non_blocking(client);
 
 	if (network_address_refresh_name(client->src)) {
 		network_socket_free(client);
 		return NULL;
 	}
+	
+	/* set socket to do tcp_keepalive */
+	//network_socket_set_keepalive(client);
 
 	/* the listening side may be INADDR_ANY, let's get which address the client really connected to */
 	if (-1 == getsockname(client->fd, &client->dst->addr.common, &(client->dst->len))) {