Author: timw
Date: Thu May 19 00:15:59 2011
New Revision: 1124474
URL: http://svn.apache.org/viewvc?rev=1124474&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=50839
Cap the lingering bytes read when shutting down an AJP socket at 32k to prevent
CPU spikes reading very large response bodies when a client aborts.
Also reduce the total linger time to 2s by default.
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1124474&r1=1124473&r2=1124474&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Thu May 19 00:15:59 2011
@@ -672,9 +672,14 @@ int jk_close_socket(jk_sock_t sd, jk_log
}
#ifndef MAX_SECS_TO_LINGER
-#define MAX_SECS_TO_LINGER 30
+#define MAX_SECS_TO_LINGER 2
+#endif
+#define MS_TO_LINGER 500
+#define MS_TO_LINGER_LAST 2
+
+#ifndef MAX_LINGER_BYTES
+#define MAX_LINGER_BYTES 32768
#endif
-#define SECONDS_TO_LINGER 2
#ifndef SHUT_WR
#ifdef SD_SEND
@@ -710,7 +715,7 @@ int jk_shutdown_socket(jk_sock_t sd, jk_
int rd = 0;
int rp = 0;
int save_errno;
- int timeout = SECONDS_TO_LINGER * 1000;
+ int timeout = MS_TO_LINGER;
time_t start = time(NULL);
JK_TRACE_ENTER(l);
@@ -741,6 +746,7 @@ int jk_shutdown_socket(jk_sock_t sd, jk_
}
do {
+ rp = 0;
if (jk_is_input_event(sd, timeout, l)) {
/* Do a restartable read on the socket
* draining out all the data currently in the socket buffer.
@@ -772,11 +778,10 @@ int jk_shutdown_socket(jk_sock_t sd, jk_
}
rd += rp;
if (rp < sizeof(dummy)) {
- if (timeout > SECONDS_TO_LINGER) {
- /* Try once again with 1000 times smaller timeout
- * In our case 2 msec.
- */
- timeout = SECONDS_TO_LINGER;
+ if (timeout > MS_TO_LINGER_LAST) {
+ /* Try one last time with a short timeout
+ */
+ timeout = MS_TO_LINGER_LAST;
continue;
}
/* We have read less then size of buffer
@@ -800,8 +805,8 @@ int jk_shutdown_socket(jk_sock_t sd, jk_
shutdown(sd, SHUT_RD);
break;
}
- timeout = SECONDS_TO_LINGER * 1000;
- } while (difftime(time(NULL), start) < MAX_SECS_TO_LINGER);
+ timeout = MS_TO_LINGER;
+ } while ((rd < MAX_LINGER_BYTES) && (difftime(time(NULL), start) <
MAX_SECS_TO_LINGER));
rc = jk_close_socket(sd, l);
if (JK_IS_DEBUG_LEVEL(l))
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
