From 55b482c654802285dea5fdc68894dde9571748e6 Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Tue, 1 Oct 2024 16:11:38 +0200 Subject: [PATCH 1/2] ci-fixes, on dumpLogs map before allSettled --- javascript/packages/orchestrator/src/network.ts | 9 +++++---- .../orchestrator/src/providers/k8s/kubeClient.ts | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/javascript/packages/orchestrator/src/network.ts b/javascript/packages/orchestrator/src/network.ts index bf437a33e..2185ba6c3 100644 --- a/javascript/packages/orchestrator/src/network.ts +++ b/javascript/packages/orchestrator/src/network.ts @@ -168,10 +168,11 @@ export class Network { [], ); - const dumpsPromises = this.relay.concat(paraNodes).map((node) => { - this.client.dumpLogs(this.tmpDir, node.name); - }); - await Promise.allSettled(dumpsPromises); + const dumpsNodes = this.relay.concat(paraNodes); + await Promise.allSettled(dumpsNodes.map((node) => { + this.client.dumpLogs(this.tmpDir, node.name); + }) + ); if (showLogPath) new CreateLogTable({ colWidths: [20, 100] }).pushToPrint([ diff --git a/javascript/packages/orchestrator/src/providers/k8s/kubeClient.ts b/javascript/packages/orchestrator/src/providers/k8s/kubeClient.ts index 5842584b4..f27d41258 100644 --- a/javascript/packages/orchestrator/src/providers/k8s/kubeClient.ts +++ b/javascript/packages/orchestrator/src/providers/k8s/kubeClient.ts @@ -750,6 +750,7 @@ export class KubeClient extends Client { // We should read it from host filesystem to ensure we are reading all the logs. // First get the logs files to check if we need to read from disk or not + debugLogs("getting logFiles for:", podName); const logFiles = await this.gzippedLogFiles(podName); debugLogs("logFiles", logFiles); let logs = ""; From 2559602bc756c496b78820df5b0f8e7f8f63f017 Mon Sep 17 00:00:00 2001 From: Javier Viola Date: Tue, 1 Oct 2024 16:18:28 +0200 Subject: [PATCH 2/2] lint --- javascript/packages/orchestrator/src/network.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/javascript/packages/orchestrator/src/network.ts b/javascript/packages/orchestrator/src/network.ts index 2185ba6c3..bfb0f8115 100644 --- a/javascript/packages/orchestrator/src/network.ts +++ b/javascript/packages/orchestrator/src/network.ts @@ -169,9 +169,10 @@ export class Network { ); const dumpsNodes = this.relay.concat(paraNodes); - await Promise.allSettled(dumpsNodes.map((node) => { + await Promise.allSettled( + dumpsNodes.map((node) => { this.client.dumpLogs(this.tmpDir, node.name); - }) + }), ); if (showLogPath)