You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/09/21 19:57:37 UTC
[3/3] ambari git commit: AMBARI-13152. [Upgrade] Check CONFIG_MERGE
failed error message is consistently reported in ambari-server log
(dlysnichenko)
AMBARI-13152. [Upgrade] Check CONFIG_MERGE failed error message is consistently reported in ambari-server log (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d278ed1a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d278ed1a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d278ed1a
Branch: refs/heads/trunk
Commit: d278ed1a2c61653aab10ea43e4d13bf37a0b8ec2
Parents: 4e39212
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Sep 21 20:56:04 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Sep 21 20:57:06 2015 +0300
----------------------------------------------------------------------
.../org/apache/ambari/server/state/ConfigMergeHelper.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d278ed1a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
index 9a2c604..0610137 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigMergeHelper.java
@@ -116,7 +116,6 @@ public class ConfigMergeHelper {
}
}
-
Collection<String> common = CollectionUtils.intersection(newPairs.keySet(),
oldPairs.keySet());
@@ -128,7 +127,11 @@ public class ConfigMergeHelper {
savedVal = config.getProperties().get(prop);
}
- if (!newStackVal.equals(savedVal) &&
+ // If values are not defined in stack (null), we skip them
+ // Or if values in old stack and in new stack are the same, and value
+ // in current config is different, skip it
+ if (!(newStackVal == null && oldStackVal == null)
+ && !newStackVal.equals(savedVal) &&
(!oldStackVal.equals(newStackVal) || !oldStackVal.equals(savedVal))) {
ThreeWayValue twv = new ThreeWayValue();
twv.oldStackValue = normalizeValue(savedVal, oldStackVal.trim());