SLIDER-409 AgentProviderService#publishLogFolderPaths() makes inefficient use of keySet iterator
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1d083aee Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1d083aee Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1d083aee Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 1d083aee68cb989e7e61913398a46729caed3a05 Parents: bff5ed6 Author: tedyu <yuzhih...@gmail.com> Authored: Mon Sep 8 17:14:21 2014 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Mon Sep 8 17:14:21 2014 -0700 ---------------------------------------------------------------------- .../slider/providers/agent/AgentProviderService.java | 10 ++++++---- .../services/security/FsDelegationTokenManager.java | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d083aee/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index 063e61c..9d1df61 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -840,8 +840,9 @@ public class AgentProviderService extends AbstractProviderService implements */ protected void publishLogFolderPaths( Map<String, String> folders, String containerId, String roleName, String hostFqdn) { - for (String key : folders.keySet()) { - workFolders.put(String.format("%s->%s->%s->%s", roleName, hostFqdn, key, containerId), folders.get(key)); + for (Map.Entry<String, String> entry: folders.entrySet()) { + workFolders.put(String.format("%s->%s->%s->%s", roleName, hostFqdn, entry.getKey(), containerId), + entry.getValue()); } publishApplicationInstanceData(LOG_FOLDERS_TAG, LOG_FOLDERS_TAG, @@ -1392,8 +1393,9 @@ public class AgentProviderService extends AbstractProviderService implements for (String configType : configurations.keySet()) { Map<String, String> configBucket = configurations.get(configType); - for (String configName : configBucket.keySet()) { - String configValue = configBucket.get(configName); + for (Map.Entry<String, String> entry: configBucket.entrySet()) { + String configName = entry.getKey(); + String configValue = entry.getValue(); for (String lookUpKey : allConfigs.keySet()) { if (configValue != null && configValue.contains(lookUpKey)) { configValue = configValue.replace(lookUpKey, allConfigs.get(lookUpKey)); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d083aee/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java b/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java index 8f0de3d..15d858c 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/security/FsDelegationTokenManager.java @@ -215,6 +215,7 @@ public class FsDelegationTokenManager { throw new IOException("addDelegationTokens returned no tokens"); } token = findMatchingToken(service, tokens); + if (token == null) throw new IOException("Can't get new delegation token "); currentUser.addToken(token.getService(), token); log.info("Expired HDFS delegation token replaced and added as credential to current user");
