Repository: ambari Updated Branches: refs/heads/branch-2.6 1994e4ad1 -> cc38ee8b7
AMBARI-22544. Upgrade from Ambari 2.5.2 to 2.6.0 fails. (mpapirkovskyy) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc38ee8b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc38ee8b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc38ee8b Branch: refs/heads/branch-2.6 Commit: cc38ee8b75631da296a10cca22ff6abc25e9c5e8 Parents: 1994e4a Author: Myroslav Papirkovskyi <[email protected]> Authored: Wed Nov 29 22:44:40 2017 +0200 Committer: Myroslav Papirkovskyi <[email protected]> Committed: Thu Nov 30 22:11:12 2017 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog260.java | 5 ++++- .../org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cc38ee8b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java index 35f9f65..6ba1671 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java @@ -47,7 +47,6 @@ import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory; import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor; import org.apache.ambari.server.state.kerberos.KerberosKeytabDescriptor; import org.apache.ambari.server.state.kerberos.KerberosPrincipalDescriptor; -import org.apache.ambari.server.state.kerberos.KerberosPrincipalType; import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -105,6 +104,8 @@ public class UpgradeCatalog260 extends AbstractUpgradeCatalog { public static final String FK_SDS_DESIRED_STACK_ID = "FK_sds_desired_stack_id"; public static final String FK_REPO_VERSION_ID = "FK_repo_version_id"; + public static final String CLUSTERS_TABLE = "clusters"; + public static final String UPGRADE_TABLE = "upgrade"; public static final String UPGRADE_GROUP_TABLE = "upgrade_group"; public static final String UPGRADE_ITEM_TABLE = "upgrade_item"; @@ -346,6 +347,8 @@ public class UpgradeCatalog260 extends AbstractUpgradeCatalog { * @throws java.sql.SQLException */ private void updateUpgradeTable() throws SQLException { + dbAccessor.clearTableColumn(CLUSTERS_TABLE, UPGRADE_ID_COLUMN, null); + dbAccessor.clearTable(UPGRADE_ITEM_TABLE); dbAccessor.clearTable(UPGRADE_GROUP_TABLE); dbAccessor.clearTable(UPGRADE_TABLE); http://git-wip-us.apache.org/repos/asf/ambari/blob/cc38ee8b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java index c611171..e93cd13 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java @@ -340,6 +340,10 @@ public class UpgradeCatalog260Test { Capture<DBColumnInfo> orchestration, Capture<DBColumnInfo> revertAllowed) throws SQLException { + dbAccessor.clearTableColumn(eq(UpgradeCatalog260.CLUSTERS_TABLE), eq(UpgradeCatalog260.UPGRADE_ID_COLUMN), + eq(null)); + expectLastCall().once(); + dbAccessor.clearTable(eq(UpgradeCatalog260.UPGRADE_TABLE)); expectLastCall().once();
