Repository: ambari Updated Branches: refs/heads/branch-2.5 d4957f128 -> 511be1447
AMBARI-18822. Upgrade from 2.4.2 to 2.5 fails with DB consistency check.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/511be144 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/511be144 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/511be144 Branch: refs/heads/branch-2.5 Commit: 511be1447b1d68fe5541eb6c37df0876f8d403f8 Parents: d4957f1 Author: Vitaly Brodetskyi <[email protected]> Authored: Tue Nov 8 05:43:01 2016 +0200 Committer: Vitaly Brodetskyi <[email protected]> Committed: Tue Nov 8 05:43:50 2016 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog250.java | 6 ++---- .../apache/ambari/server/upgrade/UpgradeCatalog250Test.java | 9 +++++---- 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/511be144/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 a7d5af9..093be36 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 @@ -19,8 +19,6 @@ package org.apache.ambari.server.upgrade; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,9 +26,8 @@ import java.util.Map; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.CommandExecutionType; import org.apache.ambari.server.controller.AmbariManagementController; -import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo; import org.apache.ambari.server.orm.DBAccessor; - +import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo; import org.apache.ambari.server.orm.dao.DaoUtils; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; @@ -130,6 +127,7 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog { */ @Override protected void executeDMLUpdates() throws AmbariException, SQLException { + addNewConfigurationsFromXml(); updateAMSConfigs(); } http://git-wip-us.apache.org/repos/asf/ambari/blob/511be144/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 5ac0822..1207426 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,6 +18,8 @@ package org.apache.ambari.server.upgrade; +import javax.persistence.EntityManager; +import junit.framework.Assert; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.anyString; import static org.easymock.EasyMock.capture; @@ -41,8 +43,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.persistence.EntityManager; - import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -69,8 +69,6 @@ import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provider; -import junit.framework.Assert; - /** * {@link UpgradeCatalog250} unit tests. */ @@ -199,12 +197,15 @@ public class UpgradeCatalog250Test { @Test public void testExecuteDMLUpdates() throws Exception { Method updateAmsConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateAMSConfigs"); + Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml"); UpgradeCatalog250 upgradeCatalog250 = createMockBuilder(UpgradeCatalog250.class) .addMockedMethod(updateAmsConfigs) + .addMockedMethod(addNewConfigurationsFromXml) .createMock(); upgradeCatalog250.updateAMSConfigs(); + upgradeCatalog250.addNewConfigurationsFromXml(); expectLastCall().once(); replay(upgradeCatalog250);
