This is an automated email from the ASF dual-hosted git repository.
JiaLiangC pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 923bfccf94 AMBARI-26594: Stack upgrade issue related to null
upgrade_id (#4121)
923bfccf94 is described below
commit 923bfccf9450de4d3ba9ed5d3ae605c1f3847100
Author: ashokblend <[email protected]>
AuthorDate: Wed Jun 10 07:52:12 2026 +0530
AMBARI-26594: Stack upgrade issue related to null upgrade_id (#4121)
Co-authored-by: kuashokk <[email protected]>
---
.../main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java | 3 +--
.../org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
index 12ee068998..9440c528b6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
@@ -185,8 +185,7 @@ public class UpgradeEntity {
* Uni-directional relationship between an upgrade an all of the components
in
* that upgrade.
*/
- @OneToMany(orphanRemoval=true, cascade = { CascadeType.ALL })
- @JoinColumn(name = "upgrade_id")
+ @OneToMany(orphanRemoval=true, mappedBy = "upgrade", cascade = {
CascadeType.ALL })
private List<UpgradeHistoryEntity> upgradeHistory;
/**
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
index c3f97adf6f..585329602d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeHistoryEntity.java
@@ -69,7 +69,8 @@ public class UpgradeHistoryEntity {
@Column(name = "upgrade_id", nullable = false, insertable = false, updatable
= false)
private Long upgradeId;
- @JoinColumn(name = "upgrade_id", nullable = false, insertable = false,
updatable = false)
+ @ManyToOne
+ @JoinColumn(name = "upgrade_id", referencedColumnName = "upgrade_id",
nullable = false)
private UpgradeEntity upgrade;
@Column(name = "service_name", nullable = false, insertable = true,
updatable = true)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
