Skip to content

[AMBARI-22875] Adopt changes in Host Component API for Blueprint cluster creation #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 3 commits into from
Mar 8, 2018
Merged

[AMBARI-22875] Adopt changes in Host Component API for Blueprint cluster creation #581

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
078260c
AMBARI-22875. Adopt changes in Host Component API for Blueprint clust…
adoroszlai Mar 7, 2018
56c3f20
AMBARI-22875. Remove leftover duplicate method
adoroszlai Mar 7, 2018
1b29484
Merge remote-tracking branch 'origin/branch-feature-AMBARI-14714' int…
adoroszlai Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions ...main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -254,30 +255,13 @@ public Set<Resource> getResources(Request request, Predicate predicate)
return findResources(request, predicate, requests);
}

private Set<Resource> getResourcesForUpdate(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {

final Set<ServiceComponentHostRequest> requests = new HashSet<>();

for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) {
requests.add(getRequest(propertyMap));
}

return findResources(request, predicate, requests);
}


private Set<Resource> findResources(Request request, final Predicate predicate,
final Set<ServiceComponentHostRequest> requests)
throws SystemException, NoSuchResourceException, NoSuchParentResourceException {
Set<Resource> resources = new HashSet<>();
Set<String> requestedIds = getRequestPropertyIds(request, predicate);
// We always need host_name for sch
requestedIds.add(HOST_COMPONENT_HOST_NAME_PROPERTY_ID);
requestedIds.add(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID);
requestedIds.add(HOST_COMPONENT_COMPONENT_TYPE_PROPERTY_ID);
requestedIds.add(HOST_COMPONENT_SERVICE_NAME_PROPERTY_ID);
requestedIds.add(HOST_COMPONENT_SERVICE_GROUP_NAME_PROPERTY_ID);

Set<ServiceComponentHostResponse> responses = getResources(new Command<Set<ServiceComponentHostResponse>>() {
@Override
Expand Down Expand Up @@ -844,12 +828,12 @@ private RequestStageContainer doUpdateResources(final RequestStageContainer stag
final boolean runSmokeTest = "true".equals(getQueryParameterValue(
QUERY_PARAMETERS_RUN_SMOKE_TEST_ID, predicate));

Set<String> queryIds = Collections.singleton(HOST_COMPONENT_HOST_COMPONENT_ID_PROPERTY_ID);
Set<String> queryIds = ImmutableSet.copyOf(keyPropertyIds.values());

Request queryRequest = PropertyHelper.getReadRequest(queryIds);
// will take care of 404 exception

Set<Resource> matchingResources = getResourcesForUpdate(queryRequest, predicate);
Set<Resource> matchingResources = getResources(queryRequest, predicate);

for (Resource queryResource : matchingResources) {
//todo: predicate evaluation was removed for BUG-28737 and the removal of this breaks
Expand Down