Merge remote-tracking branch 'origin/candidate-10.0.x' into candidate-10.2.x

Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>

Author: GordonSmith

.github/workflows/build-docker-internal.yml

@@ -269,12 +269,39 @@ jobs:
             ${{ secrets.JFROG_REGISTRY || 'dummy.io' }}/hpccpl-docker-local/platform-core-ln:${{ steps.vars.outputs.hpcc_version }}
           cache-from: |
             type=registry,ref=hpccsystems/platform-core-${{ inputs.os }}:${{ steps.vars.outputs.candidate_base_branch }}
+
+      - name: Locate withsymbols_k8s deb file
+        if: ${{ inputs.build-docker-image}}
+        id: ln-container-withsymbols
+        run: |
+          withsymbols_k8s_pkg_path=$(ls -t ${{ steps.vars.outputs.folder_build }}/*64_withsymbols_k8s.deb 2>/dev/null | head -1)
+          withsymbols_k8s_pkg_file=$(basename "$withsymbols_k8s_pkg_path")
+          echo "withsymbols_k8s_pkg_file=$withsymbols_k8s_pkg_file" >> $GITHUB_OUTPUT
+          echo "$withsymbols_k8s_pkg_file"
   
+      - name: Create Docker Image With Symbols
+        uses: docker/build-push-action@v5
+        if: ${{ inputs.build-docker-image }}
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          file: ${{ steps.vars.outputs.folder_platform }}/dockerfiles/platform-core-${{ inputs.os }}/Dockerfile
+          context: ${{ steps.vars.outputs.folder_build }}
+          push: false
+          load: true
+          build-args: |
+            PKG_FILE=${{ steps.ln-container-withsymbols.outputs.withsymbols_k8s_pkg_file }}
+          tags: |
+            ${{ secrets.JFROG_REGISTRY || 'dummy.io' }}/hpccpl-docker-local/platform-core-ln-withsymbols:${{ steps.vars.outputs.hpcc_version }}
+          cache-from: |
+            type=registry,ref=hpccsystems/platform-core-${{ inputs.os }}:${{ steps.vars.outputs.candidate_base_branch }}
+
       - name: JFrog Docker Push and Publish
         if: ${{ inputs.build-docker-image && github.repository_owner == 'hpcc-systems' }}
         run: |
           jf docker push ${{ secrets.JFROG_REGISTRY || 'dummy.io' }}/hpccpl-docker-local/platform-core-ln:${{ steps.vars.outputs.hpcc_version }} --build-name=platform-core-ln --build-number=${{ steps.vars.outputs.hpcc_version }} --project=hpccpl
           jf rt bp platform-core-ln ${{ steps.vars.outputs.hpcc_version }} --project=hpccpl
+          jf docker push ${{ secrets.JFROG_REGISTRY || 'dummy.io' }}/hpccpl-docker-local/platform-core-ln-withsymbols:${{ steps.vars.outputs.hpcc_version }} --build-name=platform-core-ln-withsymbols --build-number=${{ steps.vars.outputs.hpcc_version }} --project=hpccpl
+          jf rt bp platform-core-ln-withsymbols ${{ steps.vars.outputs.hpcc_version }} --project=hpccpl
 
       - name: Cleanup Environment
         if: always()

dockerfiles/rule-hpccpl-docker-local-point-over-6mo.spec

@@ -5,7 +5,7 @@
             "items.find": 
             {
                 "repo": "hpccpl-docker-local",
-                "path": "platform-core-ln",
+                "path": {"$match": "platform-core-ln*"},
                 "created": {"$before": "6mo"},
                 "type": "folder",
                 "name": {"$nmatch": "*-latest"},

esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -3188,7 +3188,7 @@ class QueryCloner
         StringBuffer fetchedName;
         StringBuffer remoteDfs;
         fetchRemoteWorkunit(NULL, context, srcAddress.str(), NULL, NULL, wuid, fetchedName, xml, dllname, dll, remoteDfs, useSSL);
-        deploySharedObject(*context, wuid, target, queryName, dll, queryDirectory, xml.str(), false);
+        deploySharedObject(*context, wuid, target, queryName, dll, queryDirectory, xml.str(), false, srcAddress.str(), dllname);
 
         SCMStringBuffer existingQueryId;
         queryIdFromQuerySetWuid(destQuerySet, wuid, queryName, existingQueryId);
@@ -3516,7 +3516,7 @@ bool CWsWorkunitsEx::onWUQuerysetCopyQuery(IEspContext &context, IEspWUQuerySetC
             wuid.set(srcInfo->getWuid());
         if (targetQueryName.isEmpty())
             targetQueryName.set(queryName);
-        deploySharedObject(context, wuid, target, targetQueryName.get(), dll, queryDirectory.str(), xml.str(), false);
+        deploySharedObject(context, wuid, target, targetQueryName.get(), dll, queryDirectory.str(), xml.str(), false, srcAddress.str(), dllname.str());
     }
     else
     {

esp/services/ws_workunits/ws_workunitsService.cpp

@@ -4803,7 +4803,7 @@ void writeSharedObject(const char *srcpath, const MemoryBuffer &obj, const char
     throw MakeStringException(ECLWATCH_CANNOT_COPY_DLL, "Failed copying shared object %s", srcpath);
 }
 
-void deploySharedObject(IEspContext &context, StringBuffer &wuid, const char *cluster, const char *name, const MemoryBuffer &obj, const char *dir, const char *xml, bool protect)
+void deploySharedObject(IEspContext &context, StringBuffer &wuid, const char *cluster, const char *name, const MemoryBuffer &obj, const char *dir, const char *xml, bool protect, const char *sourceProcess, const char *sourceFilename)
 {
     StringBuffer dllpath, dllname;
 
@@ -4833,9 +4833,18 @@ void deploySharedObject(IEspContext &context, StringBuffer &wuid, const char *cl
         }
     }
 
+    StringBuffer originalDllName(sourceFilename);
+    if (originalDllName.isEmpty() && !isEmptyString(name))
+        originalDllName.append(name).append(SharedObjectExtension);
+
     NewWsWorkunit wu(context, wuid);
     wuid.set(wu->queryWuid()); // Update the wuid to the new unique value
 
+    if (!originalDllName.isEmpty())
+        wu->setApplicationValue("deploy", "sourceQuery", originalDllName.str(), true);
+    if (!isEmptyString(sourceProcess))
+        wu->setApplicationValue("deploy", "sourceEnvironment", sourceProcess, true);
+
     //Write the dll to a filename based on the unique wuid
     StringBuffer baseDllName;
     baseDllName.append(SharedObjectPrefix).append(wuid).append(SharedObjectExtension);
@@ -4888,7 +4897,7 @@ void CWsWorkunitsEx::deploySharedObjectReq(IEspContext &context, IEspWUDeployWor
     }
 
     StringBuffer wuid;
-    deploySharedObject(context, wuid, cluster, req.getName(), *uncompressed, dir, xml, req.getProtect());
+    deploySharedObject(context, wuid, cluster, req.getName(), *uncompressed, dir, xml, req.getProtect(), nullptr, req.getFileName());
 
     WsWuInfo winfo(context, wuid.str());
     winfo.getCommon(resp.updateWorkunit(), WUINFO_All);

esp/services/ws_workunits/ws_workunitsService.hpp

@@ -509,7 +509,7 @@ class CWsWorkunitsSoapBindingEx : public CWsWorkunitsSoapBinding
     StringAttr espApplicationName;
 };
 
-void deploySharedObject(IEspContext &context, StringBuffer &wuid, const char *cluster, const char *name, const MemoryBuffer &obj, const char *dir, const char *xml=NULL, bool protect=false);
+void deploySharedObject(IEspContext &context, StringBuffer &wuid, const char *cluster, const char *name, const MemoryBuffer &obj, const char *dir, const char *xml, bool protect, const char *sourceProcess, const char *sourceFilename);
 
 class CClusterQueryStateParam : public CInterface
 {