AMBARI-22267 - Version registration failure during patch upgrade + Debian + Oracle run (jonathanhurley)
(cherry picked from commit e898087fbc4c4515d0f393f9de3e735902876823) Change-Id: I351874794d1ce014d11ad679dae08eae063d1c6b Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/08e55df0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/08e55df0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/08e55df0 Branch: refs/heads/AMBARI-2.6.0.0 Commit: 08e55df009413c8782d01a200dcc6186a3a7359b Parents: a1d9f44 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Wed Oct 18 16:46:05 2017 -0400 Committer: Zuul <rel...@hortonworks.com> Committed: Thu Oct 19 21:46:03 2017 -0700 ---------------------------------------------------------------------- .../ambari/server/orm/entities/RepositoryVersionEntity.java | 5 +---- .../ambari/server/orm/entities/ServiceDesiredStateEntity.java | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/08e55df0/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java index edfe494..5936783 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java @@ -21,13 +21,11 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import javax.persistence.Basic; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.EnumType; import javax.persistence.Enumerated; -import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -94,7 +92,7 @@ import com.google.inject.Provider; query = "SELECT repositoryVersion FROM RepositoryVersionEntity repositoryVersion WHERE repositoryVersion.version = :version ORDER BY repositoryVersion.id DESC"), @NamedQuery( name = "findByServiceDesiredVersion", - query = "SELECT DISTINCT sd.desiredRepositoryVersion from ServiceDesiredStateEntity sd WHERE sd.desiredRepositoryVersion IN ?1") }) + query = "SELECT sd.desiredRepositoryVersion from ServiceDesiredStateEntity sd WHERE sd.desiredRepositoryVersion IN ?1 GROUP BY sd.desiredRepositoryVersion.id") }) @StaticallyInject public class RepositoryVersionEntity { private static Logger LOG = LoggerFactory.getLogger(RepositoryVersionEntity.class); @@ -131,7 +129,6 @@ public class RepositoryVersionEntity { @Enumerated(value = EnumType.STRING) private RepositoryType type = RepositoryType.STANDARD; - @Basic(fetch=FetchType.LAZY) @Lob @Column(name="version_xml", insertable = true, updatable = true) private String versionXml; http://git-wip-us.apache.org/repos/asf/ambari/blob/08e55df0/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java index 0124d3e..3ef0768 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceDesiredStateEntity.java @@ -40,20 +40,20 @@ import org.apache.commons.lang.builder.EqualsBuilder; @Entity public class ServiceDesiredStateEntity { - @Column(name = "cluster_id", nullable = false, insertable = false, updatable = false, length = 10) @Id + @Column(name = "cluster_id", nullable = false, insertable = false, updatable = false, length = 10) private Long clusterId; - @Column(name = "service_name", nullable = false, insertable = false, updatable = false) @Id + @Column(name = "service_name", nullable = false, insertable = false, updatable = false) private String serviceName; @Column(name = "desired_state", nullable = false, insertable = true, updatable = true) @Enumerated(value = EnumType.STRING) private State desiredState = State.INIT; - @Column(name = "desired_host_role_mapping", nullable = false, insertable = true, updatable = true, length = 10) @Basic + @Column(name = "desired_host_role_mapping", nullable = false, insertable = true, updatable = true, length = 10) private int desiredHostRoleMapping = 0; @Column(name = "maintenance_state", nullable = false, insertable = true, updatable = true)
