Repository: ambari Updated Branches: refs/heads/trunk 46fbae9eb -> edfd9ab1f
AMBARI-9654. Hive and Oozie could not start after upgrade from 1.5.1 to 2.0.0 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/edfd9ab1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/edfd9ab1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/edfd9ab1 Branch: refs/heads/trunk Commit: edfd9ab1fbddeaacffdaa608ba60a088e9e8f3f4 Parents: 46fbae9 Author: Andrew Onishuk <[email protected]> Authored: Mon Feb 16 21:17:28 2015 +0200 Committer: Andrew Onishuk <[email protected]> Committed: Mon Feb 16 21:17:28 2015 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog200.java | 9 +++++++-- .../apache/ambari/server/upgrade/UpgradeCatalog200Test.java | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/edfd9ab1/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java index 70e5f78..9b647fd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog200.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Collections; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.controller.AmbariManagementController; @@ -144,10 +145,10 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog { private void executeAlertDDLUpdates() throws AmbariException, SQLException { // add ignore_host column to alert_definition dbAccessor.addColumn(ALERT_DEFINITION_TABLE, new DBColumnInfo( - "ignore_host", Short.class, 1, 0, false)); + "ignore_host", Short.class, 1, 0, false)); dbAccessor.addColumn(ALERT_DEFINITION_TABLE, new DBColumnInfo( - "description", char[].class, 32672, null, true)); + "description", char[].class, 32672, null, true)); // update alert target dbAccessor.addColumn(ALERT_TARGET_TABLE, new DBColumnInfo("is_global", @@ -304,6 +305,7 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog { addNewConfigurationsFromXml(); updateHiveDatabaseType(); setSecurityType(); + addMissingConfigs(); } protected void updateHiveDatabaseType() throws AmbariException { @@ -454,4 +456,7 @@ public class UpgradeCatalog200 extends AbstractUpgradeCatalog { } } } + protected void addMissingConfigs() throws AmbariException { + updateConfigurationProperties("hive-site", Collections.singletonMap("hive.server2.transport.mode", "binary"), false, false); + } } http://git-wip-us.apache.org/repos/asf/ambari/blob/edfd9ab1/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java index c04397f..2351ecb 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java @@ -39,7 +39,9 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.Collections; import java.util.List; +import java.util.Map; import javax.persistence.EntityManager; @@ -326,12 +328,15 @@ public class UpgradeCatalog200Test { Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod ("addNewConfigurationsFromXml"); Method setSecurityType = UpgradeCatalog200.class.getDeclaredMethod("setSecurityType"); + Method updateConfigurationProperties = AbstractUpgradeCatalog.class.getDeclaredMethod + ("updateConfigurationProperties", String.class, Map.class, boolean.class, boolean.class); UpgradeCatalog200 upgradeCatalog = createMockBuilder(UpgradeCatalog200.class) .addMockedMethod(removeNagiosService) .addMockedMethod(updateHiveDatabaseType) .addMockedMethod(addNewConfigurationsFromXml) .addMockedMethod(setSecurityType) + .addMockedMethod(updateConfigurationProperties) .createMock(); upgradeCatalog.removeNagiosService(); @@ -344,6 +349,10 @@ public class UpgradeCatalog200Test { upgradeCatalog.setSecurityType(); expectLastCall().once(); + upgradeCatalog.updateConfigurationProperties("hive-site", + Collections.singletonMap("hive.server2.transport.mode", "binary"), false, false); + expectLastCall(); + replay(upgradeCatalog); upgradeCatalog.executeDMLUpdates();
