[tomcat] branch main updated: Fix BZ 63390 - Fix test on Solaris.

2022-12-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new b364efe99e Fix BZ 63390 - Fix test on Solaris.
b364efe99e is described below

commit b364efe99e2f1afa2321cdd249d57b92235b21ef
Author: Mark Thomas 
AuthorDate: Wed Dec 21 15:45:43 2022 +

Fix BZ 63390 - Fix test on Solaris.

The first server write after a client close doesn't always trigger an
exception on Solaris. Use additional writes to trigger an exception so
the test passes.
---
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 0db6faa900..0609eb05b6 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1676,7 +1676,13 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 sos.print("TEST");
 stage.incrementAndGet();
 } else if (stage.get() == 2) {
+// This should trigger an error as the client closed 
the
+// socket
 sos.flush();
+// Additional writes are required to trigger the error
+// on solaris
+sos.print("MORE");
+log.info("Additional server write after client close 
to trigger exception");
 }
 } while (sos.isReady());
 } catch (IOException ioe) {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 10.1.x updated: Fix BZ 63390 - Fix test on Solaris.

2022-12-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new 7d2a6333d7 Fix BZ 63390 - Fix test on Solaris.
7d2a6333d7 is described below

commit 7d2a6333d70cbafab93019372fe5cb69538cd1da
Author: Mark Thomas 
AuthorDate: Wed Dec 21 15:45:43 2022 +

Fix BZ 63390 - Fix test on Solaris.

The first server write after a client close doesn't always trigger an
exception on Solaris. Use additional writes to trigger an exception so
the test passes.
---
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 0db6faa900..0609eb05b6 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1676,7 +1676,13 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 sos.print("TEST");
 stage.incrementAndGet();
 } else if (stage.get() == 2) {
+// This should trigger an error as the client closed 
the
+// socket
 sos.flush();
+// Additional writes are required to trigger the error
+// on solaris
+sos.print("MORE");
+log.info("Additional server write after client close 
to trigger exception");
 }
 } while (sos.isReady());
 } catch (IOException ioe) {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 9.0.x updated: Fix BZ 63390 - Fix test on Solaris.

2022-12-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 0533c845d3 Fix BZ 63390 - Fix test on Solaris.
0533c845d3 is described below

commit 0533c845d3c3c83fa0ae0baec9cc297728b4e939
Author: Mark Thomas 
AuthorDate: Wed Dec 21 15:45:43 2022 +

Fix BZ 63390 - Fix test on Solaris.

The first server write after a client close doesn't always trigger an
exception on Solaris. Use additional writes to trigger an exception so
the test passes.
---
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 895634d1ce..933816ca0c 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1675,7 +1675,13 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 sos.print("TEST");
 stage.incrementAndGet();
 } else if (stage.get() == 2) {
+// This should trigger an error as the client closed 
the
+// socket
 sos.flush();
+// Additional writes are required to trigger the error
+// on solaris
+sos.print("MORE");
+log.info("Additional server write after client close 
to trigger exception");
 }
 } while (sos.isReady());
 } catch (IOException ioe) {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 8.5.x updated: Fix BZ 63390 - Fix test on Solaris.

2022-12-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 83b69e66eb Fix BZ 63390 - Fix test on Solaris.
83b69e66eb is described below

commit 83b69e66e9ffbced1c17236340cadc35e431
Author: Mark Thomas 
AuthorDate: Wed Dec 21 15:45:43 2022 +

Fix BZ 63390 - Fix test on Solaris.

The first server write after a client close doesn't always trigger an
exception on Solaris. Use additional writes to trigger an exception so
the test passes.
---
 test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
index 23491ae6f2..3dfd01942e 100644
--- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
+++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
@@ -1680,7 +1680,13 @@ public class TestNonBlockingAPI extends TomcatBaseTest {
 sos.print("TEST");
 stage.incrementAndGet();
 } else if (stage.get() == 2) {
+// This should trigger an error as the client closed 
the
+// socket
 sos.flush();
+// Additional writes are required to trigger the error
+// on solaris
+sos.print("MORE");
+log.info("Additional server write after client close 
to trigger exception");
 }
 } while (sos.isReady());
 } catch (IOException ioe) {


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 66390] Test TestNonBlockingAPI (testNonBlockingWriteError02NoSwallow, testNonBlockingWriteError02Swallow) using NIO fail on Solaris

2022-12-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66390

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
This seems to be related to some sort of additional buffering that is happening
on Solaris.

If a write of a single character is added to the flush in stage two, the
expected error is seen after 2 additional write/flush loops.

Increasing the size of the write before the flush has no effect until the write
is ~8k - at which point a single write/flush is sufficient to trigger the
error.

A larger initial write at stage 1 can also remove the need for an additional
flush.

What strikes me as most odd here is that 2 writes of 1 byte trigger the error
but one write of 128 bytes does not. It isn't just a case of filling a buffer.

Fixed in:
- 11.0.x for 11.0.0-M2 onwards
- 10.1.x for 10.1.5 onwards
-  9.0.x for  9.0.71 onwards
-  8.5.x for  8.5.85 onwards

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 66209] CPU regression when classpath Bloom filters are active

2022-12-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66209

--- Comment #28 from gabriel.holl...@appian.com ---
I was looking over the changes, and should AbstractSingleArchiveResourceSet
also rely upon the same configuration honor the retain and bloom filter
setting?

It makes for inconsistent behavior if only one of the ArchiveResourceSet
classes uses it.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 66209] CPU regression when classpath Bloom filters are active

2022-12-21 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66209

--- Comment #29 from Mark Thomas  ---
(In reply to gabriel.hollies from comment #28)
> I was looking over the changes, and should AbstractSingleArchiveResourceSet
> also rely upon the same configuration honor the retain and bloom filter
> setting?
> 
> It makes for inconsistent behavior if only one of the ArchiveResourceSet
> classes uses it.

Why do you think it doesn't?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org