Home Explore Help
Sign In
RONCC
/
Big-Data-HPC-Platform
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge pull request #4477 from wangkx/h8869b

HPCC-8869 Refactor ECLWatch activity code

Reviewed-By: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 12 years ago
parent
e50622ecf5 23fb6553da
commit
279f83c5b7
4 changed files with 1122 additions and 438 deletions
Split View Show Diff Stats
  1. 107 88
      esp/eclwatch/ws_XSLT/index.xslt
  2. 20 4
      esp/scm/ws_smc.ecm
  3. 929 345
      esp/services/ws_smc/ws_smcService.cpp
  4. 66 1
      esp/services/ws_smc/ws_smcService.hpp

+ 107 - 88
esp/eclwatch/ws_XSLT/index.xslt
View File 

@@ -22,8 +22,8 @@
 
     <xsl:variable name="sortby" select="ActivityResponse/SortBy"/>
 
     <xsl:variable name="descending" select="ActivityResponse/Descending"/>
 
     <xsl:variable name="accessRight" select="ActivityResponse/AccessRight"/>
 
-    <xsl:variable name="countThorClusters" select="count(ActivityResponse/ThorClusters/ThorCluster)"/>
 
-    <xsl:variable name="countRoxieClusters" select="count(ActivityResponse/RoxieClusters/RoxieCluster)"/>
 
+    <xsl:variable name="countThorClusters" select="count(ActivityResponse/ThorClusterList/TargetCluster)"/>
 
+    <xsl:variable name="countRoxieClusters" select="count(ActivityResponse/RoxieClusterList/TargetCluster)"/>
 
     <xsl:template match="ActivityResponse">
 
         <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
             <head>
 
@@ -205,8 +205,7 @@
 
                             {
 
                                 commandQueue("SetJobPriority?Priority=Normal",cluster,clusterType,queue,wuid);
 
                             }
 
-
 
-                            var xypos = YAHOO.util.Dom.getXY(clusterType + '_' + wuid);
 
+                            var xypos = YAHOO.util.Dom.getXY(cluster + '_' + wuid);
 
                             if (oMenu) {
 
                                 oMenu.destroy();
 
                             }
 
@@ -236,7 +235,7 @@
 
                             return false;
 
                         }
 
 
-                        function queuedWUPopup(cluster,clusterType,queue,wuid,prev,next,highpriority)
 
+                        function queuedWUPopup(cluster,clusterType,queue,eclAgentQueue, wuid,prev,next,highpriority)
 
                         {
 
                             function moveupWuid()
 
                             {
 
@@ -269,22 +268,27 @@
 
                                 commandQueue("SetJobPriority?Priority=Normal",cluster,clusterType,queue,wuid);
 
                             }
 
 
-                            var xypos = YAHOO.util.Dom.getXY(clusterType + '_' + wuid);
 
+                            var xypos = YAHOO.util.Dom.getXY(cluster + '_' + wuid);
 
                             if (oMenu) {
 
                                 oMenu.destroy();
 
                             }
 
                             oMenu = new YAHOO.widget.Menu("activitypagemenu", {position: "dynamic", xy: xypos} );
 
                             oMenu.clearContent();
 
 
-                            oMenu.addItems([
 
-                                { text: "Move Up", onclick: { fn: moveupWuid }, disabled: prev ? false : true },
 
-                                { text: "Move Down", onclick: { fn: movedownWuid }, disabled: next ? false : true },
 
-                                { text: "Move Top", onclick: { fn: movefrontWuid }, disabled: prev ? false : true },
 
-                                { text: "Move Bottom", onclick: { fn: movebackWuid }, disabled: next ? false : true },
 
-                                { text: "Remove", onclick: { fn: removeWuid } },
 
-                                { text: "High Priority", onclick: { fn: highpriority ? setNormalPriority : setHighPriority }, checked: highpriority ? true : false }
 
-                            ]);
 
-
 
+                            if (eclAgentQueue == '') {
 
+                                oMenu.addItems([
 
+                                    { text: "Move Up", onclick: { fn: moveupWuid }, disabled: prev ? false : true },
 
+                                    { text: "Move Down", onclick: { fn: movedownWuid }, disabled: next ? false : true },
 
+                                    { text: "Move Top", onclick: { fn: movefrontWuid }, disabled: prev ? false : true },
 
+                                    { text: "Move Bottom", onclick: { fn: movebackWuid }, disabled: next ? false : true },
 
+                                    { text: "Remove", onclick: { fn: removeWuid } },
 
+                                    { text: "High Priority", onclick: { fn: highpriority ? setNormalPriority : setHighPriority }, checked: highpriority ? true : false }
 
+                                ]);
 
+                            } else {
 
+                                oMenu.addItems([
 
+                                    { text: "Remove", onclick: { fn: removeWuid } }
 
+                                ]);
 
+                            }
 
                             oMenu.render("rendertarget");
 
                             oMenu.show();
 
                             return false;
 
@@ -562,37 +566,43 @@
 
                     <input type="hidden" name="Cluster" id="Cluster" value=""/>
 
                     <input type="hidden" name="QueueName" id="QueueName" value=""/>
 
                     <input type="hidden" name="Wuid" id="Wuid" value=""/>
 
-                    <xsl:for-each select="ThorClusters/ThorCluster">
 
+                    <xsl:for-each select="ThorClusterList/TargetCluster">
 
                         <xsl:call-template name="show-queue">
 
-                            <xsl:with-param name="workunits" select="//Running/ActiveWorkunit[(Server='ThorMaster' and QueueName=current()/QueueName) or (ClusterType='Thor' and ClusterQueueName=current()/QueueName)]"/>
 
+                            <xsl:with-param name="workunits" select="//Running/ActiveWorkunit[(Server='ThorMaster' and TargetClusterName=current()/ClusterName) or (ClusterType='Thor' and ClusterQueueName=current()/QueueName)]"/>
 
                             <xsl:with-param name="cluster" select="ClusterName"/>
 
                             <xsl:with-param name="clusterType" select="'THOR'"/>
 
+                            <xsl:with-param name="clusterStatus" select="ClusterStatus"/>
 
                             <xsl:with-param name="queue" select="QueueName"/>
 
-                            <xsl:with-param name="status" select="QueueStatus"/>
 
-                            <xsl:with-param name="status2" select="QueueStatus2"/>
 
+                            <xsl:with-param name="queueStatus" select="QueueStatus"/>
 
+                            <xsl:with-param name="statusDetails" select="StatusDetails"/>
 
+                            <xsl:with-param name="warning" select="Warning"/>
 
                             <xsl:with-param name="thorlcr" select="ThorLCR"/>
 
                         </xsl:call-template>
 
                     </xsl:for-each>
 
 
-                    <xsl:for-each select="RoxieClusters/RoxieCluster">
 
+                    <xsl:for-each select="RoxieClusterList/TargetCluster">
 
                         <xsl:call-template name="show-queue">
 
-                            <xsl:with-param name="workunits" select="//Running/ActiveWorkunit[(Server='RoxieServer' and QueueName=current()/QueueName) or (ClusterType='Roxie' and ClusterQueueName=current()/QueueName)]"/>
 
+                            <xsl:with-param name="workunits" select="//Running/ActiveWorkunit[(Server='RoxieServer' and TargetClusterName=current()/ClusterName) or (ClusterType='Roxie' and ClusterQueueName=current()/QueueName)]"/>
 
                             <xsl:with-param name="cluster" select="ClusterName"/>
 
                             <xsl:with-param name="clusterType" select="'ROXIE'"/>
 
                             <xsl:with-param name="queue" select="QueueName"/>
 
-                            <xsl:with-param name="status" select="QueueStatus"/>
 
-                            <xsl:with-param name="status2" select="QueueStatus2"/>
 
+                            <xsl:with-param name="queueStatus" select="QueueStatus"/>
 
+                            <xsl:with-param name="clusterStatus" select="ClusterStatus"/>
 
+                            <xsl:with-param name="statusDetails" select="StatusDetails"/>
 
+                            <xsl:with-param name="warning" select="Warning"/>
 
                         </xsl:call-template>
 
                     </xsl:for-each>
 
 
-                    <xsl:for-each select="HThorClusters/HThorCluster">
 
+                    <xsl:for-each select="HThorClusterList/TargetCluster">
 
                         <xsl:call-template name="show-queue">
 
-                            <xsl:with-param name="workunits" select="//Running/ActiveWorkunit[(Server='HThorServer' and QueueName=current()/QueueName) or (ClusterType='HThor' and ClusterQueueName=current()/QueueName)]"/>
 
+                            <xsl:with-param name="workunits" select="//Running/ActiveWorkunit[(Server='HThorServer' and TargetClusterName=current()/ClusterName) or (ClusterType='HThor' and ClusterQueueName=current()/QueueName)]"/>
 
                             <xsl:with-param name="cluster" select="ClusterName"/>
 
                             <xsl:with-param name="clusterType" select="'HTHOR'"/>
 
                             <xsl:with-param name="queue" select="QueueName"/>
 
-                            <xsl:with-param name="status" select="QueueStatus"/>
 
-                            <xsl:with-param name="status2" select="QueueStatus2"/>
 
+                            <xsl:with-param name="queueStatus" select="QueueStatus"/>
 
+                            <xsl:with-param name="clusterStatus" select="ClusterStatus"/>
 
+                            <xsl:with-param name="statusDetails" select="StatusDetails"/>
 
+                            <xsl:with-param name="warning" select="Warning"/>
 
                         </xsl:call-template>
 
                     </xsl:for-each>
 
 
@@ -602,7 +612,27 @@
 
                             <xsl:with-param name="cluster" select="ServerName"/>
 
                             <xsl:with-param name="clusterType" select="ServerType"/>
 
                             <xsl:with-param name="queue" select="QueueName"/>
 
-                            <xsl:with-param name="status" select="QueueStatus"/>
 
+                            <xsl:with-param name="queueStatus" select="QueueStatus"/>
 
+                        </xsl:call-template>
 
+                    </xsl:for-each>
 
+
 
+                    <xsl:for-each select="ServerJobQueues/ServerJobQueue[ServerType='ECLserver']">
 
+                        <xsl:call-template name="show-queue">
 
+                            <xsl:with-param name="workunits" select="//Running/ActiveWorkunit[Server='ECLserver' and QueueName=current()/QueueName]"/>
 
+                            <xsl:with-param name="cluster" select="ServerName"/>
 
+                            <xsl:with-param name="clusterType" select="ServerType"/>
 
+                            <xsl:with-param name="queue" select="QueueName"/>
 
+                            <xsl:with-param name="queueStatus" select="QueueStatus"/>
 
+                        </xsl:call-template>
 
+                    </xsl:for-each>
 
+
 
+                    <xsl:for-each select="ServerJobQueues/ServerJobQueue[ServerType='ECLAgent']">
 
+                        <xsl:call-template name="show-queue">
 
+                            <xsl:with-param name="workunits" select="//Running/ActiveWorkunit[Server='ECLAgent' and QueueName=current()/QueueName]"/>
 
+                            <xsl:with-param name="cluster" select="ServerName"/>
 
+                            <xsl:with-param name="clusterType" select="ServerType"/>
 
+                            <xsl:with-param name="queue" select="QueueName"/>
 
+                            <xsl:with-param name="queueStatus" select="QueueStatus"/>
 
                         </xsl:call-template>
 
                     </xsl:for-each>
 
 
@@ -612,7 +642,7 @@
 
                             <xsl:with-param name="cluster" select="ServerName"/>
 
                             <xsl:with-param name="clusterType" select="ServerType"/>
 
                             <xsl:with-param name="queue" select="QueueName"/>
 
-                            <xsl:with-param name="status" select="QueueStatus"/>
 
+                            <xsl:with-param name="queueStatus" select="QueueStatus"/>
 
                         </xsl:call-template>
 
                     </xsl:for-each>
 
                     <xsl:apply-templates select="DFUJobs"/>
 
@@ -666,32 +696,15 @@
 
         </html>
 
     </xsl:template>
 
 
-    <xsl:template name="show-server">
 
-        <xsl:param name="workunits"/>
 
-        <xsl:if test="count($workunits)>0">
 
-            <xsl:variable name="queue" select="$workunits[1]/QueueName"/>
 
-            <xsl:variable name="cluster" select="$workunits[1]/Instance"/>
 
-            <xsl:call-template name="show-queue">
 
-                <xsl:with-param name="workunits" select="$workunits[Instance=$cluster]"/>
 
-                <xsl:with-param name="cluster" select="$cluster"/>
 
-                <xsl:with-param name="queue" select="$queue"/>
 
-            </xsl:call-template>
 
-
 
-            <xsl:if test="count($workunits[Instance!=$cluster])">
 
-                <xsl:call-template name="show-server">
 
-                    <xsl:with-param name="workunits" select="$workunits[Instance!=$cluster]"/>
 
-                </xsl:call-template>
 
-            </xsl:if>
 
-        </xsl:if>
 
-    </xsl:template>
 
-
 
     <xsl:template name="show-queue">
 
         <xsl:param name="workunits"/>
 
         <xsl:param name="cluster"/>
 
         <xsl:param name="clusterType" select="''"/>
 
         <xsl:param name="queue"/>
 
-        <xsl:param name="status" select="''"/>
 
-        <xsl:param name="status2" select="6"/>
 
+        <xsl:param name="clusterStatus" select="''"/>
 
+        <xsl:param name="queueStatus" select="''"/>
 
+        <xsl:param name="statusDetails" select="''"/>
 
+        <xsl:param name="warning" select="''"/>
 
         <xsl:param name="thorlcr" select="'0'"/>
 
         <xsl:variable name="showTitle">
 
             <xsl:choose>
 
@@ -703,16 +716,16 @@
 
         </xsl:variable>
 
         <xsl:variable name="showWarning">
 
             <xsl:choose>
 
+                <xsl:when test="$warning !=''">
 
+                    <xsl:value-of select="$warning"/>
 
+                </xsl:when>
 
                 <xsl:when test="$clusterType = 'DFUserver' or $clusterType = 'ECLCCserver' or $clusterType = 'ECLagent'">
 
                     <xsl:choose>
 
-                        <xsl:when test="$status='paused'"> Queue paused </xsl:when>
 
-                        <xsl:when test="$status='stopped'"> Queue stopped </xsl:when>
 
+                        <xsl:when test="$queueStatus='paused'"> Queue paused </xsl:when>
 
+                        <xsl:when test="$queueStatus='stopped'"> Queue stopped </xsl:when>
 
                         <xsl:otherwise></xsl:otherwise>
 
                     </xsl:choose>
 
                 </xsl:when>
 
-                <xsl:when test="($status2='1') or ($status2='2')"> Queue paused </xsl:when>
 
-                <xsl:when test="$status2='3'"> Queue paused - Cluster not attached </xsl:when>
 
-                <xsl:when test="$status2='5'"> Cluster not attached </xsl:when>
 
                 <xsl:otherwise></xsl:otherwise>
 
             </xsl:choose>
 
         </xsl:variable>
 
@@ -744,8 +757,8 @@
 
                 <td valign="top">
 
                     <xsl:if test="$accessRight = 'Access_Full'">
 
                         <xsl:variable name="popup">return queuePopup('<xsl:value-of select="$cluster"/>','<xsl:value-of select="$clusterType"/>',
 
-                            '<xsl:value-of select="$queue"/>',<xsl:value-of select="$status='paused'"/>,
 
-                            <xsl:value-of select="$status='stopped'"/>, '<xsl:value-of select="$q_rowid"/>');
 
+                            '<xsl:value-of select="$queue"/>',<xsl:value-of select="$queueStatus='paused'"/>,
 
+                            <xsl:value-of select="$queueStatus='stopped'"/>, '<xsl:value-of select="$q_rowid"/>');
 
                         </xsl:variable>
 
                         <a id="{$q_rowid}" class="configurecontextmenu" title="Option" onclick="{$popup}">&#160;</a>
 
                     </xsl:if>
 
@@ -753,11 +766,11 @@
 
                         <xsl:choose>
 
                             <xsl:when test="$clusterType = 'DFUserver' or $clusterType = 'ECLCCserver' or $clusterType = 'ECLagent'">
 
                                 <xsl:choose>
 
-                                    <xsl:when test="$status='paused'">
 
+                                    <xsl:when test="$queueStatus='paused'">
 
                                         <xsl:attribute name="class">thorrunningpausedqueuejobs</xsl:attribute>
 
                                         <xsl:attribute name="title">Queue paused</xsl:attribute>
 
                                     </xsl:when>
 
-                                    <xsl:when test="$status='stopped'">
 
+                                    <xsl:when test="$queueStatus='stopped'">
 
                                         <xsl:attribute name="class">thorrunningpausedqueuejobs</xsl:attribute>
 
                                         <xsl:attribute name="title">Queue stopped</xsl:attribute>
 
                                     </xsl:when>
 
@@ -767,28 +780,30 @@
 
                                     </xsl:otherwise>
 
                                 </xsl:choose>
 
                             </xsl:when>
 
-                            <xsl:when test="$status2='1'">
 
-                                <xsl:attribute name="class">thorrunningpausedqueuejobs</xsl:attribute>
 
-                                <xsl:attribute name="title">Queue paused - Cluster running</xsl:attribute>
 
-                            </xsl:when>
 
-                            <xsl:when test="$status2='2'">
 
-                                <xsl:attribute name="class">thorrunningpausedqueuenojobs</xsl:attribute>
 
-                                <xsl:attribute name="title">Queue paused - Cluster running (all jobs blocked?)</xsl:attribute>
 
-                            </xsl:when>
 
-                            <xsl:when test="$status2='3'">
 
-                                <xsl:attribute name="class">thorstoppedpausedqueuenojobs</xsl:attribute>
 
-                                <xsl:attribute name="title">Queue paused - Cluster not attached (NOC has stopped all ThorMasters on cluster)</xsl:attribute>
 
-                            </xsl:when>
 
-                            <xsl:when test="$status2='5'">
 
-                                <xsl:attribute name="class">thorstoppedrunningqueue</xsl:attribute>
 
-                                <xsl:attribute name="title">Queue running - Cluster not attached</xsl:attribute>
 
-                            </xsl:when>
 
                             <xsl:otherwise>
 
-                                <xsl:attribute name="class">thorrunning</xsl:attribute>
 
-                                <xsl:attribute name="title">Queue running - Cluster running</xsl:attribute>
 
+                                <xsl:choose>
 
+                                    <xsl:when test="$clusterStatus='1'">
 
+                                        <xsl:attribute name="class">thorrunningpausedqueuejobs</xsl:attribute>
 
+                                    </xsl:when>
 
+                                    <xsl:when test="$clusterStatus='2'">
 
+                                        <xsl:attribute name="class">thorrunningpausedqueuenojobs</xsl:attribute>
 
+                                    </xsl:when>
 
+                                    <xsl:when test="$clusterStatus='3'">
 
+                                        <xsl:attribute name="class">thorstoppedpausedqueuenojobs</xsl:attribute>
 
+                                    </xsl:when>
 
+                                    <xsl:when test="$clusterStatus='4'">
 
+                                        <xsl:attribute name="class">thorstoppedrunningqueue</xsl:attribute>
 
+                                    </xsl:when>
 
+                                    <xsl:otherwise>
 
+                                        <xsl:attribute name="class">thorrunning</xsl:attribute>
 
+                                    </xsl:otherwise>
 
+                                </xsl:choose>
 
+                                <xsl:attribute name="title">
 
+                                    <xsl:value-of select="$statusDetails"/>
 
+                                </xsl:attribute>
 
                             </xsl:otherwise>
 
                         </xsl:choose>
 
-                        <xsl:if test="string-length($status) and ($clusterType = 'THOR')">
 
+                        <xsl:if test="$clusterType = 'THOR'">
 
                             <xsl:attribute name="href">javascript:go('/WsTopology/TpClusterInfo?Name=<xsl:value-of select="$cluster"/>')</xsl:attribute>
 
                         </xsl:if>
 
                         <xsl:choose>
 
@@ -946,24 +961,31 @@
 
         <xsl:param name="queue" select="''"/>
 
         <xsl:param name="thorlcr" select="'0'"/>
 
 
-        <xsl:variable name="popupid"><xsl:value-of select="$clusterType"/>_<xsl:value-of select="Wuid"/></xsl:variable>
 
+        <xsl:variable name="popupid"><xsl:value-of select="$cluster"/>_<xsl:value-of select="Wuid"/></xsl:variable>
 
         <xsl:variable name="popup">
 
             <xsl:choose>
 
-                <xsl:when test="State='running'">
 
+                <xsl:when test="starts-with(State,'running')">
 
                     <xsl:choose>
 
                         <xsl:when test="$thorlcr='0' or $thorlcr='noLCR'">
 
-                            return activeWUPopup('noLCR', '<xsl:value-of select="$cluster"/>','<xsl:value-of select="$clusterType"/>','<xsl:value-of select="$queue"/>','<xsl:value-of select="Wuid"/>',<xsl:value-of select="Priority='high'"/>);
 
+                            return activeWUPopup('noLCR', '<xsl:value-of select="$cluster"/>','<xsl:value-of select="$clusterType"/>',
 
+                                '<xsl:value-of select="$queue"/>','<xsl:value-of select="Wuid"/>',<xsl:value-of select="Priority='high'"/>);
 
                         </xsl:when>
 
                         <xsl:otherwise>
 
-                            return activeWUPopup('LCR', '<xsl:value-of select="$cluster"/>','<xsl:value-of select="$clusterType"/>','<xsl:value-of select="$queue"/>','<xsl:value-of select="Wuid"/>',<xsl:value-of select="Priority='high'"/>);
 
+                            return activeWUPopup('LCR', '<xsl:value-of select="$cluster"/>','<xsl:value-of select="$clusterType"/>',
 
+                                '<xsl:value-of select="$queue"/>','<xsl:value-of select="Wuid"/>',<xsl:value-of select="Priority='high'"/>);
 
                         </xsl:otherwise>
 
                     </xsl:choose>
 
                 </xsl:when>
 
                 <xsl:when test="State='paused'">
 
-                    return activeWUPopup('paused', '<xsl:value-of select="$cluster"/>','<xsl:value-of select="$clusterType"/>','<xsl:value-of select="$queue"/>','<xsl:value-of select="Wuid"/>',<xsl:value-of select="Priority='high'"/>);
 
+                    return activeWUPopup('paused', '<xsl:value-of select="$cluster"/>','<xsl:value-of select="$clusterType"/>',
 
+                        '<xsl:value-of select="$queue"/>','<xsl:value-of select="Wuid"/>',<xsl:value-of select="Priority='high'"/>);
 
                 </xsl:when>
 
                 <xsl:when test="starts-with(State,'queued')">
 
-                    return queuedWUPopup('<xsl:value-of select="$cluster"/>','<xsl:value-of select="$clusterType"/>','<xsl:value-of select="$queue"/>','<xsl:value-of select="Wuid"/>',<xsl:value-of select="starts-with(preceding-sibling::*[Instance=current()/Instance][position()=1]/State,'queued')"/>,<xsl:value-of select="starts-with(following-sibling::*[Instance=current()/Instance][position()=1]/State,'queued')"/>,<xsl:value-of select="Priority='high'"/>);
 
+                    return queuedWUPopup('<xsl:value-of select="$cluster"/>','<xsl:value-of select="$clusterType"/>',
 
+                        '<xsl:value-of select="$queue"/>','<xsl:value-of select="AgentQueueName"/>','<xsl:value-of select="Wuid"/>',
 
+                        <xsl:value-of select="starts-with(preceding-sibling::*[Instance=current()/Instance][position()=1]/State,'queued')"/>,
 
+                        <xsl:value-of select="starts-with(following-sibling::*[Instance=current()/Instance][position()=1]/State,'queued')"/>,
 
+                        <xsl:value-of select="Priority='high'"/>);
 
                 </xsl:when>
 
             </xsl:choose>
 
         </xsl:variable>
 
@@ -979,7 +1001,7 @@
 
         </xsl:variable>
 
 
         <td class="{$active}">
 
-            <xsl:if test="$accessRight='Access_Full'">
 
+            <xsl:if test="$accessRight='Access_Full' and $popup != ''">
 
                 <a id="{$popupid}" class="configurecontextmenu" onclick="{$popup}">
 
                     &#160;
 
                 </a>
 
@@ -1042,9 +1064,6 @@
 
                     </xsl:if>
 
                 </xsl:otherwise>
 
             </xsl:choose>
 
-            <xsl:if test="$queue != QueueName">
 
-                <b> (on <xsl:value-of select="QueueName"/>)</b>
 
-            </xsl:if>
 
         </td>
 
         <td class="{$active}">
 
             <xsl:value-of select="Owner"/>&#160;

+ 20 - 4
esp/scm/ws_smc.ecm
View File 

@@ -42,6 +42,19 @@ ESPStruct ActiveWorkunit
 
     [min_ver("1.15")] ClusterName;
 
     [min_ver("1.15")] string ClusterType;
 
     [min_ver("1.15")] string ClusterQueueName;
 
+    [min_ver("1.16")] string TargetClusterName;
 
+};
 
+
 
+ESPStruct TargetCluster
 
+{
 
+    string ClusterName;
 
+    string QueueName;
 
+    string QueueStatus;
 
+    string StatusDetails;
 
+    string Warning;
 
+    int ClusterType;
 
+    int ClusterSize;
 
+    int ClusterStatus;
 
 };
 
 
 ESPStruct ThorCluster
 
@@ -112,9 +125,12 @@ ESPrequest [nil_remove] ActivityRequest
 
 ESPresponse [exceptions_inline] ActivityResponse
 
 {
 
     string Build;
 
-    ESParray<ESPstruct ThorCluster> ThorClusters;
 
-    [min_ver("1.07")] ESParray<ESPstruct RoxieCluster> RoxieClusters;
 
-    [min_ver("1.12")] ESParray<ESPstruct HThorCluster> HThorClusters;
 
+    [depr_ver("1.16")] ESParray<ESPstruct ThorCluster> ThorClusters;
 
+    [min_ver("1.07"), depr_ver("1.16")] ESParray<ESPstruct RoxieCluster> RoxieClusters;
 
+    [min_ver("1.12"), depr_ver("1.16")] ESParray<ESPstruct HThorCluster> HThorClusters;
 
+    [min_ver("1.16")] ESParray<ESPstruct TargetCluster> ThorClusterList;
 
+    [min_ver("1.16")] ESParray<ESPstruct TargetCluster> RoxieClusterList;
 
+    [min_ver("1.16")] ESParray<ESPstruct TargetCluster> HThorClusterList;
 
     ESParray<ESPstruct DFUJob> DFUJobs;
 
     ESParray<ESPstruct ActiveWorkunit> Running;
 
     [min_ver("1.06")] string BannerContent;
 
@@ -303,7 +319,7 @@ RoxieControlCmdResponse
 
     ESParray<ESPstruct RoxieControlEndpointInfo, Endpoint> Endpoints;
 
 };
 
 
-ESPservice [noforms, version("1.15"), default_client_version("1.15"), exceptions_inline("./smc_xslt/exceptions.xslt"), use_method_name] WsSMC
 
+ESPservice [noforms, version("1.16"), default_client_version("1.16"), exceptions_inline("./smc_xslt/exceptions.xslt"), use_method_name] WsSMC
 
 {
 
     ESPmethod Index(SMCIndexRequest, SMCIndexResponse);
 
     ESPmethod [resp_xsl_default("/esp/xslt/index.xslt")] Activity(ActivityRequest, ActivityResponse);

File diff suppressed because it is too large
+ 929 - 345
esp/services/ws_smc/ws_smcService.cpp


+ 66 - 1
esp/services/ws_smc/ws_smcService.hpp
View File 

@@ -32,6 +32,49 @@ enum BulletType
 
     bulletError = 5
 
 };
 
 
+enum ClusterStatusType
 
+{
 
+    RunningNormal = 0,
 
+    QueuePausedOrStoppedWithJobs = 1,
 
+    QueuePausedOrStoppedWithNoJob = 2,
 
+    QueuePausedOrStoppedNotFound = 3,
 
+    QueueRunningNotFound = 4
 
+};
 
+
 
+class CWsSMCQueue
 
+{
 
+public:
 
+    SCMStringBuffer queueName;
 
+    StringBuffer queueState;
 
+    bool foundQueueInStatusServer;
 
+    unsigned countRunningJobs;
 
+    unsigned countQueuedJobs;
 
+    ClusterStatusType statusType;
 
+
 
+    CWsSMCQueue(bool foundQueue = false): countRunningJobs(0), countQueuedJobs(0), statusType(RunningNormal)
 
+    {
 
+        foundQueueInStatusServer = foundQueue;
 
+    }
 
+    virtual ~CWsSMCQueue(){};
 
+};
 
+
 
+class CWsSMCTargetCluster
 
+{
 
+public:
 
+    ClusterType clusterType;
 
+    SCMStringBuffer clusterName;
 
+    SCMStringBuffer statusServerName;
 
+    StringBuffer clusterStatus;
 
+    StringBuffer clusterStatusDetails;
 
+    StringBuffer queueStatus;
 
+    CWsSMCQueue clusterQueue;
 
+    CWsSMCQueue agentQueue;
 
+    CWsSMCQueue serverQueue;
 
+
 
+    CWsSMCTargetCluster(){};
 
+    virtual ~CWsSMCTargetCluster(){};
 
+};
 
+
 
 class CWsSMCEx : public CWsSMC
 
 {
 
     long m_counter;
 
@@ -71,7 +114,6 @@ public:
 
 
     virtual bool onBrowseResources(IEspContext &context, IEspBrowseResourcesRequest & req, IEspBrowseResourcesResponse & resp);
 
     virtual bool onRoxieControlCmd(IEspContext &context, IEspRoxieControlCmdRequest &req, IEspRoxieControlCmdResponse &resp);
 
-
 
 private:
 
     void addCapabilities( IPropertyTree* pFeatureNode, const char* access, 
                                  IArrayOf<IEspCapability>& capabilities);
 
@@ -84,6 +126,29 @@ private:
 
     void addRunningWUs(IEspContext &context, IPropertyTree& node, CConstWUClusterInfoArray& clusters,
 
                    IArrayOf<IEspActiveWorkunit>& aws, BoolHash& uniqueWUIDs,
 
                    StringArray& runningQueueNames, int* runningJobsInQueue);
 
+    void readBannerAndChatRequest(IEspContext& context, IEspActivityRequest &req, IEspActivityResponse& resp);
 
+    void setBannerAndChatData(double version, IEspActivityResponse& resp);
 
+    void getServersAndWUs(IEspContext &context, IEspActivityRequest &req, IEspActivityResponse& resp, double version,
 
+        IPropertyTree* envRoot, CConstWUClusterInfoArray& clusters);
 
+
 
+    void sortTargetClusters(IArrayOf<IEspTargetCluster>& clusters, const char* sortBy, bool descending);
 
+    void createActiveWorkUnit(Owned<IEspActiveWorkunit>& ownedWU, IEspContext &context, const char* wuid, const char* location,
 
+    unsigned index, const char* serverName, const char* queueName, const char* instanceName, const char* targetClusterName);
 
+    void readDFUWUs(IEspContext &context, const char* queueName, const char* serverName, IArrayOf<IEspActiveWorkunit>& aws);
 
+    void readRunningWUsOnServerNode(IEspContext& context, IPropertyTree& serverStatusNode, const char* targetClusterName,
 
+         unsigned& runningJobsInQueue, BoolHash& uniqueWUIDs, IArrayOf<IEspActiveWorkunit>& aws);
 
+    void readRunningWUsOnECLAgent(IEspContext& context, IPropertyTreeIterator* itStatusECLagent, CConstWUClusterInfoArray& clusters,
 
+         CWsSMCTargetCluster& targetCluster, BoolHash& uniqueWUIDs, IArrayOf<IEspActiveWorkunit>& aws);
 
+    void readWUsAndStateFromJobQueue(IEspContext& context, CWsSMCTargetCluster& targetCluster, CWsSMCQueue& queue, const char* listQueue, IArrayOf<IEspActiveWorkunit>& aws);
 
+    void addToTargetClusterList(IArrayOf<IEspTargetCluster>& clusters, IEspTargetCluster* cluster, const char* sortBy, bool descending);
 
+    bool foundQueueInStatusServer(IEspContext& context, IPropertyTree* serverStatusRoot, const char* serverName, const char* processName, const char* processExt);
 
+    void setClusterQueueStatus(CWsSMCTargetCluster& targetCluster);
 
+    void setClusterStatus(IEspContext& context, CWsSMCTargetCluster& targetCluster, IEspTargetCluster* returnCluster);
 
+    void getTargetClusterAndWUs(IEspContext& context, CConstWUClusterInfoArray& clusters, IConstWUClusterInfo& cluster,
 
+         IPropertyTree* serverStatusRoot, IPropertyTreeIterator* itStatusECLagent, IEspTargetCluster* returnCluster, IArrayOf<IEspActiveWorkunit>& aws);
 
+    void getWUsNotOnTargetCluster(IEspContext &context, IPropertyTree* serverStatusRoot, IArrayOf<IEspServerJobQueue>& serverJobQueues, IArrayOf<IEspActiveWorkunit>& aws);
 
+    void getDFUServersAndWUs(IEspContext &context, IPropertyTree* envRoot, IArrayOf<IEspServerJobQueue>& serverJobQueues, IArrayOf<IEspActiveWorkunit>& aws);
 
+    void getDFURecoveryJobs(IEspContext &context, IArrayOf<IEspDFUJob>& jobs);
 
 };