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

…9.4.x

.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 }}

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.6",
-    "@hpcc-js/codemirror": "2.60.11",
-    "@hpcc-js/common": "2.71.11",
-    "@hpcc-js/comms": "2.84.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.26",
-    "@hpcc-js/graph": "2.85.7",
-    "@hpcc-js/html": "2.42.12",
-    "@hpcc-js/layout": "2.49.11",
-    "@hpcc-js/map": "2.77.10",
-    "@hpcc-js/other": "2.15.11",
-    "@hpcc-js/phosphor": "2.16.11",
-    "@hpcc-js/react": "2.53.8",
-    "@hpcc-js/tree": "2.40.11",
-    "@hpcc-js/util": "2.50.5",
+    "@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",

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]);
 

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);

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));
             }

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;

helm/hpcc/templates/_helpers.tpl

@@ -325,9 +325,31 @@ Add ConfigMap volume for a component
     name: {{ .name }}-configmap
 {{- end -}}
 
+{{/*
+Get mount details
+Pass in plane
+Returns dictionary with "results" of mount details
+*/}}
+{{- define "hpcc.getMountDetails" -}}
+{{- $plane := .plane -}}
+{{- $mountPath := $plane.prefix -}}
+{{- $numMounts := int ( $plane.numMounts | default $plane.numDevices | default 1 ) -}}
+{{- $mountDetails := list -}}
+{{- if le $numMounts 1 -}}
+ {{- $mountDetails = append $mountDetails (dict "name" (lower (printf "%s-volume" $plane.name)) "path" $mountPath) -}}
+{{- else -}}
+ {{- range $elem := untilStep 1 (int (add $numMounts 1)) 1 -}}
+  {{- $name := lower (printf "%s-volume-many-%d" $plane.name $elem) -}}
+  {{- $path := printf "%s/d%d" $mountPath $elem -}}
+  {{- $mountDetails = append $mountDetails (dict "name" $name "path" $path) -}}
+ {{- end -}}
+{{- end -}}
+{{- $_ := set . "results" $mountDetails -}}
+{{- end -}}
+
 {{/*
 Add volume mounts
-Pass in root, me (the component), includeCategories (optional) and/or includeNames (optional), container identifier (optional)
+Pass in root, me (the component), includeCategories (optional) and/or includeNames (optional)
 Note: if there are multiple planes (other than dll, dali and spill planes), they should be all called with a single call
 to addVolumeMounts so that if a plane can be used for multiple purposes then duplicate volume mounts are not created.
 */}}
@@ -339,7 +361,6 @@ to addVolumeMounts so that if a plane can be used for multiple purposes then dup
 {{- $includeNames := .includeNames | default list -}}
 {{- $component := .me -}}
 {{- $previousMounts := dict -}}
-{{- $id := .id | default "" -}}
 {{- range $plane := $planes -}}
  {{- if not $plane.disabled }}
   {{- $componentMatches := or (not (hasKey $plane "components")) (has $component.name $plane.components) -}}
@@ -349,24 +370,19 @@ to addVolumeMounts so that if a plane can be used for multiple purposes then dup
     {{- if not (hasKey $previousMounts $plane.prefix) }}
      {{- $mountPath := $plane.prefix }}
      {{- $numMounts := int ( $plane.numMounts | default $plane.numDevices | default 1 ) }}
-     {{- if le $numMounts 1 }}
-- name: {{ lower $plane.name }}-volume
-  mountPath: {{ $mountPath | quote }}
-     {{- else }}
-      {{- range $elem := untilStep 1 (int (add $numMounts 1)) 1 }}
-- name: {{ lower $plane.name }}-volume-many-{{ $elem }}
-  mountPath: {{ printf "%s/d%d" $mountPath $elem | quote }}
-      {{- end }}
+     {{- $mountDetails := dict "plane" $plane }}
+     {{- include "hpcc.getMountDetails" $mountDetails }}
+     {{- range $elem := untilStep 1 (int (add $numMounts 1)) 1 }}
+      {{- $multiMountDetails := index $mountDetails.results (sub $elem 1) }}
+- name: {{ $multiMountDetails.name }}
+  mountPath: {{ $multiMountDetails.path | quote }}
      {{- end }}
     {{- end }}
     {{- $_ := set $previousMounts $plane.prefix true -}}
    {{- else if $plane.hostPath }}
     {{- if not (hasKey $previousMounts $plane.prefix) }}
 - name: {{ lower $plane.name }}-volume
   mountPath: {{ $plane.prefix | quote }}
-     {{- if $id }}
-  subPath: {{ printf "%s-%s" $component.name $id }}
-     {{- end }}
     {{- end }}
    {{- end }}
 
@@ -504,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 -}}
@@ -895,13 +911,22 @@ A kludge to ensure mounted storage (e.g. for nfs, minikube or docker for desktop
 {{- $permCmd := "" -}}
 {{- $uid := .uid -}}
 {{- $gid := .gid -}}
-{{- range $index, $volume := .volumes }}
- {{- if ne $index 0 }}
-  {{- $permCmd = printf "%s & " $permCmd -}}
- {{- end -}}
- {{- $permCmd = printf "%s(chown -R %v:%v %s || true)" $permCmd $uid $gid $volume.path }}
+{{- $component := .component -}}
+{{- $volumeNames := list -}}
+{{- $count := 0 -}}
+{{- range $plane := .planes }}
+ {{- $volumeNames = append $volumeNames $plane.name }}
+ {{- $mountDetails := dict "plane" $plane }}
+ {{- include "hpcc.getMountDetails" $mountDetails }}
+ {{- range $result := $mountDetails.results }}
+  {{- if ne $count 0 }}
+   {{- $permCmd = printf "%s & " $permCmd -}}
+  {{- end -}}
+  {{- $permCmd = printf "%s(chown -R %v:%v %s || true)" $permCmd $uid $gid $result.path }}
+  {{- $count = add $count 1 }}
+ {{- end }}
 {{- end }}
-{{- if gt (len .volumes) 1 -}}
+{{- if gt $count 1 -}}
  {{- $permCmd = printf "%s; wait" $permCmd -}}
 {{- end }}
 - name: volume-mount-hack
@@ -912,10 +937,7 @@ A kludge to ensure mounted storage (e.g. for nfs, minikube or docker for desktop
              "{{ $permCmd }}"
            ]
   volumeMounts:
-{{- range $volume := .volumes }}
-    - name: {{ $volume.name | quote}}
-      mountPath: {{ $volume.path | quote }}
-{{- end }}
+{{ include "hpcc.addVolumeMounts" (dict "root" .root "component" $component "includeNames" $volumeNames) | indent 2 }}
 {{- end }}
 
 
@@ -958,11 +980,7 @@ NB: uid=10000 and gid=10001 are the uid/gid of the hpcc user, built into platfor
 {{- end -}}
 {{- $volumes := list -}}
 {{- if len $planesToChown -}}
- {{- range $plane := $planesToChown -}}
-  {{- $volumeName := (printf "%s-volume" $plane.name) -}}
-  {{- $volumes = append $volumes (dict "name" $volumeName "path" $plane.prefix) -}}
- {{- end -}}
- {{- include "hpcc.changeMountPerms" (dict "root" $root "uid" $uid "gid" $gid "volumes" $volumes) | nindent 0 }}
+ {{- include "hpcc.changeMountPerms" (dict "root" $root "component" $component "uid" $uid "gid" $gid "planes" $planesToChown) | nindent 0 }}
 {{- end -}}
 {{- include "hpcc.configContainer" . | nindent 0 -}}
 {{- end -}}
@@ -2394,7 +2412,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 -}}

helm/hpcc/templates/thor.yaml

@@ -255,7 +255,7 @@ data:
             workingDir: /var/lib/HPCCSystems
             volumeMounts:
 {{ include "hpcc.addConfigMapVolumeMount" $configCtx.me | indent 12 }}
-{{ include "hpcc.addVolumeMounts" (deepCopy $configCtx | merge (dict "id" (toString $containerNum))) | indent 12 }}
+{{ include "hpcc.addVolumeMounts" $configCtx | indent 12 }}
 {{ include "hpcc.addSecretVolumeMounts" $configCtx | indent 12 }}
 {{ include "hpcc.addVaultClientCertificateVolumeMounts" $configCtx | indent 12 }}
 {{ include "hpcc.addCertificateVolumeMount" (dict "root" $configCtx.root "name" $configCtx.me.name "component" "thorworker" "includeRemote" true) | indent 12 }}

thorlcr/master/mawatchdog.hpp

@@ -31,7 +31,7 @@ class CMasterWatchdog : public CSimpleInterface, implements IThreaded
     PointerArray state;
     SocketEndpoint master;
     Mutex mutex;
-    int retrycount;
+    int retrycount = 0;
     CThreaded threaded;
 protected:
     bool stopped;