AMBARI-6894. UpgradeTest broken on trunk.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1730dc5b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1730dc5b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1730dc5b Branch: refs/heads/branch-alerts-dev Commit: 1730dc5b87bd3bf9f3ded68a47c7bf2d33725997 Parents: ec1707f Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Mon Aug 18 18:17:49 2014 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Mon Aug 18 18:17:49 2014 +0300 ---------------------------------------------------------------------- .../server/upgrade/UpgradeCatalog170.java | 101 ++++++++----------- 1 file changed, 44 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1730dc5b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java index fa47428..9888177 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java @@ -348,7 +348,50 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog { } dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('service_config_id_seq', 1)", false); + + valueColumnName + ") " + "VALUES('alert_definition_id_seq', 0)", + false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('alert_group_id_seq', 0)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('alert_target_id_seq', 0)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('alert_history_id_seq', 0)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('alert_notice_id_seq', 0)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('alert_current_id_seq', 0)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('group_id_seq', 1)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('member_id_seq', 1)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('resource_type_id_seq', 4)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('resource_id_seq', 2)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('principal_type_id_seq', 3)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('principal_id_seq', 2)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('permission_id_seq', 5)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('privilege_id_seq', 1)", false); + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + + valueColumnName + ") " + "VALUES('service_config_id_seq', 1)", false); dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + valueColumnName + ") " + "VALUES('service_config_application_id_seq', 1)", false); @@ -457,62 +500,6 @@ public class UpgradeCatalog170 extends AbstractUpgradeCatalog { protected void executeDMLUpdates() throws AmbariException, SQLException { String dbType = getDbType(); - // add new sequences for view entity - String valueColumnName = "\"value\""; - if (Configuration.ORACLE_DB_NAME.equals(dbType) - || Configuration.MYSQL_DB_NAME.equals(dbType)) { - valueColumnName = "value"; - } - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('alert_definition_id_seq', 0)", - false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('alert_group_id_seq', 0)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('alert_target_id_seq', 0)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('alert_history_id_seq', 0)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('alert_notice_id_seq', 0)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('alert_current_id_seq', 0)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('group_id_seq', 1)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('member_id_seq', 1)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('resource_type_id_seq', 4)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('resource_id_seq', 2)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('principal_type_id_seq', 3)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('principal_id_seq', 2)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('permission_id_seq', 5)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('privilege_id_seq', 1)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('service_config_id_seq', 1)", false); - - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " - + valueColumnName + ") " + "VALUES('config_id_seq', 1)", false); - // Update historic records with the log paths, but only enough so as to not prolong the upgrade process executeInTransaction(new Runnable() { @Override