Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3191718A6C for ; Mon, 22 Jun 2015 16:41:47 +0000 (UTC) Received: (qmail 33083 invoked by uid 500); 22 Jun 2015 16:41:47 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 33048 invoked by uid 500); 22 Jun 2015 16:41:47 -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 33035 invoked by uid 99); 22 Jun 2015 16:41:47 -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; Mon, 22 Jun 2015 16:41:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E108FE362E; Mon, 22 Jun 2015 16:41:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmitriusan@apache.org To: commits@ambari.apache.org Date: Mon, 22 Jun 2015 16:41:46 -0000 Message-Id: <4d10f6f502dd476292def389835723f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ambari git commit: AMBARI-12073. ambari-server upgrade to 2.1 fails when config groups exist (dlysnichenko) Repository: ambari Updated Branches: refs/heads/branch-2.1 0297b3e3d -> bfda37e22 refs/heads/trunk 7c42f9353 -> a2d31f524 AMBARI-12073. ambari-server upgrade to 2.1 fails when config groups exist (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a2d31f52 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a2d31f52 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a2d31f52 Branch: refs/heads/trunk Commit: a2d31f52458891832384608faea4cb750be68f43 Parents: 7c42f93 Author: Lisnichenko Dmitro Authored: Mon Jun 22 19:40:24 2015 +0300 Committer: Lisnichenko Dmitro Committed: Mon Jun 22 19:40:24 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a2d31f52/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java index ac48d42..36a162f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java @@ -436,7 +436,7 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog { // The column name is different for one table String hostNameColumnName = tableName.equals(SERVICE_CONFIG_HOSTS_TABLE) ? "hostname" : "host_name"; - if (dbAccessor.tableHasData(tableName) && dbAccessor.tableHasColumn(tableName,HOST_NAME_COL)) { + if (dbAccessor.tableHasData(tableName) && dbAccessor.tableHasColumn(tableName, hostNameColumnName)) { dbAccessor.executeQuery("UPDATE " + tableName + " t SET host_id = (SELECT host_id FROM hosts h WHERE h.host_name = t." + hostNameColumnName + ") WHERE t.host_id IS NULL AND t." + hostNameColumnName + " IS NOT NULL"); // For legacy reasons, the hostrolecommand table will contain "none" for some records where the host_name was not important.