From 0bdf771f8c7d94df523ec381c4a92f5517e83dc9 Mon Sep 17 00:00:00 2001 From: Sandesh Hegde Date: Fri, 30 Sep 2016 16:09:15 -0700 Subject: [PATCH] APEXCORE-543 ContainerInfo will contain Map of operators, with Key representing Id and Value representing name. --- .../com/datatorrent/stram/StreamingContainerAgent.java | 7 +++++++ .../java/com/datatorrent/stram/webapp/ContainerInfo.java | 3 +++ 2 files changed, 10 insertions(+) diff --git a/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java b/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java index 13a1000610..2ea37f4ca3 100644 --- a/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java +++ b/engine/src/main/java/com/datatorrent/stram/StreamingContainerAgent.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import java.util.concurrent.ConcurrentLinkedQueue; import org.slf4j.Logger; @@ -450,6 +451,12 @@ public ContainerInfo getContainerInfo() ci.state = container.getState().name(); ci.jvmName = this.jvmName; ci.numOperators = container.getOperators().size(); + ci.operators = new TreeMap<>(); + + for (PTOperator ptOperator : container.getOperators()) { + ci.operators.put(ptOperator.getId(), ptOperator.getName()); + } + ci.memoryMBAllocated = container.getAllocatedMemoryMB(); ci.lastHeartbeat = lastHeartbeatMillis; ci.memoryMBFree = this.memoryMBFree; diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/ContainerInfo.java b/engine/src/main/java/com/datatorrent/stram/webapp/ContainerInfo.java index 4696fb6b41..ea124eb4ef 100644 --- a/engine/src/main/java/com/datatorrent/stram/webapp/ContainerInfo.java +++ b/engine/src/main/java/com/datatorrent/stram/webapp/ContainerInfo.java @@ -18,6 +18,8 @@ */ package com.datatorrent.stram.webapp; +import java.util.Map; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; @@ -43,6 +45,7 @@ public class ContainerInfo public long lastHeartbeat; @RecordField(type = "stats") public int numOperators; + public Map operators; @RecordField(type = "meta") public int memoryMBAllocated; @RecordField(type = "stats")