You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jf...@apache.org on 2019/06/24 16:29:22 UTC
svn commit: r1862014 - /httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
Author: jfclere
Date: Mon Jun 24 16:29:22 2019
New Revision: 1862014
URL: http://svn.apache.org/viewvc?rev=1862014&view=rev
Log:
Set connectiontimeout for mod_proxy_hcheck.
Fix for https://issues.jboss.org/browse/JBCS-448
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c?rev=1862014&r1=1862013&r2=1862014&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Mon Jun 24 16:29:22 2019
@@ -487,6 +487,10 @@ static proxy_worker *hc_get_hcworker(sct
hc->hash.def = hc->s->hash.def = ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_DEFAULT);
hc->hash.fnv = hc->s->hash.fnv = ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_FNV);
hc->s->port = port;
+ if (worker->s->conn_timeout_set) {
+ hc->s->conn_timeout_set = worker->s->conn_timeout_set;
+ hc->s->conn_timeout = worker->s->conn_timeout;
+ }
/* Do not disable worker in case of errors */
hc->s->status |= PROXY_WORKER_IGNORE_ERRORS;
/* Mark as the "generic" worker */
Re: svn commit: r1862014 -
/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
Posted by Christophe JAILLET <ch...@wanadoo.fr>.
Le 25/06/2019 à 14:35, jean-frederic clere a écrit :
> On 24/06/2019 21:13, Christophe JAILLET wrote:
>> Le 24/06/2019 à 18:29, jfclere@apache.org a écrit :
>>> Author: jfclere
>>> Date: Mon Jun 24 16:29:22 2019
>>> New Revision: 1862014
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1862014&view=rev
>>> Log:
>>> Set connectiontimeout for mod_proxy_hcheck.
>>> Fix for https://issues.jboss.org/browse/JBCS-448
>>>
>>> Modified:
>>> httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
>>>
>>> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
>>> URL:
>>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c?rev=1862014&r1=1862013&r2=1862014&view=diff
>>>
>>> ==============================================================================
>>>
>>> --- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original)
>>> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Mon Jun 24
>>> 16:29:22 2019
>>> @@ -487,6 +487,10 @@ static proxy_worker *hc_get_hcworker(sct
>>> hc->hash.def = hc->s->hash.def =
>>> ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_DEFAULT);
>>> hc->hash.fnv = hc->s->hash.fnv =
>>> ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_FNV);
>>> hc->s->port = port;
>>> + if (worker->s->conn_timeout_set) {
>>> + hc->s->conn_timeout_set = worker->s->conn_timeout_set;
>>> + hc->s->conn_timeout = worker->s->conn_timeout;
>>> + }
>>> /* Do not disable worker in case of errors */
>>> hc->s->status |= PROXY_WORKER_IGNORE_ERRORS;
>>> /* Mark as the "generic" worker */
>>
>> Hi, a similar approach is available in
>> https://bz.apache.org/bugzilla/show_bug.cgi?id=60948.
>>
>> This BZ also extends templates and makes this new connection time-out
>> configurable.
>>
>> CJ
>>
>>
>>
>>
> Thanks I missed it... Now trying to understand why we need 2 connection
> timeouts? We are checking the connection to the backend , the backend
> should behave the same way for connection... Did I miss something?
Agreed. I guess that the goal was to extend the template
functionalities, but it looks confusing to have connectiontimeout and
hcconnectiontimeout.
CJ
Re: svn commit: r1862014 -
/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
Posted by jean-frederic clere <jf...@gmail.com>.
On 24/06/2019 21:13, Christophe JAILLET wrote:
> Le 24/06/2019 à 18:29, jfclere@apache.org a écrit :
>> Author: jfclere
>> Date: Mon Jun 24 16:29:22 2019
>> New Revision: 1862014
>>
>> URL: http://svn.apache.org/viewvc?rev=1862014&view=rev
>> Log:
>> Set connectiontimeout for mod_proxy_hcheck.
>> Fix for https://issues.jboss.org/browse/JBCS-448
>>
>> Modified:
>> httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
>>
>> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
>> URL:
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c?rev=1862014&r1=1862013&r2=1862014&view=diff
>>
>> ==============================================================================
>>
>> --- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original)
>> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Mon Jun 24
>> 16:29:22 2019
>> @@ -487,6 +487,10 @@ static proxy_worker *hc_get_hcworker(sct
>> hc->hash.def = hc->s->hash.def =
>> ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_DEFAULT);
>> hc->hash.fnv = hc->s->hash.fnv =
>> ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_FNV);
>> hc->s->port = port;
>> + if (worker->s->conn_timeout_set) {
>> + hc->s->conn_timeout_set = worker->s->conn_timeout_set;
>> + hc->s->conn_timeout = worker->s->conn_timeout;
>> + }
>> /* Do not disable worker in case of errors */
>> hc->s->status |= PROXY_WORKER_IGNORE_ERRORS;
>> /* Mark as the "generic" worker */
>
>
> Hi, a similar approach is available in
> https://bz.apache.org/bugzilla/show_bug.cgi?id=60948.
>
> This BZ also extends templates and makes this new connection time-out
> configurable.
>
> CJ
>
>
>
>
Thanks I missed it... Now trying to understand why we need 2 connection
timeouts? We are checking the connection to the backend , the backend
should behave the same way for connection... Did I miss something?
--
Cheers
Jean-Frederic
Re: svn commit: r1862014 -
/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
Posted by Christophe JAILLET <ch...@wanadoo.fr>.
Le 24/06/2019 à 18:29, jfclere@apache.org a écrit :
> Author: jfclere
> Date: Mon Jun 24 16:29:22 2019
> New Revision: 1862014
>
> URL: http://svn.apache.org/viewvc?rev=1862014&view=rev
> Log:
> Set connectiontimeout for mod_proxy_hcheck.
> Fix for https://issues.jboss.org/browse/JBCS-448
>
> Modified:
> httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
>
> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c?rev=1862014&r1=1862013&r2=1862014&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Mon Jun 24 16:29:22 2019
> @@ -487,6 +487,10 @@ static proxy_worker *hc_get_hcworker(sct
> hc->hash.def = hc->s->hash.def = ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_DEFAULT);
> hc->hash.fnv = hc->s->hash.fnv = ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_FNV);
> hc->s->port = port;
> + if (worker->s->conn_timeout_set) {
> + hc->s->conn_timeout_set = worker->s->conn_timeout_set;
> + hc->s->conn_timeout = worker->s->conn_timeout;
> + }
> /* Do not disable worker in case of errors */
> hc->s->status |= PROXY_WORKER_IGNORE_ERRORS;
> /* Mark as the "generic" worker */
Hi, a similar approach is available in
https://bz.apache.org/bugzilla/show_bug.cgi?id=60948.
This BZ also extends templates and makes this new connection time-out
configurable.
CJ