ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject git commit: AMBARI-6246. Failed to start Supervisor and Nagios after upgrade. (mahadev)
Date Mon, 23 Jun 2014 22:47:40 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 971685e06 -> 226f30206


AMBARI-6246. Failed to start Supervisor and Nagios after upgrade. (mahadev)


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

Branch: refs/heads/trunk
Commit: 226f30206a98784a19869c802017265c66267b77
Parents: 971685e
Author: Mahadev Konar <mahadev@apache.org>
Authored: Mon Jun 23 15:47:26 2014 -0700
Committer: Mahadev Konar <mahadev@apache.org>
Committed: Mon Jun 23 15:47:26 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/226f3020/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 7332c21..39292d8 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
@@ -298,6 +298,7 @@ public class UpgradeCatalog161 extends AbstractUpgradeCatalog {
   
   protected void addMissingConfigs() throws AmbariException {
     updateConfigurationProperties("hbase-site", Collections.singletonMap("hbase.regionserver.info.port",
"60030"), false);
+    updateConfigurationProperties("hbase-site", Collections.singletonMap("hbase.master.info.port",
"60010"), false);
     updateConfigurationProperties("global", Collections.singletonMap("oozie_admin_port",
"11001"), false);
     updateConfigurationProperties("hive-site", Collections.singletonMap("hive.heapsize",
"1024"), false);
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/226f3020/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 2a33ba8..738e9d8 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
@@ -142,6 +142,10 @@ public class UpgradeCatalog161Test {
     upgradeCatalog.updateConfigurationProperties("hbase-site",
         Collections.singletonMap("hbase.regionserver.info.port", "60030"), false);
     expectLastCall();
+
+    upgradeCatalog.updateConfigurationProperties("hbase-site",
+        Collections.singletonMap("hbase.master.info.port", "60010"), false);
+    expectLastCall();
     
     upgradeCatalog.updateConfigurationProperties("global",
         Collections.singletonMap("oozie_admin_port", "11001"), false);


Mime
View raw message