You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/07/03 19:46:06 UTC
[tomcat] branch master updated: Quick fix for poller issue reported
on users list
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new fffb087 Quick fix for poller issue reported on users list
fffb087 is described below
commit fffb08790e642e03f00c5f96a3a61ee09a2c8342
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 3 20:44:41 2019 +0100
Quick fix for poller issue reported on users list
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 2 ++
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index f5fa038..5cb6b78 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -1483,6 +1483,8 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB
boolean reset = false;
int rv = 0;
+ // Reset the nextPollerTime
+ nextPollerTime = pollerTime;
// Iterate on each pollers, but no need to poll empty pollers
if (pollerSpace[i] < actualPollerSize) {
rv = Poll.poll(pollers[i], nextPollerTime, desc, true);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e7520fd..de65b88 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -92,6 +92,10 @@
Once a URI is identified as invalid don't attempt to process it further.
Based on a PR by Alex Repert. (markt)
</fix>
+ <fix>
+ Fix to avoid the possibility of long poll times for individual pollers
+ when using mutliple pollers with APR. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch master updated: Quick fix for poller issue
reported on users list
Posted by Rémy Maucherat <re...@apache.org>.
On Wed, Jul 3, 2019 at 10:42 PM Mark Thomas <ma...@apache.org> wrote:
> On 03/07/2019 20:46, markt@apache.org wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > markt pushed a commit to branch master
> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >
> >
> > The following commit(s) were added to refs/heads/master by this push:
> > new fffb087 Quick fix for poller issue reported on users list
> > fffb087 is described below
> >
> > commit fffb08790e642e03f00c5f96a3a61ee09a2c8342
> > Author: Mark Thomas <ma...@apache.org>
> > AuthorDate: Wed Jul 3 20:44:41 2019 +0100
> >
> > Quick fix for poller issue reported on users list
>
> In terms of the slightly less quick fix...
>
> The code makes reference to two pollset size limits. One is 62 and the
> other is 1024. As far as I have been able to determine from reviewing
> the APR archives both these limits apply only to Windows.
>
> The 62 limit seems to date back to Windows NT and the 1024 limit is XP /
> Server 2003.
>
> Given that the oldest currently supported Windows operating systems are
> Windows 7 / Server 2008 SP2 then I think it is safe to remove the
> multiple poller code from the APR connector.
>
> Any objections? My current thoughts are to do this refactoring after the
> July round of releases.
>
+1 (same as for NIO)
Yes, old OSes brought significant limitations, and the code adds unwanted
complexity.
Rémy
Re: [tomcat] branch master updated: Quick fix for poller issue
reported on users list
Posted by Mark Thomas <ma...@apache.org>.
On 03/07/2019 20:46, markt@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
> new fffb087 Quick fix for poller issue reported on users list
> fffb087 is described below
>
> commit fffb08790e642e03f00c5f96a3a61ee09a2c8342
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Wed Jul 3 20:44:41 2019 +0100
>
> Quick fix for poller issue reported on users list
In terms of the slightly less quick fix...
The code makes reference to two pollset size limits. One is 62 and the
other is 1024. As far as I have been able to determine from reviewing
the APR archives both these limits apply only to Windows.
The 62 limit seems to date back to Windows NT and the 1024 limit is XP /
Server 2003.
Given that the oldest currently supported Windows operating systems are
Windows 7 / Server 2008 SP2 then I think it is safe to remove the
multiple poller code from the APR connector.
Any objections? My current thoughts are to do this refactoring after the
July round of releases.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org