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/06/22 18:41:47 UTC
[2/2] ambari git commit: AMBARI-12073. ambari-server upgrade to 2.1
fails when config groups exist (dlysnichenko)
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/bfda37e2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bfda37e2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bfda37e2
Branch: refs/heads/branch-2.1
Commit: bfda37e22caee5ac11cde4c5d8c60b82e7d6b7e0
Parents: 0297b3e
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Mon Jun 22 19:40:24 2015 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Mon Jun 22 19:41:13 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/bfda37e2/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.