Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…

…9.2.32 Signed-off-by: Gordon Smith <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
hpcc-systems · Oct 31, 2023 · e591533 · e591533
2 parents 9653194 + 986b595
commit e591533
Show file tree

Hide file tree

Showing 10 changed files with 303 additions and 306 deletions.
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -59,31 +59,3 @@ jobs:
         github_actor: ${{ secrets.LNB_ACTOR }}
         github_token: ${{ secrets.LNB_TOKEN }}
 
-  ln-builds:
-    needs: build
-    runs-on: ubuntu-20.04
-    if: github.repository == 'hpcc-systems/HPCC-Platform'
-    steps:
-    - name: Free additional disk space (remove Android SDK + Tools)
-      run: |
-        sudo rm -rf /usr/local/lib/android
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Build
-      uses: ./dockerfiles
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        ln_username: ${{ secrets.JFROG_USERNAME }}
-        ln_password: ${{ secrets.JFROG_PASSWORD }}
-        ln_registry: ${{ secrets.JFROG_REGISTRY }}
-        ln_docker_repo: ${{ secrets.JFROG_REPOSITORY }}
-        lnb_token: ${{ secrets.LNB_TOKEN }}
-        latest: 1   # this should only be set on the current minor branch
-        build_ln: 1
-        github_actor: ${{ secrets.LNB_ACTOR }}
-        github_token: ${{ secrets.LNB_TOKEN }}
-        sign_modules: 1
-        signing_secret: ${{ secrets.SIGNING_SECRET }}
-        signing_keyid: ${{ secrets.SIGNING_KEYID }}
-        signing_passphrase: ${{ secrets.SIGNING_PASSPHRASE }}
diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json
diff --git a/esp/src/package.json b/esp/src/package.json
@@ -39,21 +39,21 @@
     "@fluentui/react-experiments": "8.14.95",
     "@fluentui/react-hooks": "8.6.29",
     "@fluentui/react-icons-mdl2": "1.3.47",
-    "@hpcc-js/chart": "2.81.4",
-    "@hpcc-js/codemirror": "2.60.9",
-    "@hpcc-js/common": "2.71.9",
-    "@hpcc-js/comms": "2.83.2",
-    "@hpcc-js/dataflow": "8.1.4",
-    "@hpcc-js/eclwatch": "2.73.22",
-    "@hpcc-js/graph": "2.85.5",
-    "@hpcc-js/html": "2.42.10",
-    "@hpcc-js/layout": "2.49.9",
-    "@hpcc-js/map": "2.77.8",
-    "@hpcc-js/other": "2.15.9",
-    "@hpcc-js/phosphor": "2.16.9",
-    "@hpcc-js/react": "2.53.6",
-    "@hpcc-js/tree": "2.40.9",
-    "@hpcc-js/util": "2.50.3",
+    "@hpcc-js/chart": "2.81.7",
+    "@hpcc-js/codemirror": "2.60.12",
+    "@hpcc-js/common": "2.71.12",
+    "@hpcc-js/comms": "2.84.4",
+    "@hpcc-js/dataflow": "8.1.6",
+    "@hpcc-js/eclwatch": "2.73.27",
+    "@hpcc-js/graph": "2.85.8",
+    "@hpcc-js/html": "2.42.13",
+    "@hpcc-js/layout": "2.49.12",
+    "@hpcc-js/map": "2.77.11",
+    "@hpcc-js/other": "2.15.12",
+    "@hpcc-js/phosphor": "2.16.12",
+    "@hpcc-js/react": "2.53.9",
+    "@hpcc-js/tree": "2.40.12",
+    "@hpcc-js/util": "2.50.6",
     "@kubernetes/client-node": "0.18.1",
     "clipboard": "2.0.11",
     "d3-dsv": "3.0.1",

diff --git a/esp/src/src-react/components/DFUWorkunitDetails.tsx b/esp/src/src-react/components/DFUWorkunitDetails.tsx
@@ -47,8 +47,8 @@ export const DFUWorkunitDetails: React.FunctionComponent<DFUWorkunitDetailsProps
 
     React.useEffect(() => {
         if (!workunit) return;
-        workunit?.fetchXML().then(response => {
-            setWuXML(response.file);
+        workunit?.fetchXML().then(xml => {
+            setWuXML(xml);
         }).catch(err => logger.error(err));
     }, [workunit]);
 

diff --git a/esp/src/src-react/components/Logs.tsx b/esp/src/src-react/components/Logs.tsx
@@ -102,7 +102,7 @@ export const Logs: React.FunctionComponent<LogsProps> = ({
 
     const query = React.useMemo(() => {
         if (wuid !== undefined) {
-            filter.jobId = wuid;
+            filter.workunits = wuid;
         }
         if (typeof filter.StartDate === "string") {
             filter.StartDate = new Date(filter.StartDate);

diff --git a/esp/src/src-react/components/WorkunitDetails.tsx b/esp/src/src-react/components/WorkunitDetails.tsx
@@ -66,7 +66,7 @@ export const WorkunitDetails: React.FunctionComponent<WorkunitDetailsProps> = ({
             return response;
         }).then(hasLogAccess => {
             if (hasLogAccess) {
-                service.GetLogsEx({ ...queryParams, jobId: wuid, LogLineStartFrom: 0, LogLineLimit: 10 }).then(response => {    // HPCC-27711 - Requesting LogLineLimit=1 causes issues
+                service.GetLogsEx({ ...queryParams, workunits: wuid, LogLineStartFrom: 0, LogLineLimit: 10 }).then(response => {    // HPCC-27711 - Requesting LogLineLimit=1 causes issues
                     setLogCount(response.total);
                 }).catch((err) => logger.error(err));
             }

diff --git a/esp/src/src-react/components/forms/Fields.tsx b/esp/src/src-react/components/forms/Fields.tsx
@@ -902,6 +902,7 @@ export function createInputs(fields: Fields, onChange?: (id: string, newValue: a
                     label: field.label,
                     field: <input
                         key={fieldID}
+                        id={fieldID}
                         type="datetime-local"
                         name={fieldID}
                         defaultValue={field.value}
@@ -910,6 +911,10 @@ export function createInputs(fields: Fields, onChange?: (id: string, newValue: a
                         }}
                     />
                 });
+                const el = document.querySelector(`.ms-Modal.is-open #${fieldID}`);
+                if (el && field.value === "") {
+                    el["value"] = field.value;
+                }
                 break;
             case "link":
                 field.href = field.href;

diff --git a/esp/src/src-react/hooks/platform.ts b/esp/src/src-react/hooks/platform.ts
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { scopedLogger } from "@hpcc-js/util";
-import { Topology, TpLogicalClusterQuery } from "@hpcc-js/comms";
+import { Topology, WsTopology } from "@hpcc-js/comms";
 import { getBuildInfo, BuildInfo } from "src/Session";
 import { cmake_build_type, containerized } from "src/BuildInfo";
 
@@ -33,19 +33,19 @@ export function useBuildInfo(): [BuildInfo, { isContainer: boolean, currencyCode
     return [buildInfo, { isContainer, currencyCode, opsCategory }];
 }
 
-export function useLogicalClusters(): [TpLogicalClusterQuery.TpLogicalCluster[] | undefined, TpLogicalClusterQuery.TpLogicalCluster | undefined] {
-    const [targetClusters, setTargetClusters] = React.useState<TpLogicalClusterQuery.TpLogicalCluster[]>();
-    const [defaultCluster, setDefaultCluster] = React.useState<TpLogicalClusterQuery.TpLogicalCluster>();
+export function useLogicalClusters(): [WsTopology.TpLogicalCluster[] | undefined, WsTopology.TpLogicalCluster | undefined] {
+    const [targetClusters, setTargetClusters] = React.useState<WsTopology.TpLogicalCluster[]>();
+    const [defaultCluster, setDefaultCluster] = React.useState<WsTopology.TpLogicalCluster>();
 
     React.useEffect(() => {
         const topology = Topology.attach({ baseUrl: "" });
         let active = true;
         topology.fetchLogicalClusters().then(response => {
             if (active) {
                 setTargetClusters(response);
-                let firstRow: TpLogicalClusterQuery.TpLogicalCluster;
-                let firstHThor: TpLogicalClusterQuery.TpLogicalCluster;
-                let firstThor: TpLogicalClusterQuery.TpLogicalCluster;
+                let firstRow: WsTopology.TpLogicalCluster;
+                let firstHThor: WsTopology.TpLogicalCluster;
+                let firstThor: WsTopology.TpLogicalCluster;
                 response.forEach(row => {
                     if (firstRow === undefined) {
                         firstRow = row;

diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
@@ -520,9 +520,9 @@ Pass in dict with root, planeName
 {{- range $plane := $planes -}}
  {{- if (eq $plane.name $name) -}}
   {{- if $plane.subPath -}}
-   {{- printf "%s/%s" $plane.prefix $plane.subPath | quote -}}
+   {{- printf "%s/%s" $plane.prefix $plane.subPath -}}
   {{- else -}}
-   {{- $plane.prefix | quote -}}
+   {{- $plane.prefix -}}
   {{- end -}}
  {{- end -}}
 {{- end -}}
@@ -2206,7 +2206,7 @@ global.noResourceValidation flag.  This behavior can be overridden by the caller
 A template to output a merged environment. Pass in a list with global then local environments. Only the last specified value for each named environment variable will be output
 */}}
 {{- define "hpcc.mergeEnvironments" -}}
-{{- $result := dict "MALLOC_ARENA_MAX" "8" -}}{{- /* HPCC arena default, can be overriden by component config */ -}}
+{{- $result := dict "MALLOC_ARENA_MAX" 8 -}}{{- /* HPCC arena default, can be overriden by component config */ -}}
 {{- range . -}}
  {{- $_ := set $result .name .value -}}
 {{- end -}}

diff --git a/thorlcr/master/mawatchdog.hpp b/thorlcr/master/mawatchdog.hpp
@@ -31,7 +31,7 @@ class CMasterWatchdogBase : public CSimpleInterface, implements IThreaded
     PointerArray state;
     SocketEndpoint master;
     Mutex mutex;
-    int retrycount;
+    int retrycount = 0;
     CThreaded threaded;
 protected:
     bool stopped;