AMBARI-22060. Fail to restart Ranger Admin during HDP downgrade. (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1a90a522 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1a90a522 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1a90a522 Branch: refs/heads/branch-3.0-ams Commit: 1a90a5221f0af01160d1d3fe5986d4e76977fb7d Parents: 439a9ad Author: Lisnichenko Dmitro <[email protected]> Authored: Tue Sep 26 18:59:50 2017 +0300 Committer: Lisnichenko Dmitro <[email protected]> Committed: Tue Sep 26 19:00:33 2017 +0300 ---------------------------------------------------------------------- .../server/serveraction/upgrades/FinalizeUpgradeAction.java | 5 +++++ .../org/apache/ambari/server/state/cluster/ClusterImpl.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1a90a522/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java index 5ec0692..451f802 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java @@ -202,6 +202,11 @@ public class FinalizeUpgradeAction extends AbstractUpgradeServerAction { // longer used finalizeHostRepositoryVersions(cluster); + if (upgradeContext.getOrchestrationType() == RepositoryType.STANDARD) { + outSB.append(String.format("Finalizing the version for cluster %s.\n", cluster.getClusterName())); + cluster.setCurrentStackVersion(cluster.getDesiredStackVersion()); + } + // mark revertable if (repositoryType.isRevertable() && direction == Direction.UPGRADE) { UpgradeEntity upgrade = cluster.getUpgradeInProgress(); http://git-wip-us.apache.org/repos/asf/ambari/blob/1a90a522/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 8f1a882..9c0b0ca 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 @@ -2415,7 +2415,7 @@ public class ClusterImpl implements Cluster { // since the entities which were modified came from the cluster entity's // list to begin with, we can just save them right back - no need for a // new collection since the entity instances were modified directly - clusterEntity = clusterDAO.merge(clusterEntity); + clusterEntity = clusterDAO.merge(clusterEntity, true); cacheConfigurations();
