more comments

Author: ywangd

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/PerProjectClientManager.java

@@ -62,6 +62,9 @@ public void clusterChanged(ClusterChangedEvent event) {
                 .build();
             final Map<String, S3ClientSettings> clientSettings = S3ClientSettings.load(currentSettings);
 
+            // TODO: clientSettings should not be empty, i.e. there should be at least one client configured
+            // Maybe log a warning if it is empty and continue. The project will not have usable client but that is probably ok.
+
             // TODO: Building and comparing the whole S3ClientSettings may be insufficient, we could just compare the relevant secrets
             if (newOrUpdated(project.id(), clientSettings)) {
                 updatedPerProjectClients.put(

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java

@@ -25,7 +25,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.ExceptionsHelper;
-import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.metadata.RepositoryMetadata;
 import org.elasticsearch.common.BackoffPolicy;
 import org.elasticsearch.common.Strings;
@@ -493,8 +492,8 @@ private static DeleteObjectsRequest bulkDelete(OperationPurpose purpose, S3BlobS
 
     @Override
     public void close() throws IOException {
-        // TODO: take actual project-id in account
-        service.onBlobStoreClose(Metadata.DEFAULT_PROJECT_ID);
+        // TODO: change to use service.onBlobStoreClose(projectId)
+        service.onBlobStoreClose();
     }
 
     @Override

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java

@@ -104,7 +104,6 @@ public Collection<?> createComponents(PluginServices services) {
             )
         );
         this.service.get().refreshAndClearCache(S3ClientSettings.load(settings));
-
         return List.of(service);
     }
 

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Service.java

@@ -174,7 +174,7 @@ public AmazonS3Reference client(RepositoryMetadata repositoryMetadata) {
      * Otherwise, attempts to retrieve a per-project client by the project-id and repository metadata from the
      * per-project client manager. Throws if project-id or the client does not exist. The client maybe initialized lazily.
      */
-    public AmazonS3Reference client(ProjectId projectId, RepositoryMetadata repositoryMetadata) {
+    public AmazonS3Reference client(@Nullable ProjectId projectId, RepositoryMetadata repositoryMetadata) {
         if (perProjectClientManager == null) {
             // Multi-Project is disabled and we have a single default project
             assert ProjectId.DEFAULT.equals(projectId) : projectId;
@@ -337,9 +337,18 @@ private synchronized void releaseCachedClients() {
         IdleConnectionReaper.shutdown();
     }
 
-    public void onBlobStoreClose(ProjectId projectId) {
+    public void onBlobStoreClose() {
+        releaseCachedClients();
+    }
+
+    public void onBlobStoreClose(@Nullable ProjectId projectId) {
         if (perProjectClientManager == null) {
-            releaseCachedClients();
+            // Multi-Project is disabled and we have a single default project
+            assert ProjectId.DEFAULT.equals(projectId) : projectId;
+            onBlobStoreClose();
+        } else if (projectId == null) {
+            // Multi-Project is enabled and this is for the cluster level blobstore
+            onBlobStoreClose();
         } else {
             perProjectClientManager.clearCacheForProject(projectId);
         }