Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 74E8E200C42 for ; Fri, 10 Mar 2017 21:46:36 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 73A95160B67; Fri, 10 Mar 2017 20:46:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B8D86160B85 for ; Fri, 10 Mar 2017 21:46:35 +0100 (CET) Received: (qmail 66930 invoked by uid 500); 10 Mar 2017 20:46:29 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 66659 invoked by uid 99); 10 Mar 2017 20:46:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Mar 2017 20:46:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 96FC9DFFD8; Fri, 10 Mar 2017 20:46:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oleewere@apache.org To: commits@ambari.apache.org Date: Fri, 10 Mar 2017 20:46:34 -0000 Message-Id: <2954e4643f5043b5a7b2d17d75030ab4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/50] ambari git commit: AMBARI-20288. Cluster deployment using blueprint with empty configuration doesn't work with stack advisor enabled (Amruta Borkar via alejandro) archived-at: Fri, 10 Mar 2017 20:46:36 -0000 AMBARI-20288. Cluster deployment using blueprint with empty configuration doesn't work with stack advisor enabled (Amruta Borkar via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dd0bf23f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dd0bf23f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dd0bf23f Branch: refs/heads/branch-dev-logsearch Commit: dd0bf23f1c12624f378ad25be6f74d2d1ad2dee8 Parents: 8d3d07a Author: Alejandro Fernandez Authored: Wed Mar 8 16:56:31 2017 -0800 Committer: Alejandro Fernandez Committed: Wed Mar 8 16:56:31 2017 -0800 ---------------------------------------------------------------------- .../internal/BlueprintConfigurationProcessor.java | 5 +++-- .../internal/BlueprintConfigurationProcessorTest.java | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/dd0bf23f/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 d4880b9..5732a1c 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 @@ -638,8 +638,9 @@ public class BlueprintConfigurationProcessor { for (Map.Entry valueAttrEntry : advisedConfig.getPropertyValueAttributes().entrySet()) { if ("true".equalsIgnoreCase(valueAttrEntry.getValue().getDelete())) { - configuration.removeProperty(configType, valueAttrEntry.getKey()); - configTypesUpdated.add(configType); + if(null != configuration.removeProperty(configType, valueAttrEntry.getKey())) { + configTypesUpdated.add(configType); + } } } } http://git-wip-us.apache.org/repos/asf/ambari/blob/dd0bf23f/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java index 928d1e0..d160050 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java @@ -6352,6 +6352,8 @@ public class BlueprintConfigurationProcessorTest { Map dummySiteMap = new HashMap(); properties.put("dummy-site", dummySiteMap); dummySiteMap.put("dummy.prop", "dummyValue"); + Map dummy2SiteMap = new HashMap(); + properties.put("dummy2-site", dummy2SiteMap); Map> parentProperties = new HashMap>(); @@ -6389,8 +6391,9 @@ public class BlueprintConfigurationProcessorTest { assertNull(clusterConfig.getPropertyValue("core-site", "fs.stackDefault.key2")); // verify that fs.notStackDefault is not filtered out assertNotNull(clusterConfig.getPropertyValue("core-site", "fs.notStackDefault")); - assertEquals(2, topology.getAdvisedConfigurations().size()); + assertEquals(3, topology.getAdvisedConfigurations().size()); assertFalse(configTypes.contains("dummy-site")); + assertFalse(configTypes.contains("dummy2-site")); } @Test @@ -7981,6 +7984,11 @@ public class BlueprintConfigurationProcessorTest { Map dummyConfProp = new HashMap(); dummyConfProp.put("dummy.prop", "dummyValue"); advMap.put("dummy-site", new AdvisedConfiguration(dummyConfProp, new HashMap())); + Map dummy2attrMap = new HashMap(); + ValueAttributesInfo dummy2valInfo = new ValueAttributesInfo(); + dummy2valInfo.setDelete("true"); + dummy2attrMap.put("dummy2.property", dummy2valInfo); + advMap.put("dummy2-site", new AdvisedConfiguration(new HashMap(), dummy2attrMap)); return advMap; }