Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix `HugeResourceTest` (#9411) 

#9408: restored HugeResourceTest:
 - fixed double-release bug in MultiPartFormData
 - used ByteBufferPool.NonPooling pool to work around #9311

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2023-02-27 09:12:50 +01:00 committed by GitHub
parent e4c46b1e14
commit e819809723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/MultiPartFormData.java
View File

@ -469,6 +469,7 @@ public class MultiPartFormData extends CompletableFuture<MultiPartFormData.Parts
}
partChunks.forEach(Content.Chunk::release);
partChunks.clear();
return;
}
}

34
jetty-ee10/jetty-ee10-webapp/src/test/java/org/eclipse/jetty/ee10/webapp/HugeResourceTest.java
View File

@ -52,6 +52,7 @@ import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.MultiPart;
import org.eclipse.jetty.io.ByteBufferPool;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.io.Content;
import org.eclipse.jetty.server.HttpConfiguration;
@ -70,7 +71,6 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@ -83,7 +83,6 @@ import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertTrue;
@Tag("large-disk-resource")
@Disabled // TODO investigate
public class HugeResourceTest
{
private static final long KB = 1024;
@ -114,11 +113,12 @@ public class HugeResourceTest
String.format("FileStore %s of %s needs at least 30GB of free space for this test (only had %,.2fGB)",
baseFileStore, staticBase, (double)(baseFileStore.getUnallocatedSpace() / GB)));
makeStaticFile(staticBase.resolve("test-1M.dat"), MB);
makeStaticFile(staticBase.resolve("test-100M.dat"), 100 * MB);
makeStaticFile(staticBase.resolve("test-1G.dat"), GB);
// makeStaticFile(staticBase.resolve("test-4G.dat"), 4 * GB);
// makeStaticFile(staticBase.resolve("test-10G.dat"), 10 * GB);
makeStaticFile(staticBase.resolve("test-1m.dat"), MB);
makeStaticFile(staticBase.resolve("test-1g.dat"), GB);
// The reason for testing 4GB and 10GB were because of various filesystem handling bugs
// we had in our code (the 2GB threshold and the 8GB threshold in various FileSystem APIs).
makeStaticFile(staticBase.resolve("test-4g.dat"), 4 * GB);
makeStaticFile(staticBase.resolve("test-10g.dat"), 10 * GB);
outputDir = MavenTestingUtils.getTargetTestingPath(HugeResourceTest.class.getSimpleName() + "-outputdir");
FS.ensureEmpty(outputDir);
@ -131,11 +131,10 @@ public class HugeResourceTest
{
ArrayList<Arguments> ret = new ArrayList<>();
ret.add(Arguments.of("test-1M.dat", MB));
ret.add(Arguments.of("test-100M.dat", 100 * MB));
ret.add(Arguments.of("test-1G.dat", GB));
// ret.add(Arguments.of("test-4G.dat", 4 * GB));
// ret.add(Arguments.of("test-1Gg.dat", 10 * GB));
ret.add(Arguments.of("test-1m.dat", MB));
ret.add(Arguments.of("test-1g.dat", GB));
ret.add(Arguments.of("test-4g.dat", 4 * GB));
ret.add(Arguments.of("test-10g.dat", 10 * GB));
return ret.stream();
}
@ -202,7 +201,8 @@ public class HugeResourceTest
QueuedThreadPool serverThreads = new QueuedThreadPool();
serverThreads.setDetailedDump(true);
serverThreads.setName("server");
server = new Server(serverThreads);
// TODO: Use normal pool when a fix for https://github.com/eclipse/jetty.project/issues/9311 is merged.
server = new Server(serverThreads, null, new ByteBufferPool.NonPooling());
httpConfig = new HttpConfiguration();
ServerConnector connector = new ServerConnector(server, 1, 1, new HttpConnectionFactory(httpConfig));
connector.setPort(0);
@ -249,6 +249,8 @@ public class HugeResourceTest
connector.setSelectors(1);
connector.setExecutor(clientThreads);
client = new HttpClient(new HttpClientTransportOverHTTP(connector));
// TODO: Use normal pool when a fix for https://github.com/eclipse/jetty.project/issues/9311 is merged.
client.setByteBufferPool(new ByteBufferPool.NonPooling());
client.start();
}
@ -428,7 +430,7 @@ public class HugeResourceTest
Thread.sleep(100);
stalled.set(false);
demand.get().run();
assertTrue(complete.await(30, TimeUnit.SECONDS));
assertTrue(complete.await(60, TimeUnit.SECONDS));
Response response = responseRef.get();
assertThat("HTTP Response Code", response.getStatus(), is(200));
@ -603,9 +605,9 @@ public class HugeResourceTest
IO.copy(inputStream, byteCounting);
out.printf("part[%s].inputStream.length=%d%n", part.getName(), byteCounting.getCount());
}
catch (IOException e)
catch (Throwable x)
{
e.printStackTrace(out);
throw new AssertionError(x);
}
});
}