|
@@ -105,6 +105,7 @@ import org.apache.hadoop.net.NetUtils;
|
|
|
import org.apache.hadoop.security.Credentials;
|
|
|
import org.apache.hadoop.security.UserGroupInformation;
|
|
|
import org.apache.hadoop.security.token.Token;
|
|
|
+import org.apache.hadoop.util.StringInterner;
|
|
|
import org.apache.hadoop.util.StringUtils;
|
|
|
import org.apache.hadoop.yarn.Clock;
|
|
|
import org.apache.hadoop.yarn.YarnException;
|
|
@@ -940,7 +941,6 @@ public abstract class TaskAttemptImpl implements
|
|
|
Counters counters = reportedStatus.counters;
|
|
|
if (counters == null) {
|
|
|
counters = EMPTY_COUNTERS;
|
|
|
-// counters.groups = new HashMap<String, CounterGroup>();
|
|
|
}
|
|
|
return counters;
|
|
|
} finally {
|
|
@@ -1262,9 +1262,10 @@ public abstract class TaskAttemptImpl implements
|
|
|
(TaskAttemptContainerAssignedEvent) event;
|
|
|
taskAttempt.containerID = cEvent.getContainer().getId();
|
|
|
taskAttempt.containerNodeId = cEvent.getContainer().getNodeId();
|
|
|
- taskAttempt.containerMgrAddress = taskAttempt.containerNodeId
|
|
|
- .toString();
|
|
|
- taskAttempt.nodeHttpAddress = cEvent.getContainer().getNodeHttpAddress();
|
|
|
+ taskAttempt.containerMgrAddress = StringInterner.weakIntern(
|
|
|
+ taskAttempt.containerNodeId.toString());
|
|
|
+ taskAttempt.nodeHttpAddress = StringInterner.weakIntern(
|
|
|
+ cEvent.getContainer().getNodeHttpAddress());
|
|
|
taskAttempt.nodeRackName = RackResolver.resolve(
|
|
|
taskAttempt.containerNodeId.getHost()).getNetworkLocation();
|
|
|
taskAttempt.containerToken = cEvent.getContainer().getContainerToken();
|
|
@@ -1710,7 +1711,6 @@ public abstract class TaskAttemptImpl implements
|
|
|
result.stateString = "NEW";
|
|
|
result.taskState = TaskAttemptState.NEW;
|
|
|
Counters counters = EMPTY_COUNTERS;
|
|
|
- // counters.groups = new HashMap<String, CounterGroup>();
|
|
|
result.counters = counters;
|
|
|
}
|
|
|
|