[Ingest Manager] Make setupIngestManager wait if setup is in progress (…

…elastic#70008) * Make setupIngestManager wait if another setup is in progress
Bamieh · Jul 1, 2020 · a1d3235 · a1d3235
1 parent e6aa235
commit a1d3235
Showing 1 changed file with 80 additions and 57 deletions.
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -30,70 +30,93 @@ import { appContextService } from './app_context';
 const FLEET_ENROLL_USERNAME = 'fleet_enroll';
 const FLEET_ENROLL_ROLE = 'fleet_enroll';
 
+// the promise which tracks the setup
+let setupIngestStatus: Promise<void> | undefined;
+// default resolve & reject to guard against "undefined is not a function" errors
+let onSetupResolve = () => {};
+let onSetupReject = (error: Error) => {};
+
 export async function setupIngestManager(
   soClient: SavedObjectsClientContract,
   callCluster: CallESAsCurrentUser
 ) {
-  const [installedPackages, defaultOutput, config] = await Promise.all([
-    // packages installed by default
-    ensureInstalledDefaultPackages(soClient, callCluster),
-    outputService.ensureDefaultOutput(soClient),
-    agentConfigService.ensureDefaultAgentConfig(soClient),
-    ensureDefaultIndices(callCluster),
-    settingsService.getSettings(soClient).catch((e: any) => {
-      if (e.isBoom && e.output.statusCode === 404) {
-        const http = appContextService.getHttpSetup();
-        const serverInfo = http.getServerInfo();
-        const basePath = http.basePath;
-
-        const cloud = appContextService.getCloud();
-        const cloudId = cloud?.isCloudEnabled && cloud.cloudId;
-        const cloudUrl = cloudId && decodeCloudId(cloudId)?.kibanaUrl;
-        const flagsUrl = appContextService.getConfig()?.fleet?.kibana?.host;
-        const defaultUrl = url.format({
-          protocol: serverInfo.protocol,
-          hostname: serverInfo.host,
-          port: serverInfo.port,
-          pathname: basePath.serverBasePath,
-        });
-
-        return settingsService.saveSettings(soClient, {
-          agent_auto_upgrade: true,
-          package_auto_upgrade: true,
-          kibana_url: cloudUrl || flagsUrl || defaultUrl,
-        });
-      }
-
-      return Promise.reject(e);
-    }),
-  ]);
-
-  // ensure default packages are added to the default conifg
-  const configWithDatasource = await agentConfigService.get(soClient, config.id, true);
-  if (!configWithDatasource) {
-    throw new Error('Config not found');
-  }
-  if (
-    configWithDatasource.datasources.length &&
-    typeof configWithDatasource.datasources[0] === 'string'
-  ) {
-    throw new Error('Config not found');
+  // installation in progress
+  if (setupIngestStatus) {
+    await setupIngestStatus;
+  } else {
+    // create the initial promise
+    setupIngestStatus = new Promise((res, rej) => {
+      onSetupResolve = res;
+      onSetupReject = rej;
+    });
   }
-  for (const installedPackage of installedPackages) {
-    const packageShouldBeInstalled = DEFAULT_AGENT_CONFIGS_PACKAGES.some(
-      (packageName) => installedPackage.name === packageName
-    );
-    if (!packageShouldBeInstalled) {
-      continue;
+  try {
+    const [installedPackages, defaultOutput, config] = await Promise.all([
+      // packages installed by default
+      ensureInstalledDefaultPackages(soClient, callCluster),
+      outputService.ensureDefaultOutput(soClient),
+      agentConfigService.ensureDefaultAgentConfig(soClient),
+      ensureDefaultIndices(callCluster),
+      settingsService.getSettings(soClient).catch((e: any) => {
+        if (e.isBoom && e.output.statusCode === 404) {
+          const http = appContextService.getHttpSetup();
+          const serverInfo = http.getServerInfo();
+          const basePath = http.basePath;
+
+          const cloud = appContextService.getCloud();
+          const cloudId = cloud?.isCloudEnabled && cloud.cloudId;
+          const cloudUrl = cloudId && decodeCloudId(cloudId)?.kibanaUrl;
+          const flagsUrl = appContextService.getConfig()?.fleet?.kibana?.host;
+          const defaultUrl = url.format({
+            protocol: serverInfo.protocol,
+            hostname: serverInfo.host,
+            port: serverInfo.port,
+            pathname: basePath.serverBasePath,
+          });
+
+          return settingsService.saveSettings(soClient, {
+            agent_auto_upgrade: true,
+            package_auto_upgrade: true,
+            kibana_url: cloudUrl || flagsUrl || defaultUrl,
+          });
+        }
+
+        return Promise.reject(e);
+      }),
+    ]);
+
+    // ensure default packages are added to the default conifg
+    const configWithDatasource = await agentConfigService.get(soClient, config.id, true);
+    if (!configWithDatasource) {
+      throw new Error('Config not found');
     }
+    if (
+      configWithDatasource.datasources.length &&
+      typeof configWithDatasource.datasources[0] === 'string'
+    ) {
+      throw new Error('Config not found');
+    }
+    for (const installedPackage of installedPackages) {
+      const packageShouldBeInstalled = DEFAULT_AGENT_CONFIGS_PACKAGES.some(
+        (packageName) => installedPackage.name === packageName
+      );
+      if (!packageShouldBeInstalled) {
+        continue;
+      }
 
-    const isInstalled = configWithDatasource.datasources.some((d: Datasource | string) => {
-      return typeof d !== 'string' && d.package?.name === installedPackage.name;
-    });
-
-    if (!isInstalled) {
-      await addPackageToConfig(soClient, installedPackage, configWithDatasource, defaultOutput);
+      const isInstalled = configWithDatasource.datasources.some((d: Datasource | string) => {
+        return typeof d !== 'string' && d.package?.name === installedPackage.name;
+      });
+      if (!isInstalled) {
+        await addPackageToConfig(soClient, installedPackage, configWithDatasource, defaultOutput);
+      }
     }
+
+    // if everything works, resolve/succeed
+    onSetupResolve();
+  } catch (error) {
+    // if anything errors, reject/fail
+    onSetupReject(error);
   }
 }
 
@@ -135,7 +158,7 @@ export async function setupFleet(
     },
   });
 
-  await outputService.invalidateCache();
+  outputService.invalidateCache();
 
   // save fleet admin user
   const defaultOutputId = await outputService.getDefaultOutputId(soClient);