Repository: ambari Updated Branches: refs/heads/trunk 533d109c8 -> 0822a54b2
AMBARI-6975. Brocken upgrade 1.6.0->1.7.0 and 1.6.1->1.7.0 after renaming of "value" column.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0822a54b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0822a54b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0822a54b Branch: refs/heads/trunk Commit: 0822a54b268f3a87ca9161802fbb8aed87264483 Parents: 533d109 Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Thu Aug 21 17:28:48 2014 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Thu Aug 21 17:28:48 2014 +0300 ---------------------------------------------------------------------- .../server/upgrade/UpgradeCatalog160.java | 12 ++----- .../server/upgrade/UpgradeCatalog161.java | 36 +++++++------------- 2 files changed, 15 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0822a54b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java index d3fdd3b..9cdbb10 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog160.java @@ -24,7 +24,6 @@ import java.util.Collections; import java.util.List; import org.apache.ambari.server.AmbariException; -import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.orm.DBAccessor; import com.google.inject.Inject; @@ -35,7 +34,7 @@ import com.google.inject.Injector; */ public class UpgradeCatalog160 extends AbstractUpgradeCatalog { - //SourceVersion is only for book-keeping purpos + //SourceVersion is only for book-keeping purpos @Override public String getSourceVersion() { return "1.5.1"; @@ -99,15 +98,8 @@ public class UpgradeCatalog160 extends AbstractUpgradeCatalog { @Override 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 + ") " + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, sequence_value) " + "VALUES('viewentity_id_seq', 0)", true); // Add missing property for YARN http://git-wip-us.apache.org/repos/asf/ambari/blob/0822a54b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java index c23f611..6ed16d9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog161.java @@ -23,10 +23,7 @@ import java.sql.SQLException; import java.sql.Types; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; - import javax.persistence.EntityManager; import javax.persistence.TypedQuery; @@ -58,7 +55,7 @@ public class UpgradeCatalog161 extends AbstractUpgradeCatalog { */ private static final Logger LOG = LoggerFactory.getLogger (UpgradeCatalog161.class); - + // ----- Constructors ------------------------------------------------------ @Inject @@ -249,10 +246,10 @@ public class UpgradeCatalog161 extends AbstractUpgradeCatalog { // Add constraints dbAccessor.addFKConstraint("requestoperationlevel", "FK_req_op_level_req_id", "request_id", "request", "request_id", true); - + // Clusters - dbAccessor.addColumn("clusters", new DBColumnInfo("provisioning_state", String.class, 255, State.INIT.name(), false)); - + dbAccessor.addColumn("clusters", new DBColumnInfo("provisioning_state", String.class, 255, State.INIT.name(), false)); + dbAccessor.dropConstraint("stage", "FK_stage_cluster_id", true); dbAccessor.dropConstraint("request", "FK_request_cluster_id", true); } @@ -262,40 +259,33 @@ public class UpgradeCatalog161 extends AbstractUpgradeCatalog { @Override protected void executeDMLUpdates() throws AmbariException, SQLException { - String dbType = getDbType(); - - String valueColumnName = "\"value\""; - if (Configuration.ORACLE_DB_NAME.equals(dbType) || Configuration.MYSQL_DB_NAME.equals(dbType)) { - valueColumnName = "value"; - } - //add new sequences for operation level - dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, " + valueColumnName + ") " + + dbAccessor.executeQuery("INSERT INTO ambari_sequences(sequence_name, sequence_value) " + "VALUES('operation_level_id_seq', 1)", true); - + // upgrade cluster provision state - executeInTransaction(new Runnable() { + executeInTransaction(new Runnable() { @Override public void run() { - // it should be safe to bulk update the current cluster state since + // it should be safe to bulk update the current cluster state since // this field is not currently used and since all clusters stored in // the database must (at this point) be installed - final EntityManager em = getEntityManagerProvider().get(); + final EntityManager em = getEntityManagerProvider().get(); final TypedQuery<ClusterEntity> query = em.createQuery( - "UPDATE ClusterEntity SET provisioningState = :provisioningState", + "UPDATE ClusterEntity SET provisioningState = :provisioningState", ClusterEntity.class); query.setParameter("provisioningState", State.INSTALLED); final int updatedClusterProvisionedStateCount = query.executeUpdate(); - + LOG.info("Updated {} cluster provisioning states to {}", updatedClusterProvisionedStateCount, State.INSTALLED); } }); - + addMissingConfigs(); } - + protected void addMissingConfigs() throws AmbariException { updateConfigurationProperties("hbase-site", Collections.singletonMap("hbase.regionserver.info.port", "60030"), false, false); updateConfigurationProperties("hbase-site", Collections.singletonMap("hbase.master.info.port", "60010"), false, false);
