You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2017/02/17 22:57:01 UTC
[23/51] [abbrv] ambari git commit: 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'.
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'.
(cherry picked from commit a8887c44500d92e225d6d53774595500fc1a6c01)
Change-Id: I015a4aa278982895b0f405228e1ca66a97f73a57
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb265e16
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb265e16
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb265e16
Branch: refs/heads/branch-feature-BUG-74026
Commit: fb265e160d1350c4b7c877259146d762099b9689
Parents: bd2674d
Author: Swapan Shridhar <ss...@hortonworks.com>
Authored: Thu Feb 2 11:23:17 2017 -0800
Committer: Zuul <re...@hortonworks.com>
Committed: Tue Feb 7 02:15:22 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/fb265e16/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/fb265e16/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 c80f98c..ff5f2ee 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();