From 4c7085d5b895def78c98c1d38d91dc1ec5b67ae2 Mon Sep 17 00:00:00 2001 From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com> Date: Thu, 16 Nov 2023 13:13:04 -0500 Subject: [PATCH 1/8] HPCC-30777 ECL Watch v9 add missing TotalClusterTime to WU Summary Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com> --- esp/src/package-lock.json | 8 ++++---- esp/src/package.json | 2 +- esp/src/src-react/hooks/workunit.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/esp/src/package-lock.json b/esp/src/package-lock.json index 77fb9cfbc06..2d17e26a187 100644 --- a/esp/src/package-lock.json +++ b/esp/src/package-lock.json @@ -17,7 +17,7 @@ "@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/comms": "2.85.0", "@hpcc-js/dataflow": "8.1.6", "@hpcc-js/eclwatch": "2.73.27", "@hpcc-js/graph": "2.85.8", @@ -1577,9 +1577,9 @@ } }, "node_modules/@hpcc-js/comms": { - "version": "2.84.4", - "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.84.4.tgz", - "integrity": "sha512-GkKUyttPRYPb/jluoNtxY6jEqJhF2Dr0srzXrF+Vs0biyr4GvwQzMcoQfU97PQl7PJx8M+FUquMchfuQ7sqSWA==", + "version": "2.85.0", + "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.85.0.tgz", + "integrity": "sha512-ZnvI7T35qyj6Dm1uT7f+j1Xgq0QGPyMAypGq8jacq2VAo2Q24eg/AL57E8PBLOM1Q0UAV/WYJqz4eTk9n+UwgQ==", "dependencies": { "@hpcc-js/ddl-shim": "^2.20.6", "@hpcc-js/util": "^2.50.6", diff --git a/esp/src/package.json b/esp/src/package.json index ef77a32ff76..6df836b8b9d 100644 --- a/esp/src/package.json +++ b/esp/src/package.json @@ -42,7 +42,7 @@ "@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/comms": "2.85.0", "@hpcc-js/dataflow": "8.1.6", "@hpcc-js/eclwatch": "2.73.27", "@hpcc-js/graph": "2.85.8", diff --git a/esp/src/src-react/hooks/workunit.ts b/esp/src/src-react/hooks/workunit.ts index 783061de755..9b331369fbc 100644 --- a/esp/src/src-react/hooks/workunit.ts +++ b/esp/src/src-react/hooks/workunit.ts @@ -23,7 +23,7 @@ export function useWorkunit(wuid: string, full: boolean = false): [Workunit, WUS let active = true; let handle; const refresh = singletonDebounce(wu, "refresh"); - refresh(full) + refresh(full, { IncludeTotalClusterTime: true }) .then(() => { if (active) { setRetVal({ workunit: wu, state: wu.StateID, lastUpdate: Date.now(), isComplete: wu.isComplete(), refresh }); From 1be8e2d6cb8de8e95e83c3bc5e7cac7b5a88133a Mon Sep 17 00:00:00 2001 From: wangkx Date: Thu, 16 Nov 2023 14:24:07 -0500 Subject: [PATCH 2/8] HPCC-30685 HPCC-30685 Report State always for Scheduled ECL WUs Without this fix, the WU state is displayed inside the ECLWatch Event Scheduler tab only when a state filter is set inside the tab. Signed-off-by: wangkx --- .../ws_workunits/ws_workunitsService.cpp | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/esp/services/ws_workunits/ws_workunitsService.cpp b/esp/services/ws_workunits/ws_workunitsService.cpp index 0f5efa8f24b..3450b185109 100644 --- a/esp/services/ws_workunits/ws_workunitsService.cpp +++ b/esp/services/ws_workunits/ws_workunitsService.cpp @@ -3626,6 +3626,16 @@ void getScheduledWUs(IEspContext &context, WUShowScheduledFilters *filters, cons { jobName.set(cw->queryJobName()); owner.set(cw->queryUser()); + if ((cw->getState() == WUStateScheduled) && cw->aborting()) + { + stateID = WUStateAborting; + state.set("aborting"); + } + else + { + stateID = cw->getState(); + state.set(cw->queryStateDesc()); + } } if (!filters->jobName.isEmpty() && (jobName.isEmpty() || !WildMatch(jobName.str(), filters->jobName, true))) @@ -3634,26 +3644,8 @@ void getScheduledWUs(IEspContext &context, WUShowScheduledFilters *filters, cons match = false; else if (!filters->eventText.isEmpty() && (ieventText.isEmpty() || !WildMatch(ieventText, filters->eventText, true))) match = false; - else if (!filters->state.isEmpty()) - { - if (!cw) - match = false; - else - { - if ((cw->getState() == WUStateScheduled) && cw->aborting()) - { - stateID = WUStateAborting; - state.set("aborting"); - } - else - { - stateID = cw->getState(); - state.set(cw->queryStateDesc()); - } - if (!strieq(filters->state, state.str())) - match = false; - } - } + else if (!filters->state.isEmpty() && !strisame(filters->state, state.str())) + match = false; } catch (IException *e) { From 6eea4ca1ab74b380ee59ebf0decab67e4bef9473 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 17 Nov 2023 11:23:44 +0000 Subject: [PATCH 3/8] Split off 8.10.66 Signed-off-by: Jake Smith --- helm/hpcc/Chart.yaml | 4 ++-- helm/hpcc/templates/_helpers.tpl | 2 +- helm/hpcc/templates/dafilesrv.yaml | 2 +- helm/hpcc/templates/dali.yaml | 2 +- helm/hpcc/templates/dfuserver.yaml | 2 +- helm/hpcc/templates/eclagent.yaml | 4 ++-- helm/hpcc/templates/eclccserver.yaml | 4 ++-- helm/hpcc/templates/eclscheduler.yaml | 2 +- helm/hpcc/templates/esp.yaml | 2 +- helm/hpcc/templates/localroxie.yaml | 2 +- helm/hpcc/templates/roxie.yaml | 8 ++++---- helm/hpcc/templates/sasha.yaml | 2 +- helm/hpcc/templates/thor.yaml | 10 +++++----- version.cmake | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index 0598d9d6e8f..6778d9b6194 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 8.10.65-closedown0 +version: 8.10.67-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 8.10.65-closedown0 +appVersion: 8.10.67-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index 1cb56ed2bad..df2b93e61d5 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1208,7 +1208,7 @@ kind: Service metadata: name: {{ $lvars.serviceName | quote }} labels: - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }} {{- if $lvars.labels }} {{ toYaml $lvars.labels | indent 4 }} diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml index d3d7793c01d..1a716392fb3 100644 --- a/helm/hpcc/templates/dafilesrv.yaml +++ b/helm/hpcc/templates/dafilesrv.yaml @@ -50,7 +50,7 @@ spec: labels: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }} server: {{ .name | quote }} - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 annotations: checksum/config: {{ $configSHA }} spec: diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml index 4d11f5b9b4c..d351bb6c9c3 100644 --- a/helm/hpcc/templates/dali.yaml +++ b/helm/hpcc/templates/dali.yaml @@ -81,7 +81,7 @@ spec: run: {{ $dali.name | quote }} server: {{ $dali.name | quote }} app: dali - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} {{- end }} diff --git a/helm/hpcc/templates/dfuserver.yaml b/helm/hpcc/templates/dfuserver.yaml index 228b7243926..e1fe83eee0f 100644 --- a/helm/hpcc/templates/dfuserver.yaml +++ b/helm/hpcc/templates/dfuserver.yaml @@ -56,7 +56,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }} run: {{ .name | quote }} accessDali: "yes" - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml index a82404c56b2..97d528ff667 100644 --- a/helm/hpcc/templates/eclagent.yaml +++ b/helm/hpcc/templates/eclagent.yaml @@ -58,7 +58,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: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -137,7 +137,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml index c2730b3d562..3640b3dd055 100644 --- a/helm/hpcc/templates/eclccserver.yaml +++ b/helm/hpcc/templates/eclccserver.yaml @@ -57,7 +57,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: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -142,7 +142,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml index 753e23a02ea..fef0cd9a0f8 100644 --- a/helm/hpcc/templates/eclscheduler.yaml +++ b/helm/hpcc/templates/eclscheduler.yaml @@ -64,7 +64,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: "no" - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml index 102b7bd6739..52c7d16ae88 100644 --- a/helm/hpcc/templates/esp.yaml +++ b/helm/hpcc/templates/esp.yaml @@ -116,7 +116,7 @@ spec: server: {{ .name | quote }} accessDali: "yes" app: {{ $application }} - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- 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 }} diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml index 055451c74b4..4f9723720a1 100644 --- a/helm/hpcc/templates/localroxie.yaml +++ b/helm/hpcc/templates/localroxie.yaml @@ -70,7 +70,7 @@ spec: server: {{ $servername | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml index f005bcbcf38..a274643e164 100644 --- a/helm/hpcc/templates/roxie.yaml +++ b/helm/hpcc/templates/roxie.yaml @@ -118,7 +118,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: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} @@ -178,7 +178,7 @@ kind: Service metadata: name: {{ $commonCtx.toponame | quote }} labels: - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }} spec: ports: @@ -240,7 +240,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- 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}} @@ -343,7 +343,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} diff --git a/helm/hpcc/templates/sasha.yaml b/helm/hpcc/templates/sasha.yaml index eec4ca49f7e..342ec5a5e08 100644 --- a/helm/hpcc/templates/sasha.yaml +++ b/helm/hpcc/templates/sasha.yaml @@ -52,7 +52,7 @@ spec: run: {{ $serviceName | quote }} server: {{ $serviceName | quote }} accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }} - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- if hasKey $sasha "labels" }} {{ toYaml $sasha.labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml index 2994349984a..c886547b315 100644 --- a/helm/hpcc/templates/thor.yaml +++ b/helm/hpcc/templates/thor.yaml @@ -82,7 +82,7 @@ data: labels: accessDali: "yes" accessEsp: "yes" - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 {{- 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 }} @@ -149,7 +149,7 @@ data: accessEsp: "yes" app: "thor" component: "thormanager" - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 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 }} @@ -218,7 +218,7 @@ data: accessEsp: "yes" app: "thor" component: "thorworker" - helmVersion: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 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: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 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: 8.10.65-closedown0 + helmVersion: 8.10.67-closedown0 instance: {{ $commonCtx.thorAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} diff --git a/version.cmake b/version.cmake index 82b6e10ff62..f8e2039a0e5 100644 --- a/version.cmake +++ b/version.cmake @@ -5,7 +5,7 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 10 ) -set ( HPCC_POINT 65 ) +set ( HPCC_POINT 67 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) ### From 607df4efa138209f1d2785b298f1b66be2e96c55 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Fri, 17 Nov 2023 11:27:20 +0000 Subject: [PATCH 4/8] Split off 8.12.70 Signed-off-by: Jake Smith --- helm/hpcc/Chart.yaml | 4 ++-- helm/hpcc/templates/_helpers.tpl | 2 +- helm/hpcc/templates/dafilesrv.yaml | 2 +- helm/hpcc/templates/dali.yaml | 2 +- helm/hpcc/templates/dfuserver.yaml | 2 +- helm/hpcc/templates/eclagent.yaml | 4 ++-- helm/hpcc/templates/eclccserver.yaml | 4 ++-- helm/hpcc/templates/eclscheduler.yaml | 2 +- helm/hpcc/templates/esp.yaml | 2 +- helm/hpcc/templates/localroxie.yaml | 2 +- helm/hpcc/templates/roxie.yaml | 8 ++++---- helm/hpcc/templates/sasha.yaml | 2 +- helm/hpcc/templates/thor.yaml | 10 +++++----- version.cmake | 4 ++-- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/helm/hpcc/Chart.yaml b/helm/hpcc/Chart.yaml index c06cbcfbdcf..eb812c72a62 100644 --- a/helm/hpcc/Chart.yaml +++ b/helm/hpcc/Chart.yaml @@ -6,9 +6,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 8.12.69-closedown0 +version: 8.12.71-closedown0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 8.12.69-closedown0 +appVersion: 8.12.71-closedown0 diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl index 08e3ae178de..e82a832f9b4 100644 --- a/helm/hpcc/templates/_helpers.tpl +++ b/helm/hpcc/templates/_helpers.tpl @@ -1240,7 +1240,7 @@ kind: Service metadata: name: {{ $lvars.serviceName | quote }} labels: - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $.root "instance" $lvars.serviceName ) | indent 4 }} {{- if $lvars.labels }} {{ toYaml $lvars.labels | indent 4 }} diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml index 9a29a5c2e8f..3d3d7073547 100644 --- a/helm/hpcc/templates/dafilesrv.yaml +++ b/helm/hpcc/templates/dafilesrv.yaml @@ -50,7 +50,7 @@ spec: labels: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dafilesrv" "name" "dafilesrv" "instance" .name) | indent 8 }} server: {{ .name | quote }} - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 annotations: checksum/config: {{ $configSHA }} spec: diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml index 85de10b6726..6655615858d 100644 --- a/helm/hpcc/templates/dali.yaml +++ b/helm/hpcc/templates/dali.yaml @@ -82,7 +82,7 @@ spec: run: {{ $dali.name | quote }} server: {{ $dali.name | quote }} app: dali - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8 }} {{- end }} diff --git a/helm/hpcc/templates/dfuserver.yaml b/helm/hpcc/templates/dfuserver.yaml index eaa6e638b6a..dfa31da5fc5 100644 --- a/helm/hpcc/templates/dfuserver.yaml +++ b/helm/hpcc/templates/dfuserver.yaml @@ -56,7 +56,7 @@ spec: {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "dfuserver" "name" "dfuserver" "instance" .name) | indent 8 }} run: {{ .name | quote }} accessDali: "yes" - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml index 38654d09e98..63a9f338a46 100644 --- a/helm/hpcc/templates/eclagent.yaml +++ b/helm/hpcc/templates/eclagent.yaml @@ -58,7 +58,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: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -137,7 +137,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml index a53f00ff780..dc37b864583 100644 --- a/helm/hpcc/templates/eclccserver.yaml +++ b/helm/hpcc/templates/eclccserver.yaml @@ -57,7 +57,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: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey .me "labels" }} {{ toYaml .me.labels | indent 12 }} {{- end }} @@ -142,7 +142,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: {{ .useChildProcesses | default false | ternary "yes" "no" | quote }} - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml index 318f8906312..63d27d164f1 100644 --- a/helm/hpcc/templates/eclscheduler.yaml +++ b/helm/hpcc/templates/eclscheduler.yaml @@ -64,7 +64,7 @@ spec: run: {{ .name | quote }} accessDali: "yes" accessEsp: "no" - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml index 0d3dd8db618..9094bf0a2a4 100644 --- a/helm/hpcc/templates/esp.yaml +++ b/helm/hpcc/templates/esp.yaml @@ -117,7 +117,7 @@ spec: server: {{ .name | quote }} accessDali: "yes" app: {{ $application }} - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- 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 }} diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml index 75f175adc94..a672ee1cbaa 100644 --- a/helm/hpcc/templates/localroxie.yaml +++ b/helm/hpcc/templates/localroxie.yaml @@ -70,7 +70,7 @@ spec: server: {{ $servername | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "roxie-server" "name" "roxie" "instance" $roxie.name) | indent 8 }} {{- if hasKey . "labels" }} {{ toYaml .labels | indent 8 }} diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml index 0e7830ba79e..b2e8a83cc94 100644 --- a/helm/hpcc/templates/roxie.yaml +++ b/helm/hpcc/templates/roxie.yaml @@ -120,7 +120,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: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} @@ -180,7 +180,7 @@ kind: Service metadata: name: {{ $commonCtx.toponame | quote }} labels: - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "topology-server" "name" "roxie" "instance" $commonCtx.toponame) | indent 4 }} spec: ports: @@ -242,7 +242,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- 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}} @@ -347,7 +347,7 @@ spec: roxie-cluster: {{ $roxie.name | quote }} accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey $.Values.global "metrics" }} {{- include "hpcc.generateMetricsReporterLabel" $.Values.global.metrics | nindent 8}} {{- end }} diff --git a/helm/hpcc/templates/sasha.yaml b/helm/hpcc/templates/sasha.yaml index a49b06454c4..3a911713542 100644 --- a/helm/hpcc/templates/sasha.yaml +++ b/helm/hpcc/templates/sasha.yaml @@ -52,7 +52,7 @@ spec: run: {{ $serviceName | quote }} server: {{ $serviceName | quote }} accessDali: {{ (has "dali" $sasha.access) | ternary "yes" "no" | quote }} - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- if hasKey $sasha "labels" }} {{ toYaml $sasha.labels | indent 8 }} {{- end }} diff --git a/helm/hpcc/templates/thor.yaml b/helm/hpcc/templates/thor.yaml index 80a849d897a..14d04fb4fbd 100644 --- a/helm/hpcc/templates/thor.yaml +++ b/helm/hpcc/templates/thor.yaml @@ -82,7 +82,7 @@ data: labels: accessDali: "yes" accessEsp: "yes" - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 {{- 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 }} @@ -149,7 +149,7 @@ data: accessEsp: "yes" app: "thor" component: "thormanager" - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 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 }} @@ -218,7 +218,7 @@ data: accessEsp: "yes" app: "thor" component: "thorworker" - helmVersion: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 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: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 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: 8.12.69-closedown0 + helmVersion: 8.12.71-closedown0 instance: {{ $commonCtx.thorAgentName | quote }} {{- include "hpcc.addStandardLabels" (dict "root" $ "component" "eclagent" "name" "thor" "instance" $commonCtx.thorAgentName ) | indent 8 }} {{- if hasKey $commonCtx.me "labels" }} diff --git a/version.cmake b/version.cmake index 6cce0f14488..fb2b5d16ea4 100644 --- a/version.cmake +++ b/version.cmake @@ -5,8 +5,8 @@ set ( HPCC_NAME "Community Edition" ) set ( HPCC_PROJECT "community" ) set ( HPCC_MAJOR 8 ) set ( HPCC_MINOR 12 ) -set ( HPCC_POINT 69 ) +set ( HPCC_POINT 71 ) set ( HPCC_MATURITY "closedown" ) set ( HPCC_SEQUENCE 0 ) -set ( HPCC_TAG_TIMESTAMP "2023-11-09T17:02:40Z" ) +set ( HPCC_TAG_TIMESTAMP "2023-11-17T11:27:20Z" ) ### From 3770a07191ad7a163b5f90cdfe4b8cc452897ed8 Mon Sep 17 00:00:00 2001 From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com> Date: Fri, 17 Nov 2023 11:24:44 -0500 Subject: [PATCH 5/8] HPCC-30402 ECL Watch v9 fix permissions tabs not viewable Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com> --- esp/src/eclwatch/PermissionsWidget.js | 7 ++++++- esp/src/eclwatch/ShowAccountPermissionsWidget.js | 7 ++++++- esp/src/src-react/layouts/DojoAdapter.tsx | 8 ++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/esp/src/eclwatch/PermissionsWidget.js b/esp/src/eclwatch/PermissionsWidget.js index 5a0bf49fe7f..77d7a166570 100644 --- a/esp/src/eclwatch/PermissionsWidget.js +++ b/esp/src/eclwatch/PermissionsWidget.js @@ -11,7 +11,12 @@ define([ "hpcc/GridDetailsWidget", "src/ws_access", "src/ESPUtil", - "src/Utility" + "src/Utility", + + "dijit/Dialog", + "dijit/form/TextBox", + + "hpcc/TableContainer" ], function (declare, nlsHPCCMod, registry, CheckBox, diff --git a/esp/src/eclwatch/ShowAccountPermissionsWidget.js b/esp/src/eclwatch/ShowAccountPermissionsWidget.js index cd87980db35..05fe65e894c 100644 --- a/esp/src/eclwatch/ShowAccountPermissionsWidget.js +++ b/esp/src/eclwatch/ShowAccountPermissionsWidget.js @@ -13,7 +13,12 @@ define([ "src/ws_access", "src/ESPUtil", "src/Utility", - "hpcc/ShowInheritedPermissionsWidget" + "hpcc/ShowInheritedPermissionsWidget", + + "dijit/Dialog", + "dijit/form/TextBox", + + "hpcc/TableContainer" ], function (declare, lang, nlsHPCCMod, arrayUtil, registry, CheckBox, diff --git a/esp/src/src-react/layouts/DojoAdapter.tsx b/esp/src/src-react/layouts/DojoAdapter.tsx index f48e3a5455c..1861875a3a6 100644 --- a/esp/src/src-react/layouts/DojoAdapter.tsx +++ b/esp/src/src-react/layouts/DojoAdapter.tsx @@ -60,8 +60,12 @@ export const DojoAdapter: React.FunctionComponent = ({ }, ...delayProps }, elem); - widget.startup(); - widget.resize(); + if (widget.startup) { + widget.startup(); + } + if (widget.resize) { + widget.resize(); + } if (widget.init) { widget.init(params || {}); } From 4369b67c7ee24f94a8af03257d5b6196d62d4d76 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Tue, 21 Nov 2023 12:50:06 +0000 Subject: [PATCH 6/8] HPCC-30898 Resolve build errors with ubuntu 23.10 Signed-off-by: Gavin Halliday --- ecl/hql/hqlgram2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecl/hql/hqlgram2.cpp b/ecl/hql/hqlgram2.cpp index 8d906ad57f0..26bf61e3ff0 100644 --- a/ecl/hql/hqlgram2.cpp +++ b/ecl/hql/hqlgram2.cpp @@ -9689,11 +9689,11 @@ void HqlGram::checkDerivedCompatible(IIdAtom * name, IHqlExpression * scope, IHq if (match) { if (!canBeVirtual(match)) - reportError(ERR_MISMATCH_PROTO, errpos, "Definition %s, cannot override this kind of definition", str(name)); + reportError(ERR_MISMATCH_PROTO, errpos, "Definition %s, cannot override this kind of definition", nullText(str(name))); else { if (!areSymbolsCompatible(expr, isParametered, parameters, match)) - reportError(ERR_MISMATCH_PROTO, errpos, "Prototypes for %s in base and derived modules must match", str(name)); + reportError(ERR_MISMATCH_PROTO, errpos, "Prototypes for %s in base and derived modules must match", nullText(str(name))); } } } From 5caf5c97eb6a8820c4584e91e7419f5150115f02 Mon Sep 17 00:00:00 2001 From: Gavin Halliday Date: Tue, 21 Nov 2023 10:41:00 +0000 Subject: [PATCH 7/8] HPCC-30898 Resolve build errors with ubuntu 23.10 Signed-off-by: Gavin Halliday --- system/jlib/jsecrets.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/jlib/jsecrets.cpp b/system/jlib/jsecrets.cpp index 13d697120fe..71965327b10 100644 --- a/system/jlib/jsecrets.cpp +++ b/system/jlib/jsecrets.cpp @@ -31,6 +31,9 @@ #if defined(__clang__) || defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wformat-nonliteral" + +//httplib also generates warning about access outside of array bounds in gcc +#pragma GCC diagnostic ignored "-Warray-bounds" #endif #ifdef _USE_OPENSSL From db10f484449a1014472a54339a2ee9471fb9f7af Mon Sep 17 00:00:00 2001 From: wangkx Date: Thu, 16 Nov 2023 14:24:07 -0500 Subject: [PATCH 8/8] HPCC-30685 HPCC-30685 Report State always for Scheduled ECL WUs Without this fix, the WU state is displayed inside the ECLWatch Event Scheduler tab only when a state filter is set inside the tab. Signed-off-by: wangkx --- .../ws_workunits/ws_workunitsService.cpp | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/esp/services/ws_workunits/ws_workunitsService.cpp b/esp/services/ws_workunits/ws_workunitsService.cpp index 0f5efa8f24b..3450b185109 100644 --- a/esp/services/ws_workunits/ws_workunitsService.cpp +++ b/esp/services/ws_workunits/ws_workunitsService.cpp @@ -3626,6 +3626,16 @@ void getScheduledWUs(IEspContext &context, WUShowScheduledFilters *filters, cons { jobName.set(cw->queryJobName()); owner.set(cw->queryUser()); + if ((cw->getState() == WUStateScheduled) && cw->aborting()) + { + stateID = WUStateAborting; + state.set("aborting"); + } + else + { + stateID = cw->getState(); + state.set(cw->queryStateDesc()); + } } if (!filters->jobName.isEmpty() && (jobName.isEmpty() || !WildMatch(jobName.str(), filters->jobName, true))) @@ -3634,26 +3644,8 @@ void getScheduledWUs(IEspContext &context, WUShowScheduledFilters *filters, cons match = false; else if (!filters->eventText.isEmpty() && (ieventText.isEmpty() || !WildMatch(ieventText, filters->eventText, true))) match = false; - else if (!filters->state.isEmpty()) - { - if (!cw) - match = false; - else - { - if ((cw->getState() == WUStateScheduled) && cw->aborting()) - { - stateID = WUStateAborting; - state.set("aborting"); - } - else - { - stateID = cw->getState(); - state.set(cw->queryStateDesc()); - } - if (!strieq(filters->state, state.str())) - match = false; - } - } + else if (!filters->state.isEmpty() && !strisame(filters->state, state.str())) + match = false; } catch (IException *e) {