From 1adfb9a5090086f1da66062f2b05788cabb4d33c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 9 Nov 2022 18:21:28 +0000 Subject: [PATCH] Temporarily prevents `task-kill` exceptions on Windows when it is passed a `pid` for a process that is already dead (#2842) Ref: #2811 Signed-off-by: Miki Signed-off-by: Miki (cherry picked from commit 4fd67de27eb1d942450ee8272d2de2bb8ef2f96c) Signed-off-by: github-actions[bot] # Conflicts: # CHANGELOG.md --- 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 7b11b4edbbc5..b4912d677359 100644 --- 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; }