ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [07/26] git commit: AMBARI-7244. Could not start Oozie after upgrade from 1.5.1 due to oozie_pid_dir not found (aonishuk)
Date Thu, 11 Sep 2014 19:02:27 GMT
AMBARI-7244. Could not start Oozie after upgrade from 1.5.1 due to oozie_pid_dir not found
(aonishuk)


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

Branch: refs/heads/branch-alerts-dev
Commit: 015e6abfd19a9b2759e63df29d99c2f06c387479
Parents: adb87a4
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Wed Sep 10 19:28:12 2014 +0300
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Wed Sep 10 19:28:12 2014 +0300

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java   | 2 +-
 .../org/apache/ambari/server/upgrade/UpgradeCatalog161Test.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/015e6abf/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 c018f6c..62b4e35 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,7 @@ 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("global", Collections.singletonMap("oozie_admin_port",
"11001"), 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/015e6abf/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 c5a02cb..1d12ea0 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,7 +147,7 @@ public class UpgradeCatalog161Test {
         Collections.singletonMap("hbase.master.info.port", "60010"), false, false);
     expectLastCall();
     
-    upgradeCatalog.updateConfigurationProperties("global",
+    upgradeCatalog.updateConfigurationProperties("oozie-env",
         Collections.singletonMap("oozie_admin_port", "11001"), false, false);
     expectLastCall();
     


Mime
View raw message