You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2017/11/30 20:11:06 UTC
ambari git commit: AMBARI-22544. Upgrade from Ambari 2.5.2 to 2.6.0
fails. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk f82277808 -> 195195fac
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/195195fa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/195195fa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/195195fa
Branch: refs/heads/trunk
Commit: 195195fac3fc625c21e5229af8130a854998f99b
Parents: f822778
Author: Myroslav Papirkovskyi <mp...@hortonworks.com>
Authored: Wed Nov 29 22:44:40 2017 +0200
Committer: Myroslav Papirkovskyi <mp...@hortonworks.com>
Committed: Thu Nov 30 22:10:32 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java | 4 ++++
.../org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/195195fa/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 4d9a5da..11b765c 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
@@ -104,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 +348,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/195195fa/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 22e8ccc..c88d1a1 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
@@ -341,6 +341,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();