ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [13/50] [abbrv] ambari git commit: AMBARI-13165. Oozie service have "Database host" required config after ambari upgrade from 1.7.0 to 2.1.2 - additional patch (dlysnichenko)
Date Wed, 30 Sep 2015 14:45:33 GMT
AMBARI-13165. Oozie service have "Database host" required config after ambari upgrade from
1.7.0 to 2.1.2 - additional patch (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ad31c9e8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ad31c9e8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ad31c9e8

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ad31c9e8deed0e15a7fdfd5b7704a095882ac982
Parents: 31096c8
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Fri Sep 25 18:16:21 2015 +0300
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Fri Sep 25 18:17:17 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ambari/server/upgrade/UpgradeCatalog212.java  | 8 ++++----
 .../apache/ambari/server/upgrade/UpgradeCatalog212Test.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ad31c9e8/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
index 12e3ce6..37a87ab 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
@@ -331,18 +331,18 @@ public class UpgradeCatalog212 extends AbstractUpgradeCatalog {
             Map<String, String> oozieEnvProperties = oozieEnv.getProperties();
 
             String hostname = oozieEnvProperties.get("oozie_hostname");
-            String db_type = oozieEnvProperties.get("oozie_ambari_database");
+            String db_type = oozieEnvProperties.get("oozie_database");
             String final_db_host = null;
             // fix for empty hostname after 1.7 -> 2.1.x+ upgrade
             if (hostname != null && db_type != null && hostname.equals(""))
{
               switch (db_type.toUpperCase()) {
-                case "MYSQL":
+                case "EXISTING MYSQL DATABASE":
                   final_db_host = oozieEnvProperties.get("oozie_existing_mysql_host");
                   break;
-                case "POSTGRESQL":
+                case "EXISTING POSTGRESQL DATABASE":
                   final_db_host = oozieEnvProperties.get("oozie_existing_postgresql_host");
                   break;
-                case "ORACLE":
+                case "EXISTING ORACLE DATABASE":
                   final_db_host = oozieEnvProperties.get("oozie_existing_oracle_host");
                   break;
                 default:

http://git-wip-us.apache.org/repos/asf/ambari/blob/ad31c9e8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
index f786052..d427e1a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
@@ -335,7 +335,7 @@ public class UpgradeCatalog212Test {
 
     final Map<String, String> propertiesExpectedOozieEnv = new HashMap<String, String>()
{{
       put("oozie_hostname", "");
-      put("oozie_ambari_database", "123");
+      put("oozie_database", "123");
     }};
 
     final Injector mockInjector = Guice.createInjector(new AbstractModule() {


Mime
View raw message