commit c5512ac1dc359446cf9bb27210cfee3ed5c95ab9 Author: Eric Yang Date: Mon Jan 7 17:21:22 2019 -0500 YARN-6695. Workaround patch for handling NullPointerException in Timeline service publisher. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java index 95d75b2..6b6ba05 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/metrics/TimelineServiceV2Publisher.java @@ -461,7 +461,7 @@ private void putEntity(TimelineEntity entity, ApplicationId appId) { entities.addEntity(entity); timelineCollector.putEntities(entities, UserGroupInformation.getCurrentUser()); - } catch (IOException e) { + } catch (IOException | NullPointerException e) { LOG.error("Error when publishing entity " + entity); if (LOG.isDebugEnabled()) { LOG.debug("Error when publishing entity " + entity, e);