diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java index d3ed5032363..2fdd9d3417e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/DelegationTokenRenewer.java @@ -472,6 +472,11 @@ private void handleAppSubmitEvent(AbstractDelegationTokenRenewerAppEvent evt) tokenConf = evt.tokenConf; LOG.info("Using app provided token conf for renewal," + " number of configs = " + tokenConf.size()); + for (Map.Entry entry : getConfig()) { + if (tokenConf.get(entry.getKey()) == null) { + tokenConf.set(entry.getKey(), entry.getValue()); + } + } if (LOG.isDebugEnabled()) { for (Iterator> itor = tokenConf.iterator(); itor.hasNext(); ) {