Explorar o código

Merge pull request #6268 from richardkchapman/activity_cache_modified_5.0.x

HPCC-11933 Fix WsSMC.setActivityResponse to not update Activity cache

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday %!s(int64=11) %!d(string=hai) anos
pai
achega
04b47ab195

+ 1 - 1
esp/services/ws_smc/ws_smcService.cpp

@@ -2124,7 +2124,7 @@ void CWsSMCEx::setServerQueueInfo(IEspContext &context, const char *serverType,
     setActiveWUs(context, serverType, instance.str(), aws, statusServerInfo);
 }
 
-void CWsSMCEx::setESPTargetCluster(IEspContext &context, CWsSMCTargetCluster& targetCluster, IEspTargetCluster* espTargetCluster)
+void CWsSMCEx::setESPTargetCluster(IEspContext &context, const CWsSMCTargetCluster& targetCluster, IEspTargetCluster* espTargetCluster)
 {
     espTargetCluster->setClusterName(targetCluster.clusterName.get());
     espTargetCluster->setClusterSize(targetCluster.clusterSize);

+ 1 - 1
esp/services/ws_smc/ws_smcService.hpp

@@ -212,7 +212,7 @@ private:
         const IArrayOf<IEspActiveWorkunit>& aws, IEspStatusServerInfo& statusServerInfo);
     void setServerQueueInfo(IEspContext &context, const char *serverType, const char *networkAddress, unsigned port, const IArrayOf<IEspServerJobQueue>& serverJobQueues,
         const IArrayOf<IEspActiveWorkunit>& aws, IEspStatusServerInfo& statusServerInfo);
-    void setESPTargetCluster(IEspContext &context, CWsSMCTargetCluster& targetCluster, IEspTargetCluster* espTargetCluster);
+    void setESPTargetCluster(IEspContext &context, const CWsSMCTargetCluster& targetCluster, IEspTargetCluster* espTargetCluster);
     void setActiveWUs(IEspContext &context, const char *serverType, const char *clusterName, const char *queueName, const IArrayOf<IEspActiveWorkunit>& aws, IEspStatusServerInfo& statusServerInfo);
     void setActiveWUs(IEspContext &context, const char *serverType, const char *instance, const IArrayOf<IEspActiveWorkunit>& aws, IEspStatusServerInfo& statusServerInfo);
     void setActiveWUs(IEspContext &context, IEspActiveWorkunit& wu, IEspActiveWorkunit* wuToSet);