Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed problem in AUTO_FLUSH backpressure strategy #6556

Merged
merged 3 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
* Copyright (c) 2023 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package io.helidon.microprofile.server;

import java.io.InputStream;

import io.helidon.common.http.Http;
import io.helidon.microprofile.tests.junit5.AddBean;
import io.helidon.microprofile.tests.junit5.HelidonTest;
import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.StreamingOutput;
import org.junit.jupiter.api.Test;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;

@HelidonTest
@AddBean(AutoFlushTest.AutoFlushResource.class)
class AutoFlushTest {

@Inject
private WebTarget target;

@Path("auto-flush")
public static class AutoFlushResource {

@GET
public Response getDefaultMessage() {
return Response.ok((StreamingOutput) outputStream -> {
try (InputStream is = AutoFlushResource.class.getResourceAsStream("/zero.bin")) {
spericas marked this conversation as resolved.
Show resolved Hide resolved
assert is != null;
is.transferTo(outputStream);
}
}).header(Http.Header.CONTENT_LENGTH, "6000000").build();
}
}

@Test
void testAutoFlush() {
try (Response resp = target.path("auto-flush")
.request()
.get()) {
assertThat(resp.getStatus(), is(200));
assertThat(resp.getHeaderString(Http.Header.CONTENT_LENGTH), is("6000000"));
assertThat(resp.readEntity(byte[].class).length, is(6000000));
}
}
}
Binary file added microprofile/server/src/test/resources/zero.bin
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2022 Oracle and/or its affiliates.
* Copyright (c) 2022, 2023 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -120,10 +120,10 @@ class WatermarkAutoFlush extends WatermarkLinear {

@Override
public void inc(NettyChannel channel, int byteSize) {
super.inc(channel, byteSize);
if (!watermarkNotReached()) {
channel.flush();
}
super.inc(channel, byteSize);
}
}

Expand Down