more assertion

Author: ywangd

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

@@ -290,7 +290,7 @@ final AmazonS3Reference client(RepositoryMetadata repositoryMetadata) {
                 }
                 if (closed.get()) {
                     // Not adding a new client once the manager is closed since there won't be anything to close it
-                    throw new IllegalStateException("clients holder is closed");
+                    throw new IllegalStateException("Project [" + projectId() + "] clients holder is closed");
                 }
                 // The close() method maybe called after we checked it, it is ok since we are already inside the synchronized block.
                 // The clearCache() will clear the newly added client.

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3ClientsManagerTests.java

@@ -152,7 +152,7 @@ public void testDoesNotCreateClientWhenSecretsAreNotConfigured() {
         assertThat(getClientsHoldersExcludeDefaultProject(), anEmptyMap());
     }
 
-    public void testClientsLifeCycleForSingleProject() {
+    public void testClientsLifeCycleForSingleProject() throws Exception {
         final ProjectId projectId = randomUniqueProjectId();
         final String clientName = randomFrom(clientNames);
         final String anotherClientName = randomValueOtherThan(clientName, () -> randomFrom(clientNames));
@@ -197,13 +197,22 @@ public void testClientsLifeCycleForSingleProject() {
             antherClient.decRef();
         }
 
+        final var clientsHolder = s3ClientsManager.getClientsHolders().get(projectId);
+
         // Remove project secrets
         if (randomBoolean()) {
             updateProjectInClusterState(projectId, Map.of());
         } else {
             removeProjectFromClusterState(projectId);
         }
         assertClientNotFound(projectId, clientName);
+
+        assertBusy(() -> assertTrue(clientsHolder.isClosed()));
+        final var e = expectThrows(
+            IllegalStateException.class,
+            () -> clientsHolder.client(createRepositoryMetadata(randomFrom(clientName, anotherClientName)))
+        );
+        assertThat(e.getMessage(), containsString("Project [" + projectId + "] clients holder is closed"));
     }
 
     public void testClientsForMultipleProjects() throws InterruptedException {