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 67FE4200CEB for ; Fri, 7 Jul 2017 16:57:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 66C8D16945B; Fri, 7 Jul 2017 14:57:54 +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 77CEE169455 for ; Fri, 7 Jul 2017 16:57:53 +0200 (CEST) Received: (qmail 82365 invoked by uid 500); 7 Jul 2017 14:57:51 -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 82000 invoked by uid 99); 7 Jul 2017 14:57:50 -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, 07 Jul 2017 14:57:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 97301F551B; Fri, 7 Jul 2017 14:57:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ababiichuk@apache.org To: commits@ambari.apache.org Date: Fri, 07 Jul 2017 14:57:49 -0000 Message-Id: <3b228f1e37d7482fa5c28ac908f6aba7@git.apache.org> In-Reply-To: <82c0e00da5374e5d9abf4a536d47fa7d@git.apache.org> References: <82c0e00da5374e5d9abf4a536d47fa7d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/36] ambari git commit: AMBARI-21364 DB consistency checker throws errors for missing 'parquet-logging' and 'product-info' configs after Ambari upgrade (dlysnichenko via dgrinenko) archived-at: Fri, 07 Jul 2017 14:57:54 -0000 AMBARI-21364 DB consistency checker throws errors for missing 'parquet-logging' and 'product-info' configs after Ambari upgrade (dlysnichenko via dgrinenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/19d4200e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/19d4200e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/19d4200e Branch: refs/heads/branch-feature-logsearch-ui Commit: 19d4200e719854b0d304e0d7be5e20f33cda46ff Parents: 29203a1 Author: Dmytro Grinenko Authored: Wed Jul 5 16:16:49 2017 +0300 Committer: Dmytro Grinenko Committed: Wed Jul 5 16:16:49 2017 +0300 ---------------------------------------------------------------------- .../checks/DatabaseConsistencyCheckHelper.java | 14 ++++++++++++++ .../server/state/ClientConfigFileDefinition.java | 15 +++++++++++++-- .../common-services/HIVE/0.12.0.2.0/metainfo.xml | 1 + .../common-services/HIVE/2.1.0.3.0/metainfo.xml | 7 +++++++ 4 files changed, 35 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/19d4200e/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java index d1566d9..2559339 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java @@ -58,6 +58,8 @@ import org.apache.ambari.server.orm.entities.HostComponentDesiredStateEntity; import org.apache.ambari.server.orm.entities.HostComponentStateEntity; import org.apache.ambari.server.orm.entities.MetainfoEntity; import org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity; +import org.apache.ambari.server.state.ClientConfigFileDefinition; +import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.SecurityState; import org.apache.ambari.server.state.ServiceInfo; import org.apache.ambari.server.state.State; @@ -1022,10 +1024,22 @@ public class DatabaseConsistencyCheckHelper { Multimap dbServiceConfigs = dbServiceVersionConfigs.get(serviceVersion); if (dbServiceConfigs != null) { for (String serviceName : dbServiceConfigs.keySet()) { + ServiceInfo serviceInfo = serviceInfoMap.get(serviceName); Collection serviceConfigsFromStack = stackServiceConfigs.get(serviceName); Collection serviceConfigsFromDB = dbServiceConfigs.get(serviceName); if (serviceConfigsFromDB != null && serviceConfigsFromStack != null) { serviceConfigsFromStack.removeAll(serviceConfigsFromDB); + if (serviceInfo != null && serviceInfo.getComponents() != null) { + for (ComponentInfo componentInfo : serviceInfo.getComponents()) { + if (componentInfo.getClientConfigFiles() != null) { + for (ClientConfigFileDefinition clientConfigFileDefinition : componentInfo.getClientConfigFiles()) { + if (clientConfigFileDefinition.isOptional()) { + serviceConfigsFromStack.remove(clientConfigFileDefinition.getDictionaryName()); + } + } + } + } + } // skip ranger-{service_name}-* from being checked, unless ranger is installed if(!dbServiceConfigs.containsKey("RANGER")) { http://git-wip-us.apache.org/repos/asf/ambari/blob/19d4200e/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java index 8c97473..354d4d3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ClientConfigFileDefinition.java @@ -32,6 +32,15 @@ public class ClientConfigFileDefinition { private String type; private String fileName; private String dictionaryName; + private boolean optional = false; + + public boolean isOptional() { + return optional; + } + + public void setOptional(boolean optional) { + this.optional = optional; + } public void setType(String type) { this.type = type; @@ -73,7 +82,8 @@ public class ClientConfigFileDefinition { return new EqualsBuilder(). append(type, rhs.type). append(fileName, rhs.fileName). - append(dictionaryName, rhs.dictionaryName).isEquals(); + append(dictionaryName, rhs.dictionaryName). + append(optional, rhs.optional).isEquals(); } @Override @@ -81,6 +91,7 @@ public class ClientConfigFileDefinition { return new HashCodeBuilder(17, 31). append(type). append(fileName). - append(dictionaryName).toHashCode(); + append(dictionaryName). + append(optional).toHashCode(); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/19d4200e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml index e3300e3..d2d6437 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml @@ -229,6 +229,7 @@ env parquet-logging.properties parquet-logging + true http://git-wip-us.apache.org/repos/asf/ambari/blob/19d4200e/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/metainfo.xml index 4225f19..db490c9 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/metainfo.xml @@ -332,6 +332,12 @@ hive-exec-log4j.properties hive-exec-log4j + + env + parquet-logging.properties + parquet-logging + true + hive-site @@ -514,6 +520,7 @@ ranger-hive-audit ranger-hive-policymgr-ssl ranger-hive-security + parquet-logging mapred-site application.properties hive-atlas-application.properties