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 2023/12/05 12:16:53 UTC
(tomcat) branch main updated (729962816f -> a8bffcbf55)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 729962816f Cleanup
new 46ae0b18b8 Fix IDE warning
new a8bffcbf55 Improve performance of HTTP/2 tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
test/org/apache/catalina/core/TestStandardHostValve.java | 3 ---
test/org/apache/coyote/http2/Http2TestBase.java | 3 ++-
test/org/apache/coyote/http2/TestHttp2Section_4_2.java | 4 ++++
3 files changed, 6 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: (tomcat) 02/02: Improve performance of HTTP/2 tests
Posted by Mark Thomas <ma...@apache.org>.
On 05/12/2023 16:14, Rémy Maucherat wrote:
> On Tue, Dec 5, 2023 at 1:17 PM <ma...@apache.org> wrote:
>>
>> 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
>>
>> commit a8bffcbf55624ba14819dfc636f2e63dd1a8289d
>> Author: Mark Thomas <ma...@apache.org>
>> AuthorDate: Tue Dec 5 12:16:18 2023 +0000
>>
>> Improve performance of HTTP/2 tests
>
> On the Apache CI, the runs went from 43mins down to 35mins, so that's nice.
That is more than I was expecting.
Some of the tests still seem to be taking longer than they should. I'm
looking at those and will hopefully have some further improvements.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: (tomcat) 02/02: Improve performance of HTTP/2 tests
Posted by Rémy Maucherat <re...@apache.org>.
On Tue, Dec 5, 2023 at 1:17 PM <ma...@apache.org> wrote:
>
> 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
>
> commit a8bffcbf55624ba14819dfc636f2e63dd1a8289d
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Tue Dec 5 12:16:18 2023 +0000
>
> Improve performance of HTTP/2 tests
On the Apache CI, the runs went from 43mins down to 35mins, so that's nice.
Rémy
> ---
> test/org/apache/coyote/http2/Http2TestBase.java | 3 ++-
> test/org/apache/coyote/http2/TestHttp2Section_4_2.java | 4 ++++
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/test/org/apache/coyote/http2/Http2TestBase.java b/test/org/apache/coyote/http2/Http2TestBase.java
> index c95c62e8cb..953aa9a759 100644
> --- a/test/org/apache/coyote/http2/Http2TestBase.java
> +++ b/test/org/apache/coyote/http2/Http2TestBase.java
> @@ -16,6 +16,7 @@
> */
> package org.apache.coyote.http2;
>
> +import java.io.BufferedOutputStream;
> import java.io.ByteArrayInputStream;
> import java.io.ByteArrayOutputStream;
> import java.io.IOException;
> @@ -673,7 +674,7 @@ public abstract class Http2TestBase extends TomcatBaseTest {
> s = socketFactory.createSocket("localhost", getPort());
> s.setSoTimeout(30000);
>
> - os = s.getOutputStream();
> + os = new BufferedOutputStream(s.getOutputStream());
> InputStream is = s.getInputStream();
>
> input = new TestInput(is);
> diff --git a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
> index 3c158c724d..d73a2495a7 100644
> --- a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
> +++ b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
> @@ -51,6 +51,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
> }
>
> os.write(settings);
> + os.flush();
>
> handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
> }
> @@ -73,6 +74,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
> // Empty payload
>
> os.write(ping);
> + os.flush();
>
> handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
> }
> @@ -95,6 +97,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
> // Empty payload
>
> os.write(ping);
> + os.flush();
>
> handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
> }
> @@ -118,6 +121,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
> // Empty payload
>
> os.write(priority);
> + os.flush();
>
> // Read Stream reset frame
> parser.readFrame();
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/02: Improve performance of HTTP/2 tests
Posted by ma...@apache.org.
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
commit a8bffcbf55624ba14819dfc636f2e63dd1a8289d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Dec 5 12:16:18 2023 +0000
Improve performance of HTTP/2 tests
---
test/org/apache/coyote/http2/Http2TestBase.java | 3 ++-
test/org/apache/coyote/http2/TestHttp2Section_4_2.java | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/coyote/http2/Http2TestBase.java b/test/org/apache/coyote/http2/Http2TestBase.java
index c95c62e8cb..953aa9a759 100644
--- a/test/org/apache/coyote/http2/Http2TestBase.java
+++ b/test/org/apache/coyote/http2/Http2TestBase.java
@@ -16,6 +16,7 @@
*/
package org.apache.coyote.http2;
+import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -673,7 +674,7 @@ public abstract class Http2TestBase extends TomcatBaseTest {
s = socketFactory.createSocket("localhost", getPort());
s.setSoTimeout(30000);
- os = s.getOutputStream();
+ os = new BufferedOutputStream(s.getOutputStream());
InputStream is = s.getInputStream();
input = new TestInput(is);
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
index 3c158c724d..d73a2495a7 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_4_2.java
@@ -51,6 +51,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
}
os.write(settings);
+ os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -73,6 +74,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(ping);
+ os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -95,6 +97,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(ping);
+ os.flush();
handleGoAwayResponse(1, Http2Error.FRAME_SIZE_ERROR);
}
@@ -118,6 +121,7 @@ public class TestHttp2Section_4_2 extends Http2TestBase {
// Empty payload
os.write(priority);
+ os.flush();
// Read Stream reset frame
parser.readFrame();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/02: Fix IDE warning
Posted by ma...@apache.org.
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
commit 46ae0b18b8a5e7a0e206d7dbf11cd1a978a64dbc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Dec 4 22:01:26 2023 +0000
Fix IDE warning
---
test/org/apache/catalina/core/TestStandardHostValve.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/test/org/apache/catalina/core/TestStandardHostValve.java b/test/org/apache/catalina/core/TestStandardHostValve.java
index 6433d0e1e1..2f0799c7a8 100644
--- a/test/org/apache/catalina/core/TestStandardHostValve.java
+++ b/test/org/apache/catalina/core/TestStandardHostValve.java
@@ -112,9 +112,6 @@ public class TestStandardHostValve extends TomcatBaseTest {
@Test(expected=IllegalArgumentException.class)
public void testInvalidErrorPage() throws Exception {
- // Set up a container
- Tomcat tomcat = getTomcatInstance();
-
// No file system docBase required
Context ctx = getProgrammaticRootContext();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org