AMBARI-14637 - Downgrade failed with error Failed to merge entity during Save cluster state (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/627f5ad8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/627f5ad8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/627f5ad8 Branch: refs/heads/branch-dev-patch-upgrade Commit: 627f5ad80720b145650b558dda6db9631a8d68f3 Parents: 44faf76 Author: Jonathan Hurley <[email protected]> Authored: Tue Jan 12 14:33:31 2016 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Tue Jan 12 23:23:38 2016 -0500 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/state/cluster/ClusterImpl.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/627f5ad8/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java index 7645d65..ed317b8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java @@ -3255,6 +3255,10 @@ public class ClusterImpl implements Cluster { public void removeConfigurations(StackId stackId) { clusterGlobalLock.writeLock().lock(); try { + // make sure the entity isn't stale in the current unit of work. + ClusterEntity clusterEntity = getClusterEntity(); + clusterDAO.refresh(clusterEntity); + removeAllConfigsForStack(stackId); cacheConfigurations(); } finally {
