Create GCSService in createComponents

Author: ywangd

modules/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java

@@ -280,7 +280,7 @@ public Map<String, Repository.Factory> getRepositories(
                     projectId,
                     metadata,
                     registry,
-                    this.storageService,
+                    this.storageService.get(),
                     clusterService,
                     bigArrays,
                     recoverySettings,
@@ -292,7 +292,7 @@ protected GoogleCloudStorageBlobStore createBlobStore() {
                             metadata.settings().get("bucket"),
                             "test",
                             metadata.name(),
-                            storageService,
+                            storageService.get(),
                             bigArrays,
                             randomIntBetween(1, 8) * 1024,
                             BackoffPolicy.noBackoff(),

modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.repositories.gcs;
 
+import org.apache.lucene.util.SetOnce;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.Setting;
@@ -24,21 +25,20 @@
 import org.elasticsearch.xcontent.NamedXContentRegistry;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 public class GoogleCloudStoragePlugin extends Plugin implements RepositoryPlugin, ReloadablePlugin {
 
+    private final Settings settings;
     // package-private for tests
-    final GoogleCloudStorageService storageService;
+    final SetOnce<GoogleCloudStorageService> storageService = new SetOnce<>();
 
     @SuppressWarnings("this-escape")
     public GoogleCloudStoragePlugin(final Settings settings) {
-        var isServerless = DiscoveryNode.isStateless(settings);
-        this.storageService = createStorageService(isServerless);
-        // eagerly load client settings so that secure settings are readable (not closed)
-        reload(settings);
+        this.settings = settings;
     }
 
     // overridable for tests
@@ -61,7 +61,7 @@ public Map<String, Repository.Factory> getRepositories(
                 projectId,
                 metadata,
                 namedXContentRegistry,
-                this.storageService,
+                this.storageService.get(),
                 clusterService,
                 bigArrays,
                 recoverySettings,
@@ -70,6 +70,15 @@ public Map<String, Repository.Factory> getRepositories(
         );
     }
 
+    @Override
+    public Collection<?> createComponents(PluginServices services) {
+        var isServerless = DiscoveryNode.isStateless(settings);
+        storageService.set(createStorageService(isServerless));
+        // eagerly load client settings so that secure settings are readable (not closed)
+        reload(settings);
+        return List.of(storageService.get());
+    }
+
     @Override
     public List<Setting<?>> getSettings() {
         return Arrays.asList(
@@ -94,6 +103,6 @@ public void reload(Settings settings) {
         // `GoogleCloudStorageClientSettings` instance) instead of the `Settings`
         // instance.
         final Map<String, GoogleCloudStorageClientSettings> clientsSettings = GoogleCloudStorageClientSettings.load(settings);
-        this.storageService.refreshAndClearCache(clientsSettings);
+        this.storageService.get().refreshAndClearCache(clientsSettings);
     }
 }

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageServiceTests.java

@@ -22,6 +22,7 @@
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.hamcrest.Matchers;
@@ -38,6 +39,7 @@
 import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.mockito.Mockito.mock;
 
 public class GoogleCloudStorageServiceTests extends ESTestCase {
 
@@ -113,7 +115,8 @@ public void testReinitClientSettings() throws Exception {
         secureSettings2.setFile("gcs.client.gcs3.credentials_file", serviceAccountFileContent("project_gcs23"));
         final Settings settings2 = Settings.builder().setSecureSettings(secureSettings2).build();
         try (GoogleCloudStoragePlugin plugin = new GoogleCloudStoragePlugin(settings1)) {
-            final GoogleCloudStorageService storageService = plugin.storageService;
+            plugin.createComponents(mock(Plugin.PluginServices.class));
+            final GoogleCloudStorageService storageService = plugin.storageService.get();
             var statsCollector = new GcsRepositoryStatsCollector();
             final var client11 = storageService.client("gcs1", "repo1", statsCollector);
             assertThat(client11.getOptions().getProjectId(), equalTo("project_gcs11"));
@@ -151,7 +154,8 @@ public void testClientsAreNotSharedAcrossRepositories() throws Exception {
         secureSettings1.setFile("gcs.client.gcs1.credentials_file", serviceAccountFileContent("test_project"));
         final Settings settings = Settings.builder().setSecureSettings(secureSettings1).build();
         try (GoogleCloudStoragePlugin plugin = new GoogleCloudStoragePlugin(settings)) {
-            final GoogleCloudStorageService storageService = plugin.storageService;
+            plugin.createComponents(mock(Plugin.PluginServices.class));
+            final GoogleCloudStorageService storageService = plugin.storageService.get();
 
             final MeteredStorage repo1Client = storageService.client("gcs1", "repo1", new GcsRepositoryStatsCollector());
             final MeteredStorage repo2Client = storageService.client("gcs1", "repo2", new GcsRepositoryStatsCollector());