diff --git a/common/src/main/java/com/vmware/admiral/common/util/QueryUtil.java b/common/src/main/java/com/vmware/admiral/common/util/QueryUtil.java index 2c7c1b73e..abd7317d8 100644 --- a/common/src/main/java/com/vmware/admiral/common/util/QueryUtil.java +++ b/common/src/main/java/com/vmware/admiral/common/util/QueryUtil.java @@ -33,7 +33,7 @@ public class QueryUtil { public static final long QUERY_RETRY_INTERVAL_MILLIS = Long.getLong( - "com.vmware.admiral.common.util.query.retry.interval.millis", 500); + "com.vmware.admiral.common.util.query.retry.interval.millis", 300); /** * prefix for tenants. e.g. /tenants/t1 diff --git a/compute/src/main/java/com/vmware/admiral/compute/PlacementCapacityUpdateTaskService.java b/compute/src/main/java/com/vmware/admiral/compute/PlacementCapacityUpdateTaskService.java index 59e340ccb..22c7bc4e7 100644 --- a/compute/src/main/java/com/vmware/admiral/compute/PlacementCapacityUpdateTaskService.java +++ b/compute/src/main/java/com/vmware/admiral/compute/PlacementCapacityUpdateTaskService.java @@ -413,7 +413,7 @@ private void retrieveAndUpdatePlacements(PlacementCapacityUpdateTaskState state) .addFieldClause(GroupResourcePlacementState.FIELD_NAME_RESOURCE_POOL_LINK, state.resourcePoolLink) .build(); - QueryTask queryTask = QueryTask.Builder.create() + QueryTask queryTask = QueryTask.Builder.createDirectTask() .setQuery(query) .addOption(QueryOption.EXPAND_CONTENT) .build(); diff --git a/compute/src/main/java/com/vmware/admiral/compute/container/GroupResourcePlacementService.java b/compute/src/main/java/com/vmware/admiral/compute/container/GroupResourcePlacementService.java index d8a6f18cc..5edba8a0a 100644 --- a/compute/src/main/java/com/vmware/admiral/compute/container/GroupResourcePlacementService.java +++ b/compute/src/main/java/com/vmware/admiral/compute/container/GroupResourcePlacementService.java @@ -522,7 +522,7 @@ public void handleDelete(Operation delete) { } private QueryTask createGroupResourcePlacementQueryTask(GroupResourcePlacementState state) { - QueryTask q = QueryUtil.buildQuery(GroupResourcePlacementState.class, false); + QueryTask q = QueryUtil.buildQuery(GroupResourcePlacementState.class, true); QueryTask.Query resourcePoolClause = new QueryTask.Query() .setTermPropertyName(GroupResourcePlacementPoolState.FIELD_NAME_RESOURCE_POOL_LINK) diff --git a/request/src/main/java/com/vmware/admiral/request/ContainerHostRemovalTaskService.java b/request/src/main/java/com/vmware/admiral/request/ContainerHostRemovalTaskService.java index 876fb0684..5474bcbe1 100644 --- a/request/src/main/java/com/vmware/admiral/request/ContainerHostRemovalTaskService.java +++ b/request/src/main/java/com/vmware/admiral/request/ContainerHostRemovalTaskService.java @@ -206,7 +206,7 @@ private void disableContainerHosts(ContainerHostRemovalTaskState state, String s } private void queryContainers(ContainerHostRemovalTaskState state) { - QueryTask containerQuery = QueryUtil.buildQuery(ContainerState.class, false); + QueryTask containerQuery = QueryUtil.buildQuery(ContainerState.class, true); QueryUtil.addListValueClause(containerQuery, ContainerState.FIELD_NAME_PARENT_LINK, state.resourceLinks); diff --git a/request/src/main/java/com/vmware/admiral/request/ContainerNetworkProvisionTaskService.java b/request/src/main/java/com/vmware/admiral/request/ContainerNetworkProvisionTaskService.java index bfb0db79c..ea96f2390 100644 --- a/request/src/main/java/com/vmware/admiral/request/ContainerNetworkProvisionTaskService.java +++ b/request/src/main/java/com/vmware/admiral/request/ContainerNetworkProvisionTaskService.java @@ -400,7 +400,6 @@ private void getContextContainerStates(ContainerNetworkProvisionTaskState state, QueryTask q = QueryUtil.buildPropertyQuery(ContainerState.class, ContainerState.FIELD_NAME_COMPOSITE_COMPONENT_LINK, UriUtils.buildUriPath( CompositeComponentFactoryService.SELF_LINK, contextId)); - q.taskInfo.isDirect = false; QueryUtil.addExpandOption(q); Map> containersByDescriptionLink = new HashMap<>(); diff --git a/request/src/main/java/com/vmware/admiral/request/ContainerVolumeProvisionTaskService.java b/request/src/main/java/com/vmware/admiral/request/ContainerVolumeProvisionTaskService.java index 49832dd93..f0682659a 100644 --- a/request/src/main/java/com/vmware/admiral/request/ContainerVolumeProvisionTaskService.java +++ b/request/src/main/java/com/vmware/admiral/request/ContainerVolumeProvisionTaskService.java @@ -274,7 +274,6 @@ private void getContextContainerStates(ContainerVolumeProvisionTaskState state, QueryTask q = QueryUtil.buildPropertyQuery(ContainerState.class, ContainerState.FIELD_NAME_COMPOSITE_COMPONENT_LINK, UriUtils.buildUriPath( CompositeComponentFactoryService.SELF_LINK, contextId)); - q.taskInfo.isDirect = false; QueryUtil.addExpandOption(q); Map> containersByDescriptionLink = new HashMap<>(); diff --git a/request/src/main/java/com/vmware/admiral/request/ResourceNamePrefixTaskService.java b/request/src/main/java/com/vmware/admiral/request/ResourceNamePrefixTaskService.java index 20438be2e..c057230fb 100644 --- a/request/src/main/java/com/vmware/admiral/request/ResourceNamePrefixTaskService.java +++ b/request/src/main/java/com/vmware/admiral/request/ResourceNamePrefixTaskService.java @@ -99,7 +99,7 @@ protected static class CallbackCompleteResponse extends ServiceTaskCallbackRespo private void queryResourceNamePrefixes(ResourceNamePrefixTaskState state, boolean globalSearch) { // match on group property: - QueryTask q = QueryUtil.buildQuery(ResourceNamePrefixState.class, false); + QueryTask q = QueryUtil.buildQuery(ResourceNamePrefixState.class, true); q.tenantLinks = state.tenantLinks; List documentLinks = new ArrayList<>(); diff --git a/request/src/main/java/com/vmware/admiral/request/allocation/filter/BaseAffinityHostFilter.java b/request/src/main/java/com/vmware/admiral/request/allocation/filter/BaseAffinityHostFilter.java index e1fb79cb1..27253785b 100644 --- a/request/src/main/java/com/vmware/admiral/request/allocation/filter/BaseAffinityHostFilter.java +++ b/request/src/main/java/com/vmware/admiral/request/allocation/filter/BaseAffinityHostFilter.java @@ -122,7 +122,6 @@ protected void findContainers(final PlacementHostSelectionTaskState state, QueryTask q = QueryUtil.buildPropertyQuery(ContainerState.class, ContainerState.FIELD_NAME_COMPOSITE_COMPONENT_LINK, UriUtils.buildUriPath( CompositeComponentFactoryService.SELF_LINK, state.contextId)); - q.taskInfo.isDirect = false; q.querySpec.resultLimit = ServiceDocumentQuery.DEFAULT_QUERY_RESULT_LIMIT; QueryUtil.addExpandOption(q); diff --git a/request/src/main/java/com/vmware/admiral/request/allocation/filter/ClusterServiceLinkAffinityHostFilter.java b/request/src/main/java/com/vmware/admiral/request/allocation/filter/ClusterServiceLinkAffinityHostFilter.java index 79e446197..623dcb0d4 100644 --- a/request/src/main/java/com/vmware/admiral/request/allocation/filter/ClusterServiceLinkAffinityHostFilter.java +++ b/request/src/main/java/com/vmware/admiral/request/allocation/filter/ClusterServiceLinkAffinityHostFilter.java @@ -73,7 +73,7 @@ protected void findCompositeDescriptions(final PlacementHostSelectionTaskState s final HostSelectionFilterCompletion callback) { // get descriptionLinks for the containers in the same component as the current container - QueryTask q = QueryUtil.buildQuery(ContainerState.class, false); + QueryTask q = QueryUtil.buildQuery(ContainerState.class, true); String contextId = state.customProperties.get(RequestUtils.FIELD_NAME_CONTEXT_ID_KEY); String contextLink = UriUtils.buildUriPath(CompositeComponentFactoryService.SELF_LINK, contextId); QueryTask.Query contextClause = new QueryTask.Query() diff --git a/request/src/main/java/com/vmware/admiral/request/allocation/filter/NamedVolumeAffinityHostFilter.java b/request/src/main/java/com/vmware/admiral/request/allocation/filter/NamedVolumeAffinityHostFilter.java index 561b0a712..10800bf37 100644 --- a/request/src/main/java/com/vmware/admiral/request/allocation/filter/NamedVolumeAffinityHostFilter.java +++ b/request/src/main/java/com/vmware/admiral/request/allocation/filter/NamedVolumeAffinityHostFilter.java @@ -524,7 +524,6 @@ private void queryContainers(PlacementHostSelectionTaskState state, QueryTask q = QueryUtil.buildPropertyQuery(ContainerState.class, ContainerState.FIELD_NAME_COMPOSITE_COMPONENT_LINK, UriUtils.buildUriPath( CompositeComponentFactoryService.SELF_LINK, state.contextId)); - q.taskInfo.isDirect = false; QueryUtil.addExpandOption(q); QueryUtil.addListValueClause(q, diff --git a/request/src/main/java/com/vmware/admiral/request/allocation/filter/ServiceLinkAffinityFilter.java b/request/src/main/java/com/vmware/admiral/request/allocation/filter/ServiceLinkAffinityFilter.java index b65953274..f7d7982fb 100644 --- a/request/src/main/java/com/vmware/admiral/request/allocation/filter/ServiceLinkAffinityFilter.java +++ b/request/src/main/java/com/vmware/admiral/request/allocation/filter/ServiceLinkAffinityFilter.java @@ -67,7 +67,6 @@ protected void findContainers(final PlacementHostSelectionTaskState state, QueryTask q = QueryUtil.buildPropertyQuery(ContainerState.class, ContainerState.FIELD_NAME_COMPOSITE_COMPONENT_LINK, UriUtils.buildUriPath( CompositeComponentFactoryService.SELF_LINK, state.contextId)); - q.taskInfo.isDirect = false; q.querySpec.resultLimit = ServiceDocumentQuery.DEFAULT_QUERY_RESULT_LIMIT; QueryUtil.addExpandOption(q);