From 6aec13cb338b0fe62ca915f78aa729c9b0b86fba Mon Sep 17 00:00:00 2001 From: Robert Kanter Date: Fri, 29 May 2015 15:34:37 -0700 Subject: [PATCH] YARN-3713. Remove duplicate function call storeContainerDiagnostics in ContainerDiagnosticsUpdateTransition (zxu via rkanter) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../containermanager/container/ContainerImpl.java | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 962d7bae33..5e53726ea6 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -280,6 +280,9 @@ Release 2.8.0 - UNRELEASED YARN-3722. Merge multiple TestWebAppUtils into o.a.h.yarn.webapp.util.TestWebAppUtils. (Masatake Iwasaki via devaraj) + YARN-3713. Remove duplicate function call storeContainerDiagnostics in + ContainerDiagnosticsUpdateTransition (zxu via rkanter) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java index 9997ca2ac8..289d6d05ce 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/container/ContainerImpl.java @@ -1105,13 +1105,6 @@ public class ContainerImpl implements Container { ContainerDiagnosticsUpdateEvent updateEvent = (ContainerDiagnosticsUpdateEvent) event; container.addDiagnostics(updateEvent.getDiagnosticsUpdate(), "\n"); - try { - container.stateStore.storeContainerDiagnostics(container.containerId, - container.diagnostics); - } catch (IOException e) { - LOG.warn("Unable to update state store diagnostics for " - + container.containerId, e); - } } }