You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/09/09 07:24:22 UTC

[1/3] git commit: SLIDER-409 AgentProviderService#publishLogFolderPaths() makes inefficient use of keySet iterator

Repository: incubator-slider
Updated Branches:
  refs/heads/feature/slider_install_package 804788c33 -> 65d17d844


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_install_package
Commit: 1d083aee68cb989e7e61913398a46729caed3a05
Parents: bff5ed6
Author: tedyu <yu...@gmail.com>
Authored: Mon Sep 8 17:14:21 2014 -0700
Committer: tedyu <yu...@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");


[3/3] git commit: Merge branch 'feature/slider_install_package' into develop

Posted by sm...@apache.org.
Merge branch 'feature/slider_install_package' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/65d17d84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/65d17d84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/65d17d84

Branch: refs/heads/feature/slider_install_package
Commit: 65d17d84487594939a904aeefc1b6f85464c35f0
Parents: f6d7917 804788c
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Sep 8 22:18:03 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Sep 8 22:18:03 2014 -0700

----------------------------------------------------------------------
 .../org/apache/slider/client/SliderClient.java  |  60 +++++--
 .../org/apache/slider/common/SliderKeys.java    |   2 +
 .../common/params/AbstractActionArgs.java       |   3 +-
 .../common/params/ActionInstallPackageArgs.java |  58 +++++++
 .../apache/slider/common/params/Arguments.java  |   1 +
 .../apache/slider/common/params/ClientArgs.java |  12 +-
 .../slider/common/params/SliderActions.java     |   2 +
 .../slider/common/tools/CoreFileSystem.java     |  12 ++
 .../actions/TestActionInstallPackage.groovy     | 157 +++++++++++++++++++
 9 files changed, 295 insertions(+), 12 deletions(-)
----------------------------------------------------------------------



[2/3] git commit: SLIDER-411 Correct error message when property whose name starts with 'yarn.' is encountered in template

Posted by sm...@apache.org.
SLIDER-411 Correct error message when property whose name starts with 'yarn.' is encountered in template


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f6d7917d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f6d7917d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f6d7917d

Branch: refs/heads/feature/slider_install_package
Commit: f6d7917d250509bd751164a891ef43f770243327
Parents: 1d083ae
Author: tedyu <yu...@gmail.com>
Authored: Mon Sep 8 20:50:10 2014 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Mon Sep 8 20:50:10 2014 -0700

----------------------------------------------------------------------
 .../apache/slider/core/conf/TemplateInputPropertiesValidator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f6d7917d/slider-core/src/main/java/org/apache/slider/core/conf/TemplateInputPropertiesValidator.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/conf/TemplateInputPropertiesValidator.java b/slider-core/src/main/java/org/apache/slider/core/conf/TemplateInputPropertiesValidator.java
index 5494174..aad2757 100644
--- a/slider-core/src/main/java/org/apache/slider/core/conf/TemplateInputPropertiesValidator.java
+++ b/slider-core/src/main/java/org/apache/slider/core/conf/TemplateInputPropertiesValidator.java
@@ -27,7 +27,7 @@ public class TemplateInputPropertiesValidator
   void validatePropertyNamePrefix(String key) throws BadConfigException {
     if (key.startsWith("yarn.")) {
       throw new BadConfigException(
-          "argument %s does not have 'yarn.' prefix", key);
+          "argument %s has 'yarn.' prefix - this is not allowed in templates", key);
     }
   }