ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [08/34] git commit: AMBARI-7364. Oozie start fails with "oozie_admin_port was not found", after ambari upgrade from 1.6.0 to 1.7.0.(vbrodetskyi)
Date Thu, 18 Sep 2014 14:43:57 GMT
AMBARI-7364. Oozie start fails with "oozie_admin_port was not found", after ambari upgrade
from 1.6.0 to 1.7.0.(vbrodetskyi)


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

Branch: refs/heads/branch-alerts-dev
Commit: 6952fa4482cc999a437e6b498ec1d1a2a893ff21
Parents: 760d989
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Wed Sep 17 18:39:50 2014 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Wed Sep 17 18:39:50 2014 +0300

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java | 1 -
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java | 2 ++
 .../org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java  | 4 ----
 .../org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java  | 4 ++++
 4 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/6952fa44/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java
index 62b4e35..a4bb2b2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java
@@ -289,7 +289,6 @@ public class UpgradeCatalog161 extends AbstractUpgradeCatalog {
   protected void addMissingConfigs() throws AmbariException {
     updateConfigurationProperties("hbase-site", Collections.singletonMap("hbase.regionserver.info.port",
"60030"), false, false);
     updateConfigurationProperties("hbase-site", Collections.singletonMap("hbase.master.info.port",
"60010"), false, false);
-    updateConfigurationProperties("oozie-env", Collections.singletonMap("oozie_admin_port",
"11001"), false, false);
     updateConfigurationProperties("hive-site", Collections.singletonMap("hive.heapsize",
"1024"), false, false);
     updateConfigurationProperties("pig-properties", Collections.singletonMap("pig-content",
"\n# Licensed to the Apache " +
             "Software Foundation (ASF) under one\n# or more contributor license agreements.
 See the NOTICE file\n# " +

http://git-wip-us.apache.org/repos/asf/ambari/blob/6952fa44/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index e58b6d3..1c9608c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@ -945,6 +945,8 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog {
     updateConfigurationProperties("hadoop-env",
             Collections.singletonMap("hadoop_root_logger", "INFO,RFA"), false,
             false);
+
+    updateConfigurationProperties("oozie-env", Collections.singletonMap("oozie_admin_port",
"11001"), false, false);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/6952fa44/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java
index 1d12ea0..4315e2c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java
@@ -147,10 +147,6 @@ public class UpgradeCatalog161Test {
         Collections.singletonMap("hbase.master.info.port", "60010"), false, false);
     expectLastCall();
     
-    upgradeCatalog.updateConfigurationProperties("oozie-env",
-        Collections.singletonMap("oozie_admin_port", "11001"), false, false);
-    expectLastCall();
-    
     upgradeCatalog.updateConfigurationProperties("hive-site",
         Collections.singletonMap("hive.heapsize", "1024"), false, false);
     expectLastCall();

http://git-wip-us.apache.org/repos/asf/ambari/blob/6952fa44/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java
index 138b4b1..dcf308c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java
@@ -416,6 +416,10 @@ public class UpgradeCatalog170Test {
             Collections.singletonMap("hadoop_root_logger", "INFO,RFA"), false, false);
     expectLastCall();
 
+    upgradeCatalog.updateConfigurationProperties("oozie-env",
+            Collections.singletonMap("oozie_admin_port", "11001"), false, false);
+    expectLastCall();
+
     expect(dbAccessor.executeSelect("SELECT role_name, user_id FROM user_roles")).andReturn(userRolesResultSet).once();
     expect(entityManager.getTransaction()).andReturn(trans).anyTimes();
     expect(entityManager.getCriteriaBuilder()).andReturn(cb).anyTimes();


Mime
View raw message