You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/09/14 13:27:32 UTC
ambari git commit: AMBARI-21950. Package Installation is failing If
Patch-VDF contain service that is not installed in the cluster (ncole)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 4124b118a -> 1dd39299d
AMBARI-21950. Package Installation is failing If Patch-VDF contain service that is not installed in the cluster (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1dd39299
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1dd39299
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1dd39299
Branch: refs/heads/branch-2.6
Commit: 1dd39299d21c48e98b5e4b72c36e4105418a7e4e
Parents: 4124b11
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Sep 13 14:19:18 2017 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Thu Sep 14 08:55:29 2017 -0400
----------------------------------------------------------------------
.../internal/ClusterStackVersionResourceProvider.java | 4 +---
.../internal/ClusterStackVersionResourceProviderTest.java | 9 ++++++++-
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1dd39299/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index c2084b6..a1e07dc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -490,6 +490,7 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
}
}
+ checkPatchVDFAvailableServices(cluster, repoVersionEntity, versionDefinitionXml);
// the cluster will create/update all of the host versions to the correct state
List<Host> hostsNeedingInstallCommands = cluster.transitionHostsToInstalling(
@@ -591,9 +592,6 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
// determine services for the repo
Set<String> serviceNames = new HashSet<>();
-
- checkPatchVDFAvailableServices(cluster, repoVersionEnt, desiredVersionDefinition);
-
// !!! limit the serviceNames to those that are detailed for the repository.
// TODO packages don't have component granularity
if (RepositoryType.STANDARD != repoVersionEnt.getType()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1dd39299/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
index 06e8dfa..7ad3a87 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
@@ -127,6 +127,8 @@ import com.google.inject.Injector;
import com.google.inject.Provider;
import com.google.inject.util.Modules;
+import junit.framework.AssertionFailedError;
+
/**
* ClusterStackVersionResourceProvider tests.
@@ -1853,6 +1855,9 @@ public class ClusterStackVersionResourceProviderTest {
expect(desiredVersionDefinition.getAvailableServices((StackInfo)EasyMock.anyObject())).andReturn(availableServices).once();
+ expect(cluster.transitionHostsToInstalling(
+ anyObject(RepositoryVersionEntity.class), anyObject(VersionDefinitionXml.class),
+ EasyMock.anyBoolean())).andReturn(Collections.<Host>emptyList()).atLeastOnce();
replay(cluster, repoVersionEnt, desiredVersionDefinition, service1, service2, availableService1, availableService2);
@@ -1891,7 +1896,9 @@ public class ClusterStackVersionResourceProviderTest {
availableServices.add(availableService2);
expect(desiredVersionDefinition.getAvailableServices((StackInfo)EasyMock.anyObject())).andReturn(availableServices).once();
-
+ expect(cluster.transitionHostsToInstalling(
+ anyObject(RepositoryVersionEntity.class), anyObject(VersionDefinitionXml.class),
+ EasyMock.anyBoolean())).andThrow(new AssertionFailedError()).anyTimes();
replay(cluster, repoVersionEnt, desiredVersionDefinition, service1, availableService1, availableService2);