Repository: ambari Updated Branches: refs/heads/trunk 8cf3fa11b -> 9842b40d2
AMBARI-8868. API call used by Install Wizard to retry installation does not work (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9842b40d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9842b40d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9842b40d Branch: refs/heads/trunk Commit: 9842b40d2b2cd6c80cbdfc0086f3529a94c423b3 Parents: 8cf3fa1 Author: Lisnichenko Dmitro <[email protected]> Authored: Tue Dec 23 16:59:57 2014 +0200 Committer: Lisnichenko Dmitro <[email protected]> Committed: Tue Dec 23 16:59:57 2014 +0200 ---------------------------------------------------------------------- .../internal/HostComponentResourceProvider.java | 20 ++++++++++---------- .../HostComponentResourceProviderTest.java | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9842b40d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java index 47d3f70..a6c95f5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java @@ -192,6 +192,8 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro Set<Resource> resources = new HashSet<Resource>(); Set<String> requestedIds = getRequestPropertyIds(request, predicate); + // We always need host_name for sch + requestedIds.add(HOST_COMPONENT_HOST_NAME_PROPERTY_ID); Set<ServiceComponentHostResponse> responses = getResources(new Command<Set<ServiceComponentHostResponse>>() { @Override @@ -598,19 +600,17 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro Set<Resource> matchingResources = getResources(queryRequest, predicate); for (Resource queryResource : matchingResources) { - if (predicate.evaluate(queryResource)) { - Map<String, Object> updateRequestProperties = new HashMap<String, Object>(); + Map<String, Object> updateRequestProperties = new HashMap<String, Object>(); - // add props from query resource - updateRequestProperties.putAll(PropertyHelper.getProperties(queryResource)); + // add props from query resource + updateRequestProperties.putAll(PropertyHelper.getProperties(queryResource)); - // add properties from update request - //todo: should we flag value size > 1? - if (request.getProperties() != null && request.getProperties().size() != 0) { - updateRequestProperties.putAll(request.getProperties().iterator().next()); - } - requests.add(getRequest(updateRequestProperties)); + // add properties from update request + //todo: should we flag value size > 1? + if (request.getProperties() != null && request.getProperties().size() != 0) { + updateRequestProperties.putAll(request.getProperties().iterator().next()); } + requests.add(getRequest(updateRequestProperties)); } RequestStageContainer requestStages = modifyResources(new Command<RequestStageContainer>() { http://git-wip-us.apache.org/repos/asf/ambari/blob/9842b40d/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java index 0ffc6e1..c6a89ed 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java @@ -268,7 +268,7 @@ public class HostComponentResourceProviderTest { Set<ServiceComponentHostResponse> nameResponse = new HashSet<ServiceComponentHostResponse>(); nameResponse.add(new ServiceComponentHostResponse( - "Cluster102", "Service100", "Component100", "Host100", "STARTED", "", "", "", null)); + "Cluster102", "Service100", "Component100", "Host100", "INSTALLED", "", "", "", null)); // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); @@ -323,7 +323,7 @@ public class HostComponentResourceProviderTest { // update the cluster named Cluster102 Predicate predicate = new PredicateBuilder().property( HostComponentResourceProvider.HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID).equals("Cluster102").and(). - property(HostComponentResourceProvider.HOST_COMPONENT_HOST_NAME_PROPERTY_ID).equals("Host100").and(). + property(HostComponentResourceProvider.HOST_COMPONENT_STATE_PROPERTY_ID).equals("INSTALLED").and(). property(HostComponentResourceProvider.HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID).equals("Component100").toPredicate(); RequestStatus requestStatus = provider.updateResources(request, predicate); Resource responseResource = requestStatus.getRequestResource();
