Skip to content

Fix connectionPoolingWorks test for Apache5.x by fixing setConnectionTimeToLive for Apache5.x #6165

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.

Sign up for GitHub

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

Merged
joviegas merged 12 commits into from
Jun 11, 2025
Merged

Fix connectionPoolingWorks test for Apache5.x by fixing setConnectionTimeToLive for Apache5.x #6165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9e8fc15
Fix architecture test failures for apache5.x
joviegas May 29, 2025
70a120e
Merge branch 'feature/master/apache5x' into joviegas/apache-5-achitec…
joviegas May 29, 2025
c7b09a2
Merge issues resolved
joviegas May 29, 2025
068cada
Checkstyle issues
joviegas May 29, 2025
4766e74
Update to use PoolingHttpClientConnectionManager class reference that…
joviegas May 30, 2025
c81efdc
Merge branch 'master' into joviegas/apache-5-achitecture-test-fix
joviegas May 30, 2025
6b64589
Merge branch 'feature/master/apache5x' into joviegas/apache-5-achitec…
joviegas May 30, 2025
89debeb
Merge branch 'feature/master/apache5x' into joviegas/apache-5-achitec…
joviegas Jun 2, 2025
7f9e77f
Fix stream reset failure in RepeatableInputStreamRequestEntity by sto…
joviegas Jun 3, 2025
5fb2d35
writeTo_ConcurrentWrites_HandlesCorrectly no longer needed since even…
joviegas Jun 3, 2025
52fedbd
Merge branch 'feature/master/apache5x' into joviegas/apache-5-achitec…
joviegas Jun 9, 2025
8b83790
Fix connectionPoolingWorks by setting skipping setConnectionTimeToLi…
joviegas Jun 9, 2025
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
15 changes: 8 additions & 7 deletions ...s/apache5-client/src/main/java/software/amazon/awssdk/http/apache5/Apache5HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,16 +694,17 @@ public PoolingHttpClientConnectionManager create(Apache5HttpClient.DefaultBuilde
// TODO : Deprecated method needs to be removed with new replacements
SSLConnectionSocketFactory sslsf = getPreferredSocketFactory(configuration, standardOptions);

PoolingHttpClientConnectionManager cm =
PoolingHttpClientConnectionManagerBuilder builder =
PoolingHttpClientConnectionManagerBuilder.create()
.setSSLSocketFactory(sslsf)
.setSchemePortResolver(DefaultSchemePortResolver.INSTANCE)
.setDnsResolver(configuration.dnsResolver)
.setConnectionTimeToLive(
TimeValue.of(standardOptions.get(
SdkHttpConfigurationOption.CONNECTION_TIME_TO_LIVE).toMillis(),
TimeUnit.MILLISECONDS))
.build();
.setDnsResolver(configuration.dnsResolver);
Duration connectionTtl = standardOptions.get(SdkHttpConfigurationOption.CONNECTION_TIME_TO_LIVE);
if (!connectionTtl.isZero()) {
Copy link
Copy Markdown
Contributor Author

@joviegas joviegas Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that SdkHttpConfigurationOption sets default value as 0 in

aws-sdk-java-v2/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpConfigurationOption.java

Line 145 in 86bb440

private static final Duration DEFAULT_CONNECTION_TIME_TO_LIVE = Duration.ZERO;

// Skip TTL=0 to maintain backward compatibility (infinite in 4.x vs immediate expiration in 5.x)
builder.setConnectionTimeToLive(TimeValue.of(connectionTtl.toMillis(), TimeUnit.MILLISECONDS));
}
PoolingHttpClientConnectionManager cm = builder.build();


cm.setDefaultMaxPerRoute(standardOptions.get(SdkHttpConfigurationOption.MAX_CONNECTIONS));
Expand Down
6 changes: 0 additions & 6 deletions ...ient/src/test/java/software/amazon/awssdk/http/apache5/Apache5HttpClientWireMockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,6 @@ public void credentialPlannerIsInvoked() throws Exception {
mockProxyServer.verify(2, RequestPatternBuilder.allRequests());
}


@Override
public void connectionPoolingWorks() throws Exception {
// TODO : future PR will handle this.
}

Comment on lines -157 to -161
Copy link
Copy Markdown
Contributor

@davidh44 davidh44 Jun 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Junit added back with this PR , earlier it was commented.

Is that this test? Its being removed not added back

Copy link
Copy Markdown
Contributor Author

@joviegas joviegas Jun 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since Apache5HttpClientWireMockTest extends SdkHttpClientTestSuite

Its been added back , since we removed the empty test from here it will pick up the actual test from

aws-sdk-java-v2/test/http-client-tests/src/main/java/software/amazon/awssdk/http/SdkHttpClientTestSuite.java

Lines 121 to 146 in 0af784d

public void connectionPoolingWorks() throws Exception {
int initialOpenedConnections = CONNECTION_COUNTER.openedConnections();
SdkHttpClientOptions httpClientOptions = new SdkHttpClientOptions();
httpClientOptions.trustAll(true);
try (SdkHttpClient client = createSdkHttpClient(httpClientOptions)) {
stubForMockRequest(200);
for (int i = 0; i < 5; i++) {
SdkHttpFullRequest req = mockSdkRequest("http://localhost:" + mockServer.port(), SdkHttpMethod.POST);
HttpExecuteResponse response =
client.prepareRequest(HttpExecuteRequest.builder()
.request(req)
.contentStreamProvider(req.contentStreamProvider().orElse(null))
.build())
.call();
response.responseBody().ifPresent(IoUtils::drainInputStream);
}
// connection pool growth strategies vary across client implementations. Some, such as the CRT grow connection counts
// by a factor of 2, while some grow strictly as requested. Mainly we want to test that it kicks in at some point and
// doesn't create a new connection for all 5 requests. This proves that while allowing variance in this behavior.
assertThat(CONNECTION_COUNTER.openedConnections()).isGreaterThanOrEqualTo(initialOpenedConnections + 1);
assertThat(CONNECTION_COUNTER.openedConnections()).isLessThanOrEqualTo(initialOpenedConnections + 2);
}
}

@Test
public void overrideDnsResolver_WithDnsMatchingResolver_successful() throws Exception {
overrideDnsResolver("magic.local.host");
Expand Down
Loading