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

…9.6.x
hpcc-systems · Apr 11, 2024 · fad0ae8 · fad0ae8
2 parents 1991889 + b29ebe4
commit fad0ae8
Show file tree

Hide file tree

Showing 20 changed files with 111 additions and 24 deletions.
diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
@@ -128,6 +128,10 @@ jobs:
             name: LN
             cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic"
             ln: true
+          - os: centos-7-rh-python38
+            name: LN Python 3.8
+            cmake_options_extra: "-DVCPKG_TARGET_TRIPLET=x64-centos-7-dynamic -DCUSTOM_LABEL=_rh_python38"
+            ln: true
       fail-fast: false
 
     steps:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -341,11 +341,11 @@ if(TOP_LEVEL_PROJECT)
         message("-- distro uses ${packageManagement}, revision is ${packageRevisionArch}")
 
         if("${packageManagement}" STREQUAL "DEB")
-            set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}-${stagever}${packageRevisionArch}${packageStrippedLabel}${packageContainerizedLabel}")
+            set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}-${stagever}${packageRevisionArch}${packageStrippedLabel}${packageContainerizedLabel}${CUSTOM_LABEL}")
         elseif("${packageManagement}" STREQUAL "RPM")
-            set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}-${stagever}.${packageRevisionArch}${packageStrippedLabel}${packageContainerizedLabel}")
+            set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}-${stagever}.${packageRevisionArch}${packageStrippedLabel}${packageContainerizedLabel}${CUSTOM_LABEL}")
         else()
-            set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}_${stagever}${CPACK_SYSTEM_NAME}${packageStrippedLabel}${packageContainerizedLabel}")
+            set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${CPACK_RPM_PACKAGE_VERSION}_${stagever}${CPACK_SYSTEM_NAME}${packageStrippedLabel}${packageContainerizedLabel}${CUSTOM_LABEL}")
         endif()
     endif ()
 
@@ -501,7 +501,7 @@ if(TOP_LEVEL_PROJECT)
             set(CPACK_GENERATOR "productbuild")
         endif ()
         if(APPLE OR WIN32)
-            set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${version}-${stagever}${CPACK_SYSTEM_NAME}${packageStrippedLabel}${packageContainerizedLabel}")
+            set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_FILE_NAME_PREFIX}_${version}-${stagever}${CPACK_SYSTEM_NAME}${packageStrippedLabel}${packageContainerizedLabel}${CUSTOM_LABEL}")
         endif()
         file(WRITE "${PROJECT_BINARY_DIR}/welcome.txt"
             "HPCC Systems® - Client Tools\r"

diff --git a/cmake_modules/options.cmake b/cmake_modules/options.cmake
@@ -71,6 +71,8 @@ option(INSTALL_VCPKG_CATALOG "Install vcpkg-catalog.txt" ON)
 option(PORTALURL "Set url to hpccsystems portal download page")
 option(PROFILING "Set to true if planning to profile so stacks are informative" OFF)
 
+set(CUSTOM_LABEL "" CACHE STRING "Appends a custom label to the final package name")
+
 if ( NOT PORTALURL )
   set( PORTALURL "http://hpccsystems.com/download" )
 endif()

diff --git a/common/thorhelper/thorsoapcall.cpp b/common/thorhelper/thorsoapcall.cpp
@@ -756,7 +756,7 @@ interface IWSCAsyncFor: public IInterface
     virtual void processException(const Url &url, ConstPointerArray &inputRows, IException *e) = 0;
     virtual void checkTimeLimitExceeded(unsigned * _remainingMS) = 0;
 
-    virtual void createHttpRequest(Url &url, StringBuffer &request) = 0;
+    virtual void createHttpRequest(StringBuffer &request, const Url &url, const IProperties * traceHeaders) = 0;
     virtual int readHttpResponse(StringBuffer &response, ISocket *socket, bool &keepAlive, StringBuffer &contentType) = 0;
     virtual void processResponse(Url &url, StringBuffer &response, ColumnProvider * meta, const char *contentType) = 0;
 
@@ -1958,7 +1958,7 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
         }
     }
 
-    void createHttpRequest(Url &url, StringBuffer &request)
+    void createHttpRequest(StringBuffer &request, const Url &url, const IProperties * traceHeaders)
     {
         // Create the HTTP POST request
         if (master->wscType == STsoap)
@@ -1992,7 +1992,6 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
         if (!httpHeaderBlockContainsHeader(httpheaders, ACCEPT_ENCODING))
             request.appendf("%s: gzip, deflate\r\n", ACCEPT_ENCODING);
 #endif
-        Owned<IProperties> traceHeaders = ::getClientHeaders(master->activitySpanScope);
         if (traceHeaders)
         {
             Owned<IPropertyIterator> iter = traceHeaders->getIterator();
@@ -2454,7 +2453,6 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
         unsigned retryInterval = 0;
 
         Url &url = master->urlArray.item(idx);
-        createHttpRequest(url, request);
         unsigned startidx = idx;
         while (!master->aborted)
         {
@@ -2563,6 +2561,10 @@ class CWSCAsyncFor : implements IWSCAsyncFor, public CInterface, public CAsyncFo
                 checkRoxieAbortMonitor(master->roxieAbortMonitor);
                 OwnedSpanScope socketOperationSpan = master->activitySpanScope->createClientSpan("Socket Write");
                 setSpanURLAttributes(socketOperationSpan, url);
+
+                Owned<IProperties> traceHeaders = ::getClientHeaders(socketOperationSpan);
+                createHttpRequest(request, url, traceHeaders);
+
                 socket->write(request.str(), request.length());
 
                 if (soapTraceLevel > 4)

diff --git a/dockerfiles/image.sh b/dockerfiles/image.sh
@@ -311,6 +311,7 @@ incr() {
 install() {
     if [ -d $DEB_FILE ]; then
         MODE=debug
+        create_build_image
         create_platform_core_image $RELEASE_BASE_IMAGE
         finalize_platform_core_image_from_folder $DEB_FILE
     elif [ -f $DEB_FILE ]; then

diff --git a/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile b/dockerfiles/vcpkg/centos-7-rh-python38.dockerfile
@@ -0,0 +1,13 @@
+ARG VCPKG_REF=latest
+FROM hpccsystems/platform-build-base-centos-7:$VCPKG_REF
+
+RUN yum remove -y python3 python3-devel && \
+    yum install -y rh-python38 rh-python38-python-devel && \
+    yum clean all
+
+RUN echo "source /opt/rh/rh-python38/enable" >> /etc/bashrc
+SHELL ["/bin/bash", "--login", "-c"]
+
+ENTRYPOINT ["/bin/bash", "--login", "-c"]
+
+CMD ["/bin/bash"]
diff --git a/esp/src/src-react/components/forms/landing-zone/FileListForm.tsx b/esp/src/src-react/components/forms/landing-zone/FileListForm.tsx
@@ -8,12 +8,17 @@ import { TargetDropzoneTextField, TargetFolderTextField, TargetServerTextField }
 import { joinPath } from "src/Utility";
 import nlsHPCC from "src/nlsHPCC";
 import { MessageBox } from "../../../layouts/MessageBox";
+import { debounce } from "../../../util/throttle";
 import * as FormStyles from "./styles";
 
 const logger = scopedLogger("src-react/components/forms/landing-zone/FileListForm.tsx");
 
 const myFileSprayService = new FileSprayService({ baseUrl: "" });
 
+const targetFolderTextChange = debounce((text, directory, onChange) => {
+    onChange(directory + text);
+}, 200);
+
 interface FileListFormValues {
     dropzone: string;
     machines: string;
@@ -61,6 +66,8 @@ export const FileListForm: React.FunctionComponent<FileListFormProps> = ({
 
     const closeForm = React.useCallback(() => {
         setShowForm(false);
+        const uploaderBtn = document.querySelector("#uploaderBtn");
+        uploaderBtn["value"] = null;
     }, [setShowForm]);
 
     const doSubmit = React.useCallback((data) => {
@@ -235,8 +242,11 @@ export const FileListForm: React.FunctionComponent<FileListFormProps> = ({
                         machineOS={os}
                         required={true}
                         placeholder={nlsHPCC.SelectValue}
+                        onInputValueChange={(text) => targetFolderTextChange(text, directory, onChange)}
                         onChange={(evt, option) => {
-                            onChange(option.key);
+                            if (option?.key) {
+                                onChange(option.key);
+                            }
                         }}
                         errorMessage={error && error?.message}
                     />}

diff --git a/helm/hpcc/templates/_helpers.tpl b/helm/hpcc/templates/_helpers.tpl
@@ -1408,7 +1408,10 @@ Pass in dict with root, me and dali if container in dali pod
           "--service={{ .me.name }}",
 {{ include "hpcc.daliArg" (dict "root" .root "component" "Sasha" "optional" false "overrideDaliHost" $overrideDaliHost "overrideDaliPort" $overrideDaliPort) | indent 10 }}
         ]
+{{- $omitResources := hasKey .root.Values.global "omitResources" | ternary .root.Values.global.omitResources .root.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me" .me.resources) | indent 2 }}
+{{- end }}
 {{- include "hpcc.addSecurityContext" . | indent 2 }}
   env:
 {{ include "hpcc.mergeEnvironments" $env | indent 2 -}}
@@ -2557,7 +2560,7 @@ Pass in value
  {{- else -}}
   {{- $_ := fail (printf "Invalid size suffix on memory resource specification: %s" .) -}}
  {{- end -}}
- {{- $_ := set $ctx "number" (substr 0 (sub (len .) 1) .) -}}
+ {{- $_ := set $ctx "number" (substr 0 (int (sub (len .) 1)) .) -}}
 {{- end -}}
 {{- printf "%d" (mul $ctx.number $ctx.scale) -}}
 {{- end -}}

diff --git a/helm/hpcc/templates/dafilesrv.yaml b/helm/hpcc/templates/dafilesrv.yaml
@@ -74,7 +74,10 @@ spec:
           value: "/tmp/{{ .name }}.sentinel"
 {{ include "hpcc.addSentinelProbes" . | indent 8 }}
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me" .resources) | indent 8 }}
+{{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:
 {{ include "hpcc.addConfigMapVolumeMount" . | indent 8 }}

diff --git a/helm/hpcc/templates/dali.yaml b/helm/hpcc/templates/dali.yaml
@@ -118,7 +118,10 @@ spec:
           value: "/tmp/{{ $dali.name }}.sentinel"
 {{ include "hpcc.addSentinelProbes" $dali | indent 8 }}
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me" $dali.resources) | indent 8 }}
+{{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:
 {{ include "hpcc.addConfigMapVolumeMount" $dali | indent 8 }}

diff --git a/helm/hpcc/templates/dfuserver.yaml b/helm/hpcc/templates/dfuserver.yaml
@@ -84,7 +84,10 @@ spec:
           value: "/tmp/{{ .name }}.sentinel"
 {{ include "hpcc.addSentinelProbes" . | indent 8 }}
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me" .resources) | indent 8 }}
+{{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:
 {{- include "hpcc.addVolumeMounts" $commonCtx | indent 8 }}

diff --git a/helm/hpcc/templates/eclagent.yaml b/helm/hpcc/templates/eclagent.yaml
@@ -82,7 +82,10 @@ data:
           - name: {{ $appJobName }}
 {{- include "hpcc.addSecurityContext" . | indent 12 }}
 {{ include "hpcc.addImageAttrs" . | indent 12 }}
+{{- $omitResources := hasKey .root.Values.global "omitResources" | ternary .root.Values.global.omitResources .root.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me" .me.resources) | indent 12 }}
+{{- end }}
 {{- $appCmd := printf "%s %s %s _HPCC_ARGS_" $apptype (include "hpcc.configArg" .me) (include "hpcc.daliArg" (dict "root" .root "component" "ECL Agent" "optional" false )) }}
 {{ include "hpcc.addCommandAndLifecycle" (. | merge (dict "command" $appCmd)) | indent 12 }}
             env:
@@ -164,10 +167,13 @@ spec:
           value: "/tmp/{{ .name }}.sentinel"
 {{ include "hpcc.addSentinelProbes" . | indent 8 }}
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
-{{- if .useChildProcesses }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
+{{-  if .useChildProcesses }}
 {{- include "hpcc.addResources" (dict "me" .resources) | indent 8 }}
-{{- else if not $.Values.global.privileged }}
+{{-  else }}
 {{- include "hpcc.addStubResources" ($commonCtx | merge (dict "instances" .maxActive)) | indent 8 }}
+{{-  end }}
 {{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:

diff --git a/helm/hpcc/templates/eclccserver.yaml b/helm/hpcc/templates/eclccserver.yaml
@@ -77,7 +77,10 @@ data:
 {{- end }}
           - name: {{ $compileJobName }}
 {{- include "hpcc.addSecurityContext" . | indent 12 }}
+{{- $omitResources := hasKey .root.Values.global "omitResources" | ternary .root.Values.global.omitResources .root.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me" .me.resources) | indent 12 }}
+{{- end }}
 {{ include "hpcc.addImageAttrs" . | indent 12 }}
 {{- $misc := .root.Values.global.misc | default dict -}}
 {{- $postJobCommand := $misc.postJobCommand | default "" }}
@@ -172,10 +175,13 @@ spec:
           value: "/tmp/{{ .name }}.sentinel"
 {{ include "hpcc.addSentinelProbes" . | indent 8 }}
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
-{{- if .useChildProcesses }}
-{{- include "hpcc.addResources" (dict "me" .resources) | indent 8 }}
-{{- else if not $.Values.global.privileged }}
-{{- include "hpcc.addStubResources" ($commonCtx | merge (dict "instances" .maxActive)) | indent 8 }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
+{{-  if .useChildProcesses }}
+{{-   include "hpcc.addResources" (dict "me" .resources) | indent 8 }}
+{{-  else }}
+{{-   include "hpcc.addStubResources" ($commonCtx | merge (dict "instances" .maxActive)) | indent 8 }}
+{{-  end }}
 {{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:

diff --git a/helm/hpcc/templates/eclscheduler.yaml b/helm/hpcc/templates/eclscheduler.yaml
@@ -93,7 +93,8 @@ spec:
           value: "/tmp/{{ .name }}.sentinel"
 {{ include "hpcc.addSentinelProbes" . | indent 8 }}
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
-{{- if not $.Values.global.privileged }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addStubResources" ($commonCtx | merge (dict "instances" 1)) | indent 8 }}
 {{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}

diff --git a/helm/hpcc/templates/esp.yaml b/helm/hpcc/templates/esp.yaml
@@ -158,7 +158,10 @@ spec:
           value: "/tmp/{{ .name }}.sentinel"
 {{ include "hpcc.addSentinelProbes" . | indent 8 }}
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me" .resources) | indent 8 }}
+{{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:
 {{ include "hpcc.addConfigMapVolumeMount" . | indent 8 }}

diff --git a/helm/hpcc/templates/localroxie.yaml b/helm/hpcc/templates/localroxie.yaml
@@ -114,7 +114,10 @@ spec:
 {{- end }}
 {{- end }}
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me" $roxie.resources) | indent 8 }}
+{{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:
 {{ include "hpcc.addConfigMapVolumeMount" . | indent 8 }}

diff --git a/helm/hpcc/templates/roxie.yaml b/helm/hpcc/templates/roxie.yaml
@@ -146,7 +146,8 @@ spec:
       - name: {{ $commonCtx.toponame | quote }}
 {{ include "hpcc.addSentinelProbes" $toposerver | indent 8 }}
 {{- include "hpcc.addSecurityContext" $commonCtx | indent 8 }}
-{{- if not $.Values.global.privileged }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addStubResources" ($commonCtx | merge (dict "instances" 1)) | indent 8 }}
 {{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
@@ -298,7 +299,10 @@ spec:
               command: ["testsocket", ".", "control:closedown"]        
 {{ include "hpcc.addSentinelProbes" ( $roxie | merge (dict "readyProbeName" ".ready" )) | indent 8 }}
 {{ include "hpcc.addSecurityContext" (dict "root" $ "me" .) | indent 8 }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me"  ($roxie.serverResources | default $roxie.resources)) | indent 8 }}
+{{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:
 {{ include "hpcc.addConfigMapVolumeMount" $roxie | indent 8 }}
@@ -406,7 +410,10 @@ spec:
 {{ include "hpcc.addSentinelProbes" ( $roxie | merge (dict "readyProbeName" ".ready" )) | indent 8 }}
 {{- end }}
 {{ include "hpcc.addSecurityContext" (dict "root" $ "me" .) | indent 8 }}
+{{- $omitResources := hasKey $.Values.global "omitResources" | ternary $.Values.global.omitResources $.Values.global.privileged }}
+{{- if not $omitResources }}
 {{- include "hpcc.addResources" (dict "me" ($roxie.channelResources | default $roxie.resources)) | indent 8 }}
+{{- end }}
 {{ include "hpcc.addImageAttrs" $commonCtx | indent 8 }}
         volumeMounts:
 {{ include "hpcc.addConfigMapVolumeMount" $roxie | indent 8 }}