Merge pull request microsoft#4002 from iclanton/remove-pnpm-store-purge

[rush] Do not delete the local pnpm store after all install attempts has failed.
spring6225 · Mar 6, 2023 · add49a3 · add49a3
2 parents 83db1b4 + a964b8b
commit add49a3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 37 deletions.
diff --git a/common/changes/@microsoft/rush/remove-pnpm-store-purge_2023-03-06-19-22.json b/common/changes/@microsoft/rush/remove-pnpm-store-purge_2023-03-06-19-22.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/rush",
+      "comment": "Do not delete the local pnpm store after all install attempts has failed. `rush purge` will still delete a local store.",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush"
+}
diff --git a/libraries/rush-lib/src/logic/installManager/RushInstallManager.ts b/libraries/rush-lib/src/logic/installManager/RushInstallManager.ts
@@ -575,45 +575,28 @@ export class RushInstallManager extends BaseInstallManager {
       );
     }
 
-    try {
-      Utilities.executeCommandWithRetry(
-        {
-          command: packageManagerFilename,
-          args: installArgs,
-          workingDirectory: this.rushConfiguration.commonTempFolder,
-          environment: packageManagerEnv,
-          suppressOutput: false
-        },
-        this.options.maxInstallAttempts,
-        () => {
-          if (this.rushConfiguration.packageManager === 'pnpm') {
-            console.log(colors.yellow(`Deleting the "node_modules" folder`));
-            this.installRecycler.moveFolder(commonNodeModulesFolder);
-
-            // Leave the pnpm-store as is for the retry. This ensures that packages that have already
-            // been downloaded need not be downloaded again, thereby potentially increasing the chances
-            // of a subsequent successful install.
-
-            Utilities.createFolderWithRetry(commonNodeModulesFolder);
-          }
+    Utilities.executeCommandWithRetry(
+      {
+        command: packageManagerFilename,
+        args: installArgs,
+        workingDirectory: this.rushConfiguration.commonTempFolder,
+        environment: packageManagerEnv,
+        suppressOutput: false
+      },
+      this.options.maxInstallAttempts,
+      () => {
+        if (this.rushConfiguration.packageManager === 'pnpm') {
+          console.log(colors.yellow(`Deleting the "node_modules" folder`));
+          this.installRecycler.moveFolder(commonNodeModulesFolder);
+
+          // Leave the pnpm-store as is for the retry. This ensures that packages that have already
+          // been downloaded need not be downloaded again, thereby potentially increasing the chances
+          // of a subsequent successful install.
+
+          Utilities.createFolderWithRetry(commonNodeModulesFolder);
         }
-      );
-    } catch (error) {
-      // All the install attempts failed.
-
-      if (
-        this.rushConfiguration.packageManager === 'pnpm' &&
-        this.rushConfiguration.pnpmOptions.pnpmStore === 'local'
-      ) {
-        // If the installation has failed even after the retries, then pnpm store may
-        // have got into a corrupted, irrecoverable state. Delete the store so that a
-        // future install can create the store afresh.
-        console.log(colors.yellow(`Deleting the "pnpm-store" folder`));
-        this.installRecycler.moveFolder(this.rushConfiguration.pnpmOptions.pnpmStorePath);
       }
-
-      throw error;
-    }
+    );
 
     if (this.rushConfiguration.packageManager === 'npm') {
       console.log('\n' + colors.bold('Running "npm shrinkwrap"...'));