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 21151002af9..c09c7f1ac2c 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 @@ -2191,7 +2191,8 @@ private static void removeDockerContainer(ContainerImpl container) { } private void storeRetryContext() { - if (windowRetryContext.getRestartTimes() != null) { + if (windowRetryContext.getRestartTimes() != null && + !windowRetryContext.getRestartTimes().isEmpty()) { try { stateStore.storeContainerRestartTimes(containerId, windowRetryContext.getRestartTimes());