Merge pull request #4960 from garonsky/HPCC_10092_specifiy_sasha_for_espmc

HPCC-10092 Configmgr - add attribute serverForArchivedECLWU to esp

Reviewed-By: Kevin Wang <kevin.wang@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

deployment/deployutils/deployutils.cpp

@@ -871,6 +871,12 @@ public:
               LoadComboBox("Software/LDAPServerProcess", bAddBlank, m_pEnv, m_pEnv, strBuf);
               extraInfo = strBuf.str();
             }
+            else if (strcmp(type, "sashaServerType")==0)
+            {
+              nCtrlType = 4;//LVC_COMBO;
+              LoadComboBox("Software/SashaServerProcess", bAddBlank, m_pEnv, m_pEnv, strBuf);
+              extraInfo = strBuf.str();
+            }
             else if (strcmp(type, "accurintServerType")==0)
             {
               nCtrlType = 4;//LVC_COMBO;

initfiles/componentfiles/configxml/@temp/esp_service_WsSMC.xsl

@@ -214,6 +214,12 @@ This is required by its binding with ESP service '<xsl:value-of select="$espServ
             <xsl:if test="string(@AWUsCacheTimeout) != ''">
                 <AWUsCacheMinutes><xsl:value-of select="@AWUsCacheTimeout"/></AWUsCacheMinutes>
             </xsl:if>
+            <xsl:if test="string(@serverForArchivedECLWU) != ''">
+                <xsl:variable name="sashaServer" select="@serverForArchivedECLWU"/>
+                <xsl:variable name="sashaServerIP" select="/Environment/Software/SashaServerProcess[@name=$sashaServer]/Instance/@netAddress"/>
+                <xsl:variable name="sashaServerPort" select="/Environment/Software/SashaServerProcess[@name=$sashaServer]/Instance/@port"/>
+                <serverForArchivedECLWU netAddress="{$sashaServerIP}" port="{$sashaServerPort}" />
+            </xsl:if>
                         <xsl:if test="string(@allowNewRoxieOnDemandQuery) != ''">
                 <AllowNewRoxieOnDemandQuery><xsl:value-of select="@allowNewRoxieOnDemandQuery"/></AllowNewRoxieOnDemandQuery>
             </xsl:if>

initfiles/componentfiles/configxml/Environment.xsd

@@ -1356,4 +1356,7 @@
     <xs:simpleType name="roxieAddress">
         <xs:restriction base="xs:string"/>
     </xs:simpleType>
+    <xs:simpleType name="sashaServerType">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
 </xs:schema>

initfiles/componentfiles/configxml/espsmcservice.xsd.in

@@ -83,6 +83,13 @@
                     </xs:appinfo>
                 </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="serverForArchivedECLWU" type="sashaServerType" use="optional">
+                <xs:annotation>
+                    <xs:appinfo>
+                        <tooltip>Specify Sasha server for archiving ECL workunits</tooltip>
+                    </xs:appinfo>
+                </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="enableSystemUseRewrite" type="xs:boolean" use="optional" default="false">
                 <xs:annotation>
                     <xs:appinfo>