include spot requests which are internally tracked only into the pend…

…ingCapcity info
taskcluster · Aug 23, 2016 · 384837e · 384837e
1 parent 82ede01
commit 384837e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/api-v1.js b/src/api-v1.js
@@ -92,10 +92,6 @@ function workerTypeSummary(workerType, workerState) {
  } // note that other states are ignored
  });
 
- workerState.requests.forEach(request => {
- summary.requestedCapacity += capacities[request.type] || 0;
- });
-
  return summary;
 }
 

diff --git a/src/aws-manager.js b/src/aws-manager.js
@@ -1488,7 +1488,6 @@ class AwsManager {
  stateForStorage(workerName) {
  let instances = [];
  let requests = [];
- let internalTrackedRequests = [];
 
  for (let instance of this.__apiState.instances) {
  if (instance.WorkerType === workerName) {
@@ -1514,20 +1513,22 @@ class AwsManager {
  region: request.Region,
  zone: request.LaunchSpecification.Placement.AvailabilityZone,
  time: request.CreateTime,
+ visibleToEC2Api: true,
  status: request.Status.Code,
  });
  }
  }
 
  for (let request of this.__internalState) {
  if (request.WorkerType === workerName) {
- internalTrackedRequests.push({
+ requests.push({
  id: request.SpotInstanceRequestId,
  ami: request.LaunchSpecification.ImageId,
  type: request.LaunchSpecification.InstanceType,
  region: request.Region,
  zone: request.LaunchSpecification.Placement.AvailabilityZone,
  time: request.CreateTime,
+ visibleToEC2Api: false,
  status: request.Status.Code,
  });
  }
@@ -1537,7 +1538,6 @@ class AwsManager {
  workerType: workerName,
  instances,
  requests,
- internalTrackedRequests,
  };
  }
 }