Return early when parallel install process detected (elastic#84190)

mbondyra · Dec 1, 2020 · c9fc876 · c9fc876
1 parent 80e88ce
commit c9fc876
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts b/x-pack/plugins/fleet/server/services/epm/packages/_install_package.ts
@@ -5,7 +5,7 @@
  */
 
 import { SavedObject, SavedObjectsClientContract } from 'src/core/server';
-import { InstallablePackage, InstallSource } from '../../../../common';
+import { InstallablePackage, InstallSource, MAX_TIME_COMPLETE_INSTALL } from '../../../../common';
 import { PACKAGES_SAVED_OBJECT_TYPE } from '../../../constants';
 import {
   AssetReference,
@@ -46,15 +46,29 @@ export async function _installPackage({
   installSource: InstallSource;
 }): Promise<AssetReference[]> {
   const { name: pkgName, version: pkgVersion } = packageInfo;
-  // add the package installation to the saved object.
-  // if some installation already exists, just update install info
+  // if some installation already exists
   if (installedPkg) {
-    await savedObjectsClient.update(PACKAGES_SAVED_OBJECT_TYPE, pkgName, {
-      install_version: pkgVersion,
-      install_status: 'installing',
-      install_started_at: new Date().toISOString(),
-      install_source: installSource,
-    });
+    // if the installation is currently running, don't try to install
+    // instead, only return already installed assets
+    if (
+      installedPkg.attributes.install_status === 'installing' &&
+      Date.now() - Date.parse(installedPkg.attributes.install_started_at) <
+        MAX_TIME_COMPLETE_INSTALL
+    ) {
+      let assets: AssetReference[] = [];
+      assets = assets.concat(installedPkg.attributes.installed_es);
+      assets = assets.concat(installedPkg.attributes.installed_kibana);
+      return assets;
+    } else {
+      // if no installation is running, or the installation has been running longer than MAX_TIME_COMPLETE_INSTALL
+      // (it might be stuck) update the saved object and proceed
+      await savedObjectsClient.update(PACKAGES_SAVED_OBJECT_TYPE, pkgName, {
+        install_version: pkgVersion,
+        install_status: 'installing',
+        install_started_at: new Date().toISOString(),
+        install_source: installSource,
+      });
+    }
   } else {
     await createInstallation({
       savedObjectsClient,