Repository: ambari Updated Branches: refs/heads/branch-2.6 077b6d190 -> 069a4d4ce
AMBARI-22301. HOU: Service desired repo versions are not being set (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/069a4d4c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/069a4d4c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/069a4d4c Branch: refs/heads/branch-2.6 Commit: 069a4d4ce7aa565be7c073f08d21e34b920b4e95 Parents: 077b6d1 Author: Nate Cole <[email protected]> Authored: Tue Oct 24 16:41:13 2017 -0400 Committer: Nate Cole <[email protected]> Committed: Fri Nov 3 15:50:40 2017 -0400 ---------------------------------------------------------------------- .../server/controller/internal/UpgradeResourceProvider.java | 4 ++-- .../controller/internal/UpgradeResourceProviderTest.java | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/069a4d4c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java index 8ce6454..1ec790f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java @@ -757,11 +757,11 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider The Upgrade Pack is responsible for calling {@link org.apache.ambari.server.serveraction.upgrades.UpdateDesiredRepositoryAction} at the appropriate moment during the orchestration. */ - if (pack.getType() == UpgradeType.ROLLING) { + if (pack.getType() == UpgradeType.ROLLING || pack.getType() == UpgradeType.HOST_ORDERED) { s_upgradeHelper.updateDesiredRepositoriesAndConfigs(upgradeContext); } - @Experimental(feature = ExperimentalFeature.PATCH_UPGRADES, comment = "This is wrong") + @Experimental(feature = ExperimentalFeature.PATCH_UPGRADES, comment = "This is SO VERY wrong") StackId configurationPackSourceStackId = upgradeContext.getSourceVersions().values().iterator().next().getStackId(); // resolve or build a proper config upgrade pack - always start out with the config pack http://git-wip-us.apache.org/repos/asf/ambari/blob/069a4d4c/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java index aef44a5..477b776 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java @@ -1443,6 +1443,14 @@ public class UpgradeResourceProviderTest extends EasyMockSupport { requestProps.put(UpgradeResourceProvider.UPGRADE_HOST_ORDERED_HOSTS, hostsOrder); upgradeResourceProvider.createResources(request); + + + // make sure that the desired versions are updated + Cluster cluster = clusters.getCluster("c1"); + assertNotNull(cluster); + + Service service = cluster.getService("ZOOKEEPER"); + assertEquals(repoVersionEntity2200, service.getDesiredRepositoryVersion()); } /**
