Repository: ambari Updated Branches: refs/heads/branch-2.6 868949acd -> 680f737c9
AMBARI-22724. Idempotent issue on Ambari Upgrade, renameServiceDeletedColumn failed with column already exists exception.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/680f737c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/680f737c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/680f737c Branch: refs/heads/branch-2.6 Commit: 680f737c944bf4e10c282266c0bb39e43074cec2 Parents: 868949a Author: Vitaly Brodetskyi <[email protected]> Authored: Fri Jan 5 16:16:12 2018 +0200 Committer: Vitaly Brodetskyi <[email protected]> Committed: Fri Jan 5 16:16:12 2018 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/UpgradeCatalog252.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/680f737c/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java index e6a7829..b8a87ec 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java @@ -65,6 +65,7 @@ public class UpgradeCatalog252 extends AbstractUpgradeCatalog { static final String CLUSTERCONFIG_TABLE = "clusterconfig"; static final String SERVICE_DELETED_COLUMN = "service_deleted"; + static final String UNMAPPED_COLUMN = "unmapped"; private static final String UPGRADE_TABLE = "upgrade"; private static final String UPGRADE_TABLE_FROM_REPO_COLUMN = "from_repo_version_id"; @@ -149,8 +150,10 @@ public class UpgradeCatalog252 extends AbstractUpgradeCatalog { * @throws java.sql.SQLException */ private void addServiceDeletedColumnToClusterConfigTable() throws SQLException { - dbAccessor.addColumn(CLUSTERCONFIG_TABLE, - new DBColumnInfo(SERVICE_DELETED_COLUMN, Short.class, null, 0, false)); + if (!dbAccessor.tableHasColumn(CLUSTERCONFIG_TABLE, UNMAPPED_COLUMN)) { + dbAccessor.addColumn(CLUSTERCONFIG_TABLE, + new DBColumnInfo(SERVICE_DELETED_COLUMN, Short.class, null, 0, false)); + } } /**
