ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject ambari git commit: AMBARI-9703. Cannot apply new property set for slider-client through api (aonishuk)
Date Thu, 19 Feb 2015 15:42:59 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk cbac6ba25 -> 205666cfe


AMBARI-9703. Cannot apply new property set for slider-client through api (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/205666cf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/205666cf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/205666cf

Branch: refs/heads/trunk
Commit: 205666cfe1081905ec1830bed5a02821b29e0abf
Parents: cbac6ba
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Thu Feb 19 17:42:45 2015 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Thu Feb 19 17:42:45 2015 +0200

----------------------------------------------------------------------
 .../apache/ambari/server/state/cluster/ClusterImpl.java  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/205666cf/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index 765167e..8589182 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -301,14 +301,9 @@ public class ClusterImpl implements Cluster {
     for (Entry<String, ServiceInfo> entry : serviceInfoMap.entrySet()) {
       String serviceName = entry.getKey();
       ServiceInfo serviceInfo = entry.getValue();
-      //collect config types for service
-      Set<PropertyInfo> properties = ambariMetaInfo.getServiceProperties(desiredStackVersion.getStackName(),
-          desiredStackVersion.getStackVersion(), serviceName);
-      for (PropertyInfo property : properties) {
-        String configType = ConfigHelper.fileNameToConfigType(property.getFilename());
-        if (serviceInfo.hasConfigType(configType)) {
-          serviceConfigTypes.put(serviceName, configType);
-        }
+      Set<String> configTypes = serviceInfo.getConfigTypeAttributes().keySet();
+      for (String configType : configTypes) {
+        serviceConfigTypes.put(serviceName, configType);
       }
     }
 


Mime
View raw message