Repository: ambari Updated Branches: refs/heads/branch-2.5 78ffc3f74 -> 928c978ee
AMBARI-19170 - NPE during Ambari server schema upgrade (Attila Doroszlai via jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/928c978e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/928c978e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/928c978e Branch: refs/heads/branch-2.5 Commit: 928c978ee0eac4ed479cd3594b6c68306c79045f Parents: 78ffc3f Author: Jonathan Hurley <[email protected]> Authored: Tue Dec 13 13:12:12 2016 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Tue Dec 13 13:12:36 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/928c978e/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java index 063c295..cf0c37d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java @@ -1552,7 +1552,6 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog { * * @throws SQLException */ - @Transactional void updateServiceComponentDesiredStateTableDDL() throws SQLException { if (dbAccessor.tableHasPrimaryKey(SERVICE_COMPONENT_DS_TABLE, ID)) { LOG.info("Skipping {} table Primary Key modifications since the new {} column already exists", @@ -2754,7 +2753,6 @@ public class UpgradeCatalog240 extends AbstractUpgradeCatalog { * Update view instance table's cluster_handle column to have cluster_id * instead of cluster_name */ - @Transactional void updateViewInstanceTable() throws SQLException { try { if (Long.class.equals(dbAccessor.getColumnClass(VIEWINSTANCE_TABLE, CLUSTER_HANDLE_COLUMN))) {
