Temporarily prevents task-kill exceptions on Windows when it is pas…

…sed a `pid` for a process that is already dead (opensearch-project#2842) Ref: opensearch-project#2811 Signed-off-by: Miki <[email protected]> Signed-off-by: Miki <[email protected]> Signed-off-by: David Sinclair <[email protected]>
sikhote · Apr 24, 2023 · ddf200f · ddf200f
1 parent f441e1d
commit ddf200f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Change geckodriver version to make consistency ([#2772](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2772))
 - [Multi DataSource] Update default audit log path ([#2793](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2793))
 - [Table Visualization] Fix first column sort issue ([#2828](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2828))
+- Temporary workaround for task-kill exceptions on Windows when it is passed a pid for a process that is already dead ([#2842](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2842))
 
 ### 🚞 Infrastructure
 

diff --git a/packages/osd-opensearch/src/cluster.js b/packages/osd-opensearch/src/cluster.js
@@ -229,7 +229,22 @@ exports.Cluster = class Cluster {
       throw new Error('OpenSearch has not been started');
     }
 
-    await treeKillAsync(this._process.pid);
+    /* Temporary fix for https://github.com/opensearch-project/OpenSearch-Dashboards/issues/2811
+     *
+     * `tree-kill` behaves differently on Windows, where it throws if `pid` is already dead, when
+     * compared to other operating systems, where it silently returns.
+     */
+    try {
+      await treeKillAsync(this._process.pid);
+    } catch (ex) {
+      console.log('ex.message', ex.message);
+      if (
+        process.platform === 'win32' &&
+        !ex.message?.includes(`The process "${this._process.pid}" not found`)
+      ) {
+        throw ex;
+      }
+    }
 
     await this._outcome;
   }