From 6c044591929c03268a5932cba50414cbbd5b9679 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:41:26 +0530
Subject: [PATCH] Fix to include static settings in addition to dynamic repo
 metadata settings during s3 plugin reload (#10452) (#10456)

(cherry picked from commit 4fee40d847199495f19bf1209b12f67c11e84f54)

Signed-off-by: vikasvb90 <vikasvb@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../java/org/opensearch/repositories/s3/S3Repository.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Repository.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Repository.java
index 0e311c9419b24..b944bd8bf6260 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Repository.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Repository.java
@@ -460,9 +460,8 @@ public void reload(RepositoryMetadata newRepositoryMetadata) {
         readRepositoryMetadata();
 
         // Reload configs for S3RepositoryPlugin
-        final Map<String, S3ClientSettings> clientsSettings = S3ClientSettings.load(metadata.settings(), pluginConfigPath);
-        service.refreshAndClearCache(clientsSettings);
-        s3AsyncService.refreshAndClearCache(clientsSettings);
+        service.settings(metadata);
+        s3AsyncService.settings(metadata);
 
         // Reload configs for S3BlobStore
         BlobStore blobStore = getBlobStore();