Browse Source

Merge pull request #8481 from miguelvazq/HPCC-14170

HPCC-14170 Pausing ECLCC, ECLServer throws error

Reviewed-By: Gordon Smith <gordon.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 years ago
parent
commit
a5e822c11b
2 changed files with 20 additions and 4 deletions
  1. 10 0
      esp/src/eclwatch/ActivityWidget.js
  2. 10 4
      esp/src/eclwatch/ESPQueue.js

+ 10 - 0
esp/src/eclwatch/ActivityWidget.js

@@ -61,6 +61,11 @@ define([
                         context._refreshActionState();
                     });
                 }
+                if (item.ServerType === "ECLserver" || "ECLCCserver") {
+                    setTimeout(function() {
+                        context.refreshGrid();
+                    }, 100);
+                }
             }, this);
         },
 
@@ -72,6 +77,11 @@ define([
                         context._refreshActionState();
                     });
                 }
+                if (item.ServerType === "ECLserver" || "ECLCCserver") {
+                    setTimeout(function() {
+                        context.refreshGrid();
+                    }, 100);
+                }
             }, this);
         },
 

+ 10 - 4
esp/src/eclwatch/ESPQueue.js

@@ -50,9 +50,11 @@ define([
             var context = this;
             return WsSMC.PauseQueue({
                 request: {
+                    ClusterType: this.ServerType,
                     QueueName: this.QueueName,
                     Cluster: this.ClusterName,
-                    ServerType: this.ServerType
+                    ServerType: this.ServerType,
+                    NetworkAddress: this.NetworkAddress
                 }
             }).then(function (response) {
                 context.refresh();
@@ -63,9 +65,11 @@ define([
             var context = this;
             return WsSMC.ResumeQueue({
                 request: {
+                    ClusterType: this.ServerType,
                     QueueName: this.QueueName,
                     Cluster: this.ClusterName,
-                    ServerType: this.ServerType
+                    ServerType: this.ServerType,
+                    NetworkAddress: this.NetworkAddress
                 }
             }).then(function (response) {
                 context.refresh();
@@ -207,7 +211,8 @@ define([
             return WsSMC.GetStatusServerInfo({
                 request: {
                     ServerName: this.ClusterName,
-                    ServerType: this.ServerType
+                    ServerType: this.ServerType,
+                    NetworkAddress: this.NetworkAddress
                 }
             }).then(function (response) {
                 if (lang.exists("GetStatusServerInfoResponse.StatusServerInfo.TargetClusterInfo", response)) {
@@ -282,7 +287,8 @@ define([
             return WsSMC.GetStatusServerInfo({
                 request: {
                     ServerName: this.ServerName,
-                    ServerType: this.ServerType
+                    ServerType: this.ServerType,
+                    NetworkAddress: this.NetworkAddress
                 }
             }).then(function (response) {
                 if (lang.exists("GetStatusServerInfoResponse.StatusServerInfo.ServerInfo", response)) {