You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/12/08 13:26:18 UTC
[1/2] ambari git commit: AMBARI-14264. Some component fails to start
at single node cluster via Blueprint when AMS is not on cluster (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 4b73b29ad -> 5c081ed22
refs/heads/trunk 67e0b5094 -> 139764681
AMBARI-14264. Some component fails to start at single node cluster via Blueprint when AMS is not on cluster (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/13976468
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/13976468
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/13976468
Branch: refs/heads/trunk
Commit: 139764681b49706c2f2919d0d0903185ca4bc64d
Parents: 67e0b50
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Dec 8 14:26:14 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Dec 8 14:26:14 2015 +0200
----------------------------------------------------------------------
.../controller/internal/BlueprintConfigurationProcessor.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/13976468/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 467889a..b3e99b1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -245,6 +245,10 @@ public class BlueprintConfigurationProcessor {
final String originalValue = typeMap.get(propertyName);
final String updatedValue =
updater.updateForClusterCreate(propertyName, originalValue, clusterProps, clusterTopology);
+
+ if(updatedValue == null ) {
+ continue;
+ }
if (!updatedValue.equals(originalValue)) {
configTypesUpdated.add(type);
[2/2] ambari git commit: AMBARI-14264. Some component fails to start
at single node cluster via Blueprint when AMS is not on cluster (aonishuk)
Posted by ao...@apache.org.
AMBARI-14264. Some component fails to start at single node cluster via Blueprint when AMS is not on cluster (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c081ed2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c081ed2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c081ed2
Branch: refs/heads/branch-2.2
Commit: 5c081ed22b568d204acb6e7c54785e7ecbf8e659
Parents: 4b73b29
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Tue Dec 8 14:26:17 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Tue Dec 8 14:26:17 2015 +0200
----------------------------------------------------------------------
.../controller/internal/BlueprintConfigurationProcessor.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c081ed2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 5353646..815a109 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -244,6 +244,10 @@ public class BlueprintConfigurationProcessor {
final String originalValue = typeMap.get(propertyName);
final String updatedValue =
updater.updateForClusterCreate(propertyName, originalValue, clusterProps, clusterTopology);
+
+ if(updatedValue == null ) {
+ continue;
+ }
if (!updatedValue.equals(originalValue)) {
configTypesUpdated.add(type);