Repository: ambari Updated Branches: refs/heads/branch-2.5 9b51e8b5f -> a8887c445
AMBARI-19810. Remove upgrade logic in UpdateCatalog250 for tez-interactive-site's 'tez.runtime.io.sort.mb' and 'tez.runtime.unordered.output.buffer.size-mb'. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a8887c44 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8887c44 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8887c44 Branch: refs/heads/branch-2.5 Commit: a8887c44500d92e225d6d53774595500fc1a6c01 Parents: 9b51e8b Author: Swapan Shridhar <[email protected]> Authored: Thu Feb 2 11:23:17 2017 -0800 Committer: Swapan Shridhar <[email protected]> Committed: Thu Feb 2 14:58:23 2017 -0800 ---------------------------------------------------------------------- .../server/upgrade/UpgradeCatalog250.java | 27 -------------------- .../server/upgrade/UpgradeCatalog250Test.java | 5 ---- 2 files changed, 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a8887c44/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java index 6b9076c..ccb6b9e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java @@ -161,7 +161,6 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog { updateHadoopEnvConfigs(); updateKafkaConfigs(); updateHIVEInteractiveConfigs(); - updateTEZInteractiveConfigs(); updateHiveLlapConfigs(); updateTablesForZeppelinViewRemoval(); updateZeppelinConfigs(); @@ -673,32 +672,6 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog { } /** - * Updates Tez for Hive2 Interactive's config in tez-interactive-site. - * - * @throws AmbariException - */ - protected void updateTEZInteractiveConfigs() throws AmbariException { - AmbariManagementController ambariManagementController = injector.getInstance(AmbariManagementController.class); - Clusters clusters = ambariManagementController.getClusters(); - if (clusters != null) { - Map<String, Cluster> clusterMap = clusters.getClusters(); - - if (clusterMap != null && !clusterMap.isEmpty()) { - for (final Cluster cluster : clusterMap.values()) { - Config tezInteractiveSite = cluster.getDesiredConfigByType("tez-interactive-site"); - if (tezInteractiveSite != null) { - - updateConfigurationProperties("tez-interactive-site", Collections.singletonMap("tez.runtime.io.sort.mb", "512"), true, true); - - updateConfigurationProperties("tez-interactive-site", Collections.singletonMap("tez.runtime.unordered.output.buffer.size-mb", - "100"), true, true); - } - } - } - } - } - - /** * Updates Log Search configs. * * @throws AmbariException http://git-wip-us.apache.org/repos/asf/ambari/blob/a8887c44/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java index 1c455be..327a9c6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java @@ -280,7 +280,6 @@ public class UpgradeCatalog250Test { Method updateAtlasConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateAtlasConfigs"); Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml"); Method updateHIVEInteractiveConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateHIVEInteractiveConfigs"); - Method updateTEZInteractiveConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateTEZInteractiveConfigs"); Method updateLogSearchConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateLogSearchConfigs"); Method updateAmbariInfraConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateAmbariInfraConfigs"); Method updateRangerUrlConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateRangerUrlConfigs"); @@ -292,7 +291,6 @@ public class UpgradeCatalog250Test { .addMockedMethod(updateHadoopEnvConfigs) .addMockedMethod(updateKafkaConfigs) .addMockedMethod(updateHIVEInteractiveConfigs) - .addMockedMethod(updateTEZInteractiveConfigs) .addMockedMethod(updateHiveLlapConfigs) .addMockedMethod(updateTablesForZeppelinViewRemoval) .addMockedMethod(updateZeppelinConfigs) @@ -321,9 +319,6 @@ public class UpgradeCatalog250Test { upgradeCatalog250.updateHIVEInteractiveConfigs(); expectLastCall().once(); - upgradeCatalog250.updateTEZInteractiveConfigs(); - expectLastCall().once(); - upgradeCatalog250.updateHiveLlapConfigs(); expectLastCall().once();
