From 0562dc54f45e28c8256e8ae543c606c8d8b95cee Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 11:27:46 -0800
Subject: [PATCH] Temporarily prevents `task-kill` exceptions on Windows when
 it is passed a `pid` for a process that is already dead (#2842) (#2970)

Ref: #2811

Signed-off-by: Miki <amoo_miki@yahoo.com>

Signed-off-by: Miki <amoo_miki@yahoo.com>
(cherry picked from commit 4fd67de27eb1d942450ee8272d2de2bb8ef2f96c)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 packages/osd-opensearch/src/cluster.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/osd-opensearch/src/cluster.js b/packages/osd-opensearch/src/cluster.js
index 2114867bcba4..dd8c2b6f86c7 100644
--- a/packages/osd-opensearch/src/cluster.js
+++ b/packages/osd-opensearch/src/cluster.js
@@ -244,7 +244,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;
   }