Repository: ambari Updated Branches: refs/heads/trunk f10d41ccb -> e72a6b466
AMBARI-14825 Metrics collector fails to start after upgrade to 2.2.1 on a secure cluster (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e72a6b46 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e72a6b46 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e72a6b46 Branch: refs/heads/trunk Commit: e72a6b4665bceb472a1cc1d9a2080b741d1cb560 Parents: f10d41c Author: Dmytro Sen <d...@apache.org> Authored: Thu Jan 28 20:04:06 2016 +0200 Committer: Dmytro Sen <d...@apache.org> Committed: Thu Jan 28 20:04:06 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java | 1 + .../org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e72a6b46/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java index 4eebb66..13ec345 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java @@ -163,6 +163,7 @@ public class UpgradeCatalog221 extends AbstractUpgradeCatalog { updateOozieConfigs(); updateTezConfigs(); updateRangerKmsDbksConfigs(); + updateAMSConfigs(); } protected void updateAlerts() { http://git-wip-us.apache.org/repos/asf/ambari/blob/e72a6b46/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java index 5a14bc9..c15fbd8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java @@ -144,6 +144,7 @@ public class UpgradeCatalog221Test { Method updateOozieConfigs = UpgradeCatalog221.class.getDeclaredMethod("updateOozieConfigs"); Method updateTezConfigs = UpgradeCatalog221.class.getDeclaredMethod("updateTezConfigs"); Method updateRangerKmsDbksConfigs = UpgradeCatalog221.class.getDeclaredMethod("updateRangerKmsDbksConfigs"); + Method updateAMSConfigs = UpgradeCatalog221.class.getDeclaredMethod("updateAMSConfigs"); UpgradeCatalog221 upgradeCatalog221 = createMockBuilder(UpgradeCatalog221.class) .addMockedMethod(addNewConfigurationsFromXml) @@ -151,6 +152,7 @@ public class UpgradeCatalog221Test { .addMockedMethod(updateOozieConfigs) .addMockedMethod(updateTezConfigs) .addMockedMethod(updateRangerKmsDbksConfigs) + .addMockedMethod(updateAMSConfigs) .createMock(); upgradeCatalog221.addNewConfigurationsFromXml(); @@ -163,6 +165,8 @@ public class UpgradeCatalog221Test { expectLastCall().once(); upgradeCatalog221.updateRangerKmsDbksConfigs(); expectLastCall().once(); + upgradeCatalog221.updateAMSConfigs(); + expectLastCall().once(); replay(upgradeCatalog221);