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

…9.6.x

Signed-off-by: Gavin Halliday <[email protected]>

esp/src/src-react/components/LogViewer.tsx

@@ -49,7 +49,7 @@ export const LogViewer: React.FunctionComponent<LogViewerProps> = ({
                 csvFormatter: level => Level[level].toUpperCase()
             },
             id: { label: nlsHPCC.Source, width: 212, sortable: false },
-            message: { label: nlsHPCC.Message, sortable: false }
+            message: { label: nlsHPCC.Message, width: 720, sortable: false }
         };
     }, []);
 

helm/hpcc/templates/_helpers.tpl

@@ -1476,6 +1476,10 @@ Pass in dict with .root, .visibility defined
 {{- end -}}
 {{- end -}}
 
+{{- define "hpcc.generateHelmVersion" -}}
+helmVersion: 9.6.35-closedown0
+{{- end -}}
+
 {{/*
 A template to generate a service
 Pass in dict with .root, .name, .service, .defaultPort, .selector defined
@@ -1523,7 +1527,7 @@ kind: Service
 metadata:
   name: {{ $lvars.serviceName | quote }}
   labels:
-    helmVersion: 9.6.35-closedown0
+    {{- include "hpcc.generateHelmVersion" . | nindent 4 }}
     {{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }}
 {{- if $lvars.labels }}
 {{ toYaml $lvars.labels | indent 4 }}

helm/hpcc/templates/dafilesrv.yaml

@@ -51,7 +51,7 @@ spec:
       labels:
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }}
         server: {{ .name | quote }}
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
       annotations:
         checksum/config: {{ $configSHA }}
         {{- include "hpcc.generateAnnotations" $commonCtx | indent 8 }}

helm/hpcc/templates/dali.yaml

@@ -89,7 +89,7 @@ spec:
         run: {{ $dali.name | quote }}
         server: {{ $dali.name | quote }}
         app: dali
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }}
 {{- end }}

helm/hpcc/templates/dfuserver.yaml

@@ -57,7 +57,7 @@ spec:
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }}
         run: {{ .name | quote }}
         accessDali: "yes"
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}

helm/hpcc/templates/eclagent.yaml

@@ -62,7 +62,7 @@ data:
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" $apptype "name" "eclagent" "instance" $appJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }}
             accessDali: "yes"
             accessEsp: "yes"
-            helmVersion: 9.6.35-closedown0
+            {{- include "hpcc.generateHelmVersion" . | nindent 12 }}
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
 {{- end }}
@@ -139,7 +139,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}

helm/hpcc/templates/eclccserver.yaml

@@ -62,7 +62,7 @@ data:
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclccserver" "name" "eclccserver" "instance" $compileJobName "instanceOf" (printf "%s-job" .me.name)) | indent 12 }}
             accessDali: "yes"
             accessEsp: "yes"
-            helmVersion: 9.6.35-closedown0
+            {{- include "hpcc.generateHelmVersion" . | nindent 12 }}
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
 {{- end }}
@@ -147,7 +147,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }}
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}

helm/hpcc/templates/eclscheduler.yaml

@@ -65,7 +65,7 @@ spec:
         run: {{ .name | quote }}
         accessDali: "yes"
         accessEsp: "no"
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}
 {{- end }}

helm/hpcc/templates/esp.yaml

@@ -125,7 +125,7 @@ spec:
         accessSasha: "yes"
 {{- end }}
         app: {{ $application }}
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "name" $application "component" "esp" "instance" .name) | indent 8 }}
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }}

helm/hpcc/templates/localroxie.yaml

@@ -73,7 +73,7 @@ spec:
         server: {{ $servername | quote }}
         accessDali: "yes"
         accessEsp: "yes"
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }}
 {{- if hasKey . "labels" }}
 {{ toYaml .labels | indent 8 }}

helm/hpcc/templates/roxie.yaml

@@ -125,7 +125,7 @@ spec:
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 8 }}
         run: {{ $commonCtx.toponame | quote }}
         roxie-cluster: {{ $roxie.name | quote }}
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel"  $.Values.global.metrics | nindent 8}}
 {{- end }}
@@ -182,7 +182,7 @@ kind: Service
 metadata:
   name: {{ $commonCtx.toponame | quote }}
   labels:
-    helmVersion: 9.6.35-closedown0
+    {{- include "hpcc.generateHelmVersion" . | nindent 4 }}
     {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }}
 spec:
   ports:
@@ -244,7 +244,7 @@ spec:
         roxie-cluster: {{ $roxie.name | quote }}
         accessDali: "yes"
         accessEsp: "yes"
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $servername) | indent 8 }}
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
@@ -352,7 +352,7 @@ spec:
         roxie-cluster: {{ $roxie.name | quote }}
         accessDali: "yes"
         accessEsp: "yes"
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
 {{- if hasKey $.Values.global "metrics" }}
  {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}}
 {{- end }}

helm/hpcc/templates/sasha.yaml

@@ -53,7 +53,7 @@ spec:
         server: {{ $serviceName | quote }}
         app: sasha
         accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }}
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
 {{- if hasKey $sasha "labels" }}
 {{ toYaml $sasha.labels | indent 8 }}
 {{- end }}

helm/hpcc/templates/thor.yaml

@@ -88,7 +88,7 @@ data:
           labels:
             accessDali: "yes"
             accessEsp: "yes"
-            helmVersion: 9.6.35-closedown0
+            {{- include "hpcc.generateHelmVersion" . | nindent 12 }}
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $eclAgentJobName "instanceOf" (printf "%s-job" .eclAgentName)) | indent 8 }}
 {{- if hasKey .me "labels" }}
 {{ toYaml .me.labels | indent 12 }}
@@ -153,7 +153,7 @@ data:
             accessEsp: "yes"
             app: "thor"
             component: "thormanager"
-            helmVersion: 9.6.35-closedown0
+            {{- include "hpcc.generateHelmVersion" . | nindent 12 }}
             instance: "_HPCC_JOBNAME_"
             job: "_HPCC_JOBNAME_"
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thormanager" "name" "thor" "instance" $thorManagerJobName "instanceOf" (printf "%s-thormanager-job" .me.name)) | indent 12 }}
@@ -220,7 +220,7 @@ data:
             accessEsp: "yes"
             app: "thor"
             component: "thorworker"
-            helmVersion: 9.6.35-closedown0
+            {{- include "hpcc.generateHelmVersion" . | nindent 12 }}
             instance: "_HPCC_JOBNAME_"
             job: "_HPCC_JOBNAME_"
             {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "thorworker" "name" "thor" "instance" $thorWorkerJobName "instanceOf" (printf "%s-thorworker-job" .me.name)) | indent 12 }}
@@ -353,7 +353,7 @@ spec:
         accessEsp: {{ $commonCtx.eclAgentUseChildProcesses | ternary "yes" "no" | quote }}
         app: "thor"
         component: "thor-eclagent"
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
         instance: {{ $commonCtx.eclAgentName | quote }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.eclAgentName ) | indent 8 }}
 {{- if hasKey $commonCtx.me "labels" }}
@@ -418,7 +418,7 @@ spec:
         accessEsp: "no"
         app: "thor"
         component: "thor-thoragent"
-        helmVersion: 9.6.35-closedown0
+        {{- include "hpcc.generateHelmVersion" . | nindent 8 }}
         instance: {{ $commonCtx.thorAgentName | quote }}
         {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }}
 {{- if hasKey $commonCtx.me "labels" }}

system/mp/mpcomm.cpp

@@ -2498,7 +2498,7 @@ bool CMPConnectThread::handleAcceptedSocket(ISocket *_sock, unsigned timeoutMs,
 #endif
         checkSelfDestruct(&connectHdr.id[0],sizeof(connectHdr.id));
         Owned<CMPChannel> channel = parent->lookup(_remoteep);
-        if (!channel->attachSocket(sock.getClear(),_remoteep,hostep,false,&rd,addrval))
+        if (!channel->attachSocket(sock,_remoteep,hostep,false,&rd,addrval))
         {
 #ifdef _FULLTRACE       
             PROGLOG("MP Connect Thread: lookup failed");