Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD9C511C9E for ; Mon, 23 Jun 2014 22:47:41 +0000 (UTC) Received: (qmail 45314 invoked by uid 500); 23 Jun 2014 22:47:40 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 45285 invoked by uid 500); 23 Jun 2014 22:47:40 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 45275 invoked by uid 99); 23 Jun 2014 22:47:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jun 2014 22:47:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8BCCB90AD89; Mon, 23 Jun 2014 22:47:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mahadev@apache.org To: commits@ambari.apache.org Message-Id: <7336514ebaff4106b37179c5f2a91ebd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-6246. Failed to start Supervisor and Nagios after upgrade. (mahadev) Date: Mon, 23 Jun 2014 22:47:40 +0000 (UTC) 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 Authored: Mon Jun 23 15:47:26 2014 -0700 Committer: Mahadev Konar 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);