Merge pull request #13652 from richardkchapman/roxie-cloud-deploy

HPCC-23898 - Can't deploy queries to Roxie under k8s

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

esp/services/ws_workunits/ws_workunitsQuerySets.cpp

@@ -726,12 +726,17 @@ public:
     void init(IEspContext &context, bool allowForeignFiles)
     {
         files.setown(createReferencedFileList(context.queryUserId(), context.queryPassword(), allowForeignFiles, false));
+#ifndef _CONTAINERIZED
         clusterInfo.setown(getTargetClusterInfo(target));
         StringBufferAdaptor sba(process);
         if (clusterInfo && clusterInfo->getPlatform()==RoxieCluster)
             clusterInfo->getRoxieProcess(sba);
         if (!process.length())
             return;
+#else
+        StringBuffer process(target);
+#endif
+
         ps.setown(createPackageSet(process.str()));
         if (ps)
             pm = ps->queryActiveMap(target);
@@ -746,7 +751,9 @@ public:
         StringBuffer defReplicateFolder;
         getConfigurationDirectory(NULL, "data2", "roxie", process.str(), defReplicateFolder);
         Owned<IDFUhelper> helper = createIDFUhelper();
+#ifndef _CONTAINERIZED
         files->cloneAllInfo(updateFlags, helper, true, true, clusterInfo->getRoxieRedundancy(), clusterInfo->getChannelsPerNode(), clusterInfo->getRoxieReplicateOffset(), defReplicateFolder);
+#endif
     }
 
     void gatherFileErrors(IArrayOf<IConstLogicalFileError> &errors)
@@ -755,7 +762,9 @@ public:
     }
 
 private:
+#ifndef _CONTAINERIZED
     Owned <IConstWUClusterInfo> clusterInfo;
+#endif
     Owned<IHpccPackageSet> ps;
     const IHpccPackageMap *pm = nullptr;
     StringAttr target;

roxie/ccd/ccdmain.cpp

@@ -1093,7 +1093,11 @@ int CCD_API roxie_main(int argc, const char *argv[], const char * defaultYaml)
 #else
         topology->addPropBool("@linuxOS", true);
 #endif
+#ifdef _CONTAINERIZED
+        allQuerySetNames.append(roxieName);
+#else
         allQuerySetNames.appendListUniq(topology->queryProp("@querySets"), ",");
+#endif
         // Set multicast base addresses - must be done before generating slave channels
 
         if (roxieMulticastEnabled && !localSlave)