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/975dd1d4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/975dd1d4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/975dd1d4 Branch: refs/heads/branch-dev-patch-upgrade Commit: 975dd1d40c6136a61e7d014fb0dfc32e09863a2b Parents: ebc05a9 Author: Swapan Shridhar <[email protected]> Authored: Thu Feb 2 14:09:00 2017 -0800 Committer: Swapan Shridhar <[email protected]> Committed: Thu Feb 2 14:57:04 2017 -0800 ---------------------------------------------------------------------- .../server/upgrade/UpgradeCatalog250.java | 58 ++++----------- .../server/upgrade/UpgradeCatalog250Test.java | 78 +++++++++----------- 2 files changed, 50 insertions(+), 86 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/975dd1d4/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 71cde7e..1e36a3c 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 @@ -17,20 +17,8 @@ */ package org.apache.ambari.server.upgrade; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicLong; - +import com.google.inject.Inject; +import com.google.inject.Injector; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.CommandExecutionType; import org.apache.ambari.server.configuration.Configuration; @@ -46,8 +34,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.jdbc.support.JdbcUtils; -import com.google.inject.Inject; -import com.google.inject.Injector; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicLong; /** * Upgrade catalog for version 2.5.0. @@ -161,7 +160,6 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog { updateHadoopEnvConfigs(); updateKafkaConfigs(); updateHIVEInteractiveConfigs(); - updateTEZInteractiveConfigs(); updateHiveLlapConfigs(); updateTablesForZeppelinViewRemoval(); updateZeppelinConfigs(); @@ -678,32 +676,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/975dd1d4/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 1cabe47..b950594 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 @@ -18,35 +18,15 @@ package org.apache.ambari.server.upgrade; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.anyString; -import static org.easymock.EasyMock.capture; -import static org.easymock.EasyMock.createMockBuilder; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.newCapture; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.reset; -import static org.easymock.EasyMock.verify; -import static org.junit.Assert.assertTrue; - -import java.lang.reflect.Method; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.persistence.EntityManager; - +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import com.google.gson.Gson; +import com.google.inject.Binder; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Module; +import com.google.inject.Provider; +import junit.framework.AssertionFailedError; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.configuration.Configuration; @@ -78,16 +58,33 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import com.google.gson.Gson; -import com.google.inject.Binder; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Module; -import com.google.inject.Provider; +import javax.persistence.EntityManager; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; -import junit.framework.AssertionFailedError; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createMockBuilder; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.newCapture; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertTrue; /** * {@link UpgradeCatalog250} unit tests. @@ -277,7 +274,6 @@ public class UpgradeCatalog250Test { Method updateKafkaConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateKafkaConfigs"); Method updateHiveLlapConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateHiveLlapConfigs"); Method updateHIVEInteractiveConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateHIVEInteractiveConfigs"); - Method updateTEZInteractiveConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateTEZInteractiveConfigs"); Method addManageServiceAutoStartPermissions = UpgradeCatalog250.class.getDeclaredMethod("addManageServiceAutoStartPermissions"); Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml"); Method updateTablesForZeppelinViewRemoval = UpgradeCatalog250.class.getDeclaredMethod("updateTablesForZeppelinViewRemoval"); @@ -296,7 +292,6 @@ public class UpgradeCatalog250Test { .addMockedMethod(addNewConfigurationsFromXml) .addMockedMethod(addManageServiceAutoStartPermissions) .addMockedMethod(updateHIVEInteractiveConfigs) - .addMockedMethod(updateTEZInteractiveConfigs) .addMockedMethod(updateTablesForZeppelinViewRemoval) .addMockedMethod(updateZeppelinConfigs) .addMockedMethod(updateAtlasConfigs) @@ -321,9 +316,6 @@ public class UpgradeCatalog250Test { upgradeCatalog250.updateHIVEInteractiveConfigs(); expectLastCall().once(); - upgradeCatalog250.updateTEZInteractiveConfigs(); - expectLastCall().once(); - upgradeCatalog250.updateHiveLlapConfigs(); expectLastCall().once();
