Skip to content

Commit 068a2bd

Browse files
committed
Register s3.client.*.disable_chunked_encoding in repository-s3 plugin settings
Signed-off-by: Aman Gautam <[email protected]>
1 parent b7f013f commit 068a2bd

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,19 +673,21 @@ public boolean equals(final Object o) {
673673
&& connectionTimeoutMillis == that.connectionTimeoutMillis
674674
&& connectionTTLMillis == that.connectionTTLMillis
675675
&& maxConnections == that.maxConnections
676+
&& maxSyncConnections == that.maxSyncConnections // fixed here
676677
&& connectionAcquisitionTimeoutMillis == that.connectionAcquisitionTimeoutMillis
677678
&& maxRetries == that.maxRetries
678679
&& throttleRetries == that.throttleRetries
679680
&& Objects.equals(credentials, that.credentials)
680681
&& Objects.equals(endpoint, that.endpoint)
681682
&& protocol == that.protocol
682683
&& proxySettings.equals(that.proxySettings)
683-
&& Objects.equals(disableChunkedEncoding, that.disableChunkedEncoding)
684+
&& disableChunkedEncoding == that.disableChunkedEncoding
684685
&& Objects.equals(region, that.region)
685686
&& Objects.equals(signerOverride, that.signerOverride)
686687
&& Objects.equals(irsaCredentials, that.irsaCredentials);
687688
}
688689

690+
689691
@Override
690692
public int hashCode() {
691693
return Objects.hash(
@@ -698,6 +700,7 @@ public int hashCode() {
698700
connectionTimeoutMillis,
699701
connectionTTLMillis,
700702
maxConnections,
703+
maxSyncConnections, // fixed here
701704
connectionAcquisitionTimeoutMillis,
702705
maxRetries,
703706
throttleRetries,
@@ -707,6 +710,7 @@ public int hashCode() {
707710
);
708711
}
709712

713+
710714
private static <T> T getConfigValue(Settings settings, String clientName, Setting.AffixSetting<T> clientSetting) {
711715
final Setting<T> concreteSetting = clientSetting.getConcreteSettingForNamespace(clientName);
712716
return concreteSetting.get(settings);

plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,8 @@ public List<Setting<?>> getSettings() {
363363
S3Repository.ACCESS_KEY_SETTING,
364364
S3Repository.SECRET_KEY_SETTING,
365365
S3ClientSettings.SIGNER_OVERRIDE,
366+
// Fixed the bug in this line
367+
S3ClientSettings.DISABLE_CHUNKED_ENCODING,
366368
S3ClientSettings.REGION,
367369
S3ClientSettings.ROLE_ARN_SETTING,
368370
S3ClientSettings.IDENTITY_TOKEN_FILE_SETTING,

plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3RepositoryPluginTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ public void testGetExecutorBuilders() throws IOException {
7575
);
7676
}
7777
assertTrue(plugin.getSettings().contains(S3Repository.S3_ASYNC_HTTP_CLIENT_TYPE));
78+
// New assertion for your bug fix
79+
assertTrue(plugin.getSettings().contains(S3ClientSettings.DISABLE_CHUNKED_ENCODING));
80+
7881
} finally {
7982
if (threadPool != null) {
8083
terminate(threadPool);

0 commit comments

Comments
 (0)