Skip to content

Register s3.client.<client>.disable_chunked_encoding in repository-s3 node settings #20161

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

Open
Gautam-aman wants to merge 8 commits into
base: main
Choose a base branch
from
+29 −2
Open

Register s3.client.<client>.disable_chunked_encoding in repository-s3 node settings #20161

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
068a2bd
Register s3.client.*.disable_chunked_encoding in repository-s3 plugin…
Gautam-aman Dec 3, 2025
7251e94
Expose all missing S3 client settings in repository-s3 plugin
Gautam-aman Dec 4, 2025
aeceb9a
Update comment for clarity
Gautam-aman Dec 4, 2025
12ac7d1
Include max_sync_connections in S3 client refine logic
Gautam-aman Dec 4, 2025
07f99f1
Fix S3 settings order to prevent CI timeout on docker fixtures
Gautam-aman Dec 4, 2025
1d67079
Fix duplicate S3 client settings registration by removing already reg…
Gautam-aman Dec 4, 2025
6737526
Register missing S3 client settings (REQUEST_TIMEOUT, CONNECTION_TIME…
Gautam-aman Dec 5, 2025
92d39fe
CI trigger: retrigger check-result
Gautam-aman Dec 5, 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
5 changes: 4 additions & 1 deletion plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@ S3ClientSettings refine(Settings repositorySettings) {
&& newConnectionTTLMillis == connectionTTLMillis
&& newMaxConnections == maxConnections
&& newConnectionAcquisitionTimeoutMillis == connectionAcquisitionTimeoutMillis
&& newMaxSyncConnections == maxSyncConnections // added maxSyncConnections
&& maxRetries == newMaxRetries
&& newThrottleRetries == throttleRetries
&& Objects.equals(credentials, newCredentials)
Expand Down Expand Up @@ -673,14 +674,15 @@ public boolean equals(final Object o) {
&& connectionTimeoutMillis == that.connectionTimeoutMillis
&& connectionTTLMillis == that.connectionTTLMillis
&& maxConnections == that.maxConnections
&& maxSyncConnections == that.maxSyncConnections // fixed here
&& connectionAcquisitionTimeoutMillis == that.connectionAcquisitionTimeoutMillis
&& maxRetries == that.maxRetries
&& throttleRetries == that.throttleRetries
&& Objects.equals(credentials, that.credentials)
&& Objects.equals(endpoint, that.endpoint)
&& protocol == that.protocol
&& proxySettings.equals(that.proxySettings)
&& Objects.equals(disableChunkedEncoding, that.disableChunkedEncoding)
&& disableChunkedEncoding == that.disableChunkedEncoding
&& Objects.equals(region, that.region)
&& Objects.equals(signerOverride, that.signerOverride)
&& Objects.equals(irsaCredentials, that.irsaCredentials);
Expand All @@ -698,6 +700,7 @@ public int hashCode() {
connectionTimeoutMillis,
connectionTTLMillis,
maxConnections,
maxSyncConnections, // fixed here
connectionAcquisitionTimeoutMillis,
maxRetries,
throttleRetries,
Expand Down
24 changes: 8 additions & 16 deletions plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ public Map<String, Repository.Factory> getRepositories(
@Override
public List<Setting<?>> getSettings() {
return Arrays.asList(
// named s3 client configuration settings
// s3 client configuration settings
S3ClientSettings.ACCESS_KEY_SETTING,
S3ClientSettings.SECRET_KEY_SETTING,
S3ClientSettings.SESSION_TOKEN_SETTING,
Expand All @@ -356,26 +356,18 @@ public List<Setting<?>> getSettings() {
S3ClientSettings.PROXY_PORT_SETTING,
S3ClientSettings.PROXY_USERNAME_SETTING,
S3ClientSettings.PROXY_PASSWORD_SETTING,
S3ClientSettings.READ_TIMEOUT_SETTING,
S3ClientSettings.MAX_RETRIES_SETTING,
S3ClientSettings.USE_THROTTLE_RETRIES_SETTING,
S3ClientSettings.USE_PATH_STYLE_ACCESS,
S3Repository.ACCESS_KEY_SETTING,
S3Repository.SECRET_KEY_SETTING,
S3ClientSettings.SIGNER_OVERRIDE,
S3ClientSettings.REGION,
S3ClientSettings.ROLE_ARN_SETTING,
S3ClientSettings.IDENTITY_TOKEN_FILE_SETTING,
S3ClientSettings.ROLE_SESSION_NAME_SETTING,
S3ClientSettings.LEGACY_MD5_CHECKSUM_CALCULATION,
S3Repository.PARALLEL_MULTIPART_UPLOAD_MINIMUM_PART_SIZE_SETTING,
S3Repository.PARALLEL_MULTIPART_UPLOAD_ENABLED_SETTING,
S3Repository.REDIRECT_LARGE_S3_UPLOAD,
S3Repository.UPLOAD_RETRY_ENABLED,
S3Repository.S3_PRIORITY_PERMIT_ALLOCATION_PERCENT,
S3Repository.PERMIT_BACKED_TRANSFER_ENABLED,
S3Repository.S3_ASYNC_HTTP_CLIENT_TYPE
);

// additional s3 client configuration settings added in this PR
S3ClientSettings.MAX_SYNC_CONNECTIONS_SETTING,
S3ClientSettings.CONNECTION_ACQUISITION_TIMEOUT,
S3ClientSettings.MAX_PENDING_CONNECTION_ACQUIRES,
S3ClientSettings.DISABLE_CHUNKED_ENCODING
);
}

@Override
Expand Down
11 changes: 11 additions & 0 deletions ...s/repository-s3/src/test/java/org/opensearch/repositories/s3/S3RepositoryPluginTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,17 @@ public void testGetExecutorBuilders() throws IOException {
);
}
assertTrue(plugin.getSettings().contains(S3Repository.S3_ASYNC_HTTP_CLIENT_TYPE));
// New assertion for your bug fix
assertTrue(plugin.getSettings().contains(S3ClientSettings.DISABLE_CHUNKED_ENCODING));
// settings added to expose missing s3.client.* configs
assertTrue(plugin.getSettings().contains(S3ClientSettings.REQUEST_TIMEOUT_SETTING));
assertTrue(plugin.getSettings().contains(S3ClientSettings.CONNECTION_TIMEOUT_SETTING));
assertTrue(plugin.getSettings().contains(S3ClientSettings.CONNECTION_TTL_SETTING));
assertTrue(plugin.getSettings().contains(S3ClientSettings.MAX_CONNECTIONS_SETTING));
assertTrue(plugin.getSettings().contains(S3ClientSettings.MAX_SYNC_CONNECTIONS_SETTING));
assertTrue(plugin.getSettings().contains(S3ClientSettings.CONNECTION_ACQUISITION_TIMEOUT));
assertTrue(plugin.getSettings().contains(S3ClientSettings.MAX_PENDING_CONNECTION_ACQUIRES));

} finally {
if (threadPool != null) {
terminate(threadPool);
Expand Down
Loading