From 078260c22f838cb286a8e3391f8d87797d19511f Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 7 Mar 2018 19:54:01 +0100 Subject: [PATCH 1/2] AMBARI-22875. Adopt changes in Host Component API for Blueprint cluster creation --- .../controller/internal/HostComponentResourceProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 a9bc8030e00..44c02160146 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 @@ -70,6 +70,7 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import com.google.inject.Inject; import com.google.inject.Injector; @@ -840,7 +841,7 @@ private RequestStageContainer doUpdateResources(final RequestStageContainer stag final boolean runSmokeTest = "true".equals(getQueryParameterValue( QUERY_PARAMETERS_RUN_SMOKE_TEST_ID, predicate)); - Set queryIds = Collections.singleton(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID); + Set queryIds = ImmutableSet.copyOf(keyPropertyIds.values()); Request queryRequest = PropertyHelper.getReadRequest(queryIds); // will take care of 404 exception From 56c3f209b8ad9187a7f824a362ab7b32d026f489 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Wed, 7 Mar 2018 20:06:49 +0100 Subject: [PATCH 2/2] AMBARI-22875. Remove leftover duplicate method --- .../internal/HostComponentResourceProvider.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) 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 44c02160146..ddd180f4e60 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 @@ -255,19 +255,6 @@ public Set getResources(Request request, Predicate predicate) return findResources(request, predicate, requests); } - private Set getResourcesForUpdate(Request request, Predicate predicate) - throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - - final Set requests = new HashSet<>(); - - for (Map propertyMap : getPropertyMaps(predicate)) { - requests.add(getRequest(propertyMap)); - } - - return findResources(request, predicate, requests); - } - - private Set findResources(Request request, final Predicate predicate, final Set requests) throws SystemException, NoSuchResourceException, NoSuchParentResourceException { @@ -846,7 +833,7 @@ private RequestStageContainer doUpdateResources(final RequestStageContainer stag Request queryRequest = PropertyHelper.getReadRequest(queryIds); // will take care of 404 exception - Set matchingResources = getResourcesForUpdate(queryRequest, predicate); + Set matchingResources = getResources(queryRequest, predicate); for (Resource queryResource : matchingResources) { //todo: predicate evaluation was removed for BUG-28737 and the removal of this breaks