Skip to content

Commit 5232ac4

Browse files
authored
update the fio default options (#921)
1 parent 1d6820f commit 5232ac4

9 files changed

Lines changed: 59 additions & 11 deletions

File tree

.builder/actions/aws_crt_java_test.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,14 @@ def start_maven_tests(self, env):
5757
# causes the CRT to be loaded and initialized.
5858
self._run_java_tests("-Dtest=InitTest")
5959

60-
# run the elasticurl integration tests
61-
python = sys.executable
62-
env.shell.exec(python, 'crt/aws-c-http/integration-testing/http_client_test.py',
63-
python, 'integration-testing/java_elasticurl_runner.py', check=True)
60+
# postman-echo.com in now requires TLS1.3,
61+
# but our Mac implementation doesn't support TLS1.3 yet.
62+
# The work has been planned to Dec. 2025 to support TLS1.3,
63+
# so disable the test for now. And reenable it afterward
64+
# # run the elasticurl integration tests
65+
# python = sys.executable
66+
# env.shell.exec(python, 'crt/aws-c-http/integration-testing/http_client_test.py',
67+
# python, 'integration-testing/java_elasticurl_runner.py', check=True)
6468

6569
def run(self, env):
6670
self.env = env

crt/s2n

Submodule s2n updated from a786223 to 30f40f2

src/main/java/software/amazon/awssdk/crt/s3/FileIoOptions.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
package software.amazon.awssdk.crt.s3;
66

77
/**
8+
* WARNING: experimental/unstable, the default behavior is subjected to change in the future.
89
* Controls how client performs file I/O operations. Only applies to file-based workloads.
910
*/
1011
public class FileIoOptions {
1112

1213
/**
1314
* Skip buffering the part in memory before sending the request.
14-
* If set, set the {@code diskThroughputGbps} to reasonably align with the available disk throughput.
15-
* Otherwise, the transfer may fail with connection starvation.
16-
* Defaults to false.
15+
* Default to false on small objects, and true when the object size exceed a certain threshold.
1716
*/
1817
private boolean shouldStream;
1918

2019
/**
2120
* The estimated disk throughput in gigabits per second (Gbps).
2221
* Only applied when {@code shouldStream} is true.
2322
*
24-
* When doing upload with streaming, it's important to set the disk throughput to prevent connection starvation.
2523
* Note: There are possibilities that cannot reach all available disk throughput:
2624
* 1. Disk is busy with other applications
2725
* 2. OS Cache may cap the throughput, use {@code directIo} to get around this.
26+
*
27+
* Default to throughputTargetGbps set in {@link S3ClientOptions}.
2828
*/
2929
private double diskThroughputGbps;
3030

src/test/java/software/amazon/awssdk/crt/test/CrtTestFixture.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,4 +309,14 @@ protected void skipIfAndroid() {
309309
Assume.assumeFalse(platform.getOSIdentifier().contains("android"));
310310
}
311311
}
312+
313+
protected void skipIfMac() {
314+
CrtPlatform platform = CRT.getPlatformImpl();
315+
if (platform != null) {
316+
Assume.assumeFalse(platform.getOSIdentifier().contains("osx"));
317+
} else {
318+
// Fallback to direct OS detection if platform is null
319+
Assume.assumeFalse(CRT.getOSIdentifier().equals("osx"));
320+
}
321+
}
312322
}

src/test/java/software/amazon/awssdk/crt/test/Http2ClientConnectionTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package software.amazon.awssdk.crt.test;
77

88
import org.junit.Test;
9+
import org.junit.Before;
910
import org.junit.Assert;
1011

1112
import java.net.URI;
@@ -30,6 +31,15 @@ public class Http2ClientConnectionTest extends HttpClientTestFixture {
3031
private final static String HOST = "https://postman-echo.com";
3132
private final static HttpVersion EXPECTED_VERSION = HttpVersion.HTTP_2;
3233

34+
@Before
35+
public void setUp() {
36+
// postman-echo.com in now requires TLS1.3,
37+
// but our Mac implementation doesn't support TLS1.3 yet.
38+
// The work has been planned to Dec. 2025 to support TLS1.3,
39+
// so disable the test for now. And reenable it afterward
40+
skipIfMac();
41+
}
42+
3343
private void doHttp2ConnectionGetVersionTest() {
3444
try {
3545
CompletableFuture<Void> shutdownComplete = null;

src/test/java/software/amazon/awssdk/crt/test/Http2RequestResponseTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ public class Http2RequestResponseTest extends HttpRequestResponseFixture {
3434

3535
private Http2Request getHttp2Request(String method, String endpoint, String path, String requestBody)
3636
throws Exception {
37+
if(endpoint.equals(HOST)) {
38+
// postman-echo.com in now requires TLS1.3,
39+
// but our Mac implementation doesn't support TLS1.3 yet.
40+
// The work has been planned to Dec. 2025 to support TLS1.3,
41+
// so disable the test for now. And reenable it afterward
42+
skipIfMac();
43+
}
3744
URI uri = new URI(endpoint);
3845

3946
HttpHeader[] requestHeaders = null;
@@ -167,6 +174,11 @@ public void testHttp2Download() throws Exception {
167174
}
168175

169176
private void doHttp2ResetStreamTest() {
177+
// postman-echo.com in now requires TLS1.3,
178+
// but our Mac implementation doesn't support TLS1.3 yet.
179+
// The work has been planned to Dec. 2025 to support TLS1.3,
180+
// so disable the test for now. And reenable it afterward
181+
skipIfMac();
170182
try {
171183
CompletableFuture<Void> shutdownComplete = null;
172184
boolean actuallyConnected = false;

src/test/java/software/amazon/awssdk/crt/test/HttpRequestResponseTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ public class HttpRequestResponseTest extends HttpRequestResponseFixture {
3131

3232
public TestHttpResponse testRequest(String method, String endpoint, String path, String requestBody,
3333
boolean useChunkedEncoding, int expectedStatus) throws Exception {
34+
if(endpoint.equals(HOST)) {
35+
// postman-echo.com in now requires TLS1.3,
36+
// but our Mac implementation doesn't support TLS1.3 yet.
37+
// The work has been planned to Dec. 2025 to support TLS1.3,
38+
// so disable the test for now. And reenable it afterward
39+
skipIfMac();
40+
}
3441
URI uri = new URI(endpoint);
3542

3643
HttpHeader[] requestHeaders = null;
@@ -260,6 +267,11 @@ public void testHttpUploadChunked() throws Exception {
260267
}
261268

262269
private void doHttpRequestUnActivatedTest() {
270+
// postman-echo.com in now requires TLS1.3,
271+
// but our Mac implementation doesn't support TLS1.3 yet.
272+
// The work has been planned to Dec. 2025 to support TLS1.3,
273+
// so disable the test for now. And reenable it afterward
274+
skipIfMac();
263275
try {
264276
URI uri = new URI(HOST);
265277

0 commit comments

Comments
 (0)