Changeset 1515

Timestamp:

01/14/2007 08:21:26 AM (21 months ago)

Author:

jakabosky

Message:

fixed a few bugs with the connection pool and backlog.
Added proxy-core.max-keep-alive-requests option.

Location:

trunk/src

Files:

• mod_proxy_core.c (modified) (13 diffs)
• mod_proxy_core.h (modified) (1 diff)
• mod_proxy_core_backlog.c (modified) (1 diff)
• mod_proxy_core_pool.c (modified) (1 diff)
• mod_proxy_core_pool.h (modified) (1 diff)

trunk/src/mod_proxy_core.c

@@ -25 +25 @@
 #define CONFIG_PROXY_CORE_PROTOCOL "proxy-core.protocol"
 #define CONFIG_PROXY_CORE_DEBUG "proxy-core.debug"
+#define CONFIG_PROXY_CORE_MAX_KEEP_ALIVE "proxy-core.max-keep-alive-requests"
 #define CONFIG_PROXY_CORE_BACKENDS "proxy-core.backends"
 #define CONFIG_PROXY_CORE_REWRITE_REQUEST "proxy-core.rewrite-request"
@@ -229 +230 @@
                 { CONFIG_PROXY_CORE_MAX_POOL_SIZE, NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },        /* 8 */
                 { CONFIG_PROXY_CORE_CHECK_LOCAL, NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },        /* 9 */
+                { CONFIG_PROXY_CORE_MAX_KEEP_ALIVE, NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION },       /* 10 */
                 { NULL,                        NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
         };
@@ -252 +254 @@
                 s->request_rewrites   = proxy_rewrites_init();
                 s->check_local = 0;
+                s->max_keep_alive_requests = 0;
 
                 cv[0].destination = p->backends_arr;
@@ -261 +264 @@
                 cv[8].destination = &(s->max_pool_size);
                 cv[9].destination = &(s->check_local);
+                cv[10].destination = &(s->max_keep_alive_requests);
 
                 buffer_reset(p->balance_buf);
@@ -908 +912 @@
                 switch (sess->proxy_con->state) {
                 case PROXY_CONNECTION_STATE_CONNECTED:
+                        sess->proxy_con->request_count++;
+                        if (p->conf.debug) TRACE("request_count=%d", sess->proxy_con->request_count);
+                        if (sess->proxy_con->request_count >= p->conf.max_keep_alive_requests) {
+                                sess->is_closing = 1;
+                        }
                         /*
                          * Set the connection to idling if:
@@ -932 +941 @@
                 case PROXY_CONNECTION_STATE_CLOSED:
                         proxy_remove_backend_connection(srv, sess);
-                        /* return so we don't wakeup a backlog connection. */
-                        return HANDLER_GO_ON;
                 case PROXY_CONNECTION_STATE_IDLE:
                 default:
@@ -945 +952 @@
                 connection *next_con = req->con;
 
+                if (p->conf.debug) TRACE("wakeup a connection from backlog: con=%d", next_con->sock->fd);
                 joblist_append(srv, next_con);
 
@@ -1534 +1542 @@
         PATCH_OPTION(max_pool_size);
         PATCH_OPTION(check_local);
+        PATCH_OPTION(max_keep_alive_requests);
 
         /* skip the first, the global context */
@@ -1568 +1577 @@
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_PROXY_CORE_CHECK_LOCAL))) {
                                 PATCH_OPTION(check_local);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN(CONFIG_PROXY_CORE_MAX_KEEP_ALIVE))) {
+                                PATCH_OPTION(max_keep_alive_requests);
                         }
                 }
@@ -1658 +1669 @@
         proxy_session *sess = con->plugin_ctx[p->id];
 
+        if (p->conf.debug) TRACE("proxy_connection_reset (%d)", con->sock->fd);
         if (!sess) return HANDLER_GO_ON;
 
@@ -1794 +1806 @@
                                 req->con = con;
 
-#if 0
-                                TRACE("backlog: the con-pool is full, putting %s (%d) into the backlog", BUF_STR(con->uri.path), con->sock->fd);
-#endif
+                                if (p->conf.debug)TRACE("backlog: the con-pool is full, putting %s (%d) into the backlog", BUF_STR(con->uri.path), con->sock->fd);
                                 proxy_backlog_push(p->conf.backlog, req);
 
@@ -1875 +1885 @@
         UNUSED(srv);
 
+        if (p->conf.debug) TRACE("proxy_connection_close (%d)", con->sock->fd);
         if (con->mode != p->id) return HANDLER_GO_ON;
 
@@ -1938 +1949 @@
                 connection *con = req->con;
 
+                if (p->debug) TRACE("wakeup a connection from backlog: con=%d", con->sock->fd);
                 joblist_append(srv, con);
 

trunk/src/mod_proxy_core.h

@@ -29 +29 @@
         unsigned short max_pool_size;
         unsigned short check_local;
+        unsigned short max_keep_alive_requests;
 
         proxy_balance_t balancer;

trunk/src/mod_proxy_core_backlog.c

@@ -87 +87 @@
                 cur->next = NULL;
 
-                proxy_request_free(req);
+                proxy_request_free(cur);
 
                 return 0;

trunk/src/mod_proxy_core_pool.c

@@ -113 +113 @@
                  */
 
-                if (address->used == pool->max_size) return PROXY_CONNECTIONPOOL_FULL;
+                if (pool->used == pool->max_size) return PROXY_CONNECTIONPOOL_FULL;
 
                 proxy_con = proxy_connection_init();

trunk/src/mod_proxy_core_pool.h

@@ -24 +24 @@
         iosocket *sock;
 
+        unsigned short request_count; /* used for max-keep-alive-requests */
         time_t last_read; /* timeout handling for keep-alive connections */
         time_t last_write;