You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2018/05/10 13:34:51 UTC
[ambari] branch trunk updated: AMBARI-23765. Remove topology info
from non-blueprint commands. (#1213)
This is an automated email from the ASF dual-hosted git repository.
mpapirkovskyy pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 28d120f AMBARI-23765. Remove topology info from non-blueprint commands. (#1213)
28d120f is described below
commit 28d120fd1012f9b16208b05504a051bcb20187e5
Author: Myroslav Papirkovskyi <mp...@apache.org>
AuthorDate: Thu May 10 16:34:48 2018 +0300
AMBARI-23765. Remove topology info from non-blueprint commands. (#1213)
* AMBARI-23765. Remove topology info from non-blueprint commands. (mpapirkovskyy)
* AMBARI-23765. Remove topology info from non-blueprint commands. (mpapirkovskyy)
---
.../AmbariCustomCommandExecutionHelper.java | 4 --
.../controller/AmbariManagementController.java | 28 ++++++++
.../controller/AmbariManagementControllerImpl.java | 33 ++++++---
.../server/controller/DeleteIdentityHandler.java | 1 -
.../server/controller/KerberosHelperImpl.java | 15 ----
.../controller/OrderedRequestStageContainer.java | 4 --
.../ClusterStackVersionResourceProvider.java | 10 ---
.../internal/HostComponentResourceProvider.java | 29 +++++---
.../controller/internal/HostResourceProvider.java | 7 +-
.../internal/HostStackVersionResourceProvider.java | 2 -
.../internal/UpgradeResourceProvider.java | 6 --
.../ambari/server/hooks/users/UserHookService.java | 1 -
.../ambari/server/topology/AmbariContext.java | 4 +-
.../controller/AmbariManagementControllerTest.java | 2 -
.../server/controller/KerberosHelperTest.java | 82 ----------------------
.../HostComponentResourceProviderTest.java | 5 +-
16 files changed, 79 insertions(+), 154 deletions(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index b706944..0d3cd9d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -733,10 +733,6 @@ public class AmbariCustomCommandExecutionHelper {
execCmd.setConfigurationAttributes(configurationAttributes);
execCmd.setConfigurationTags(configTags);
- // Generate cluster host info
- execCmd.setClusterHostInfo(
- StageUtils.getClusterHostInfo(cluster));
-
// Generate localComponents
for (ServiceComponentHost sch : cluster.getServiceComponentHosts(hostname)) {
execCmd.getLocalComponents().add(sch.getServiceComponentName());
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
index 8cff3f2..efff4c1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
@@ -612,6 +612,34 @@ public interface AmbariManagementController {
boolean runSmokeTest, boolean reconfigureClients, boolean useGeneratedConfigs) throws AmbariException;
/**
+ * Add stages to the request.
+ *
+ * @param requestStages Stages currently associated with request
+ * @param cluster cluster being acted on
+ * @param requestProperties the request properties
+ * @param requestParameters the request parameters; may be null
+ * @param changedServices the services being changed; may be null
+ * @param changedComponents the components being changed
+ * @param changedHosts the hosts being changed
+ * @param ignoredHosts the hosts to be ignored
+ * @param runSmokeTest indicates whether or not the smoke tests should be run
+ * @param reconfigureClients indicates whether or not the clients should be reconfigured
+ * @param useGeneratedConfigs indicates whether or not the actual configs should be a part of the stage
+ * @param useClusterHostInfo indicates whether or not the cluster topology info should be a part of the stage
+ *
+ * @return request stages
+ *
+ * @throws AmbariException if stages can't be created
+ */
+ RequestStageContainer addStages(RequestStageContainer requestStages, Cluster cluster, Map<String, String> requestProperties,
+ Map<String, String> requestParameters,
+ Map<State, List<Service>> changedServices,
+ Map<State, List<ServiceComponent>> changedComponents,
+ Map<String, Map<State, List<ServiceComponentHost>>> changedHosts,
+ Collection<ServiceComponentHost> ignoredHosts,
+ boolean runSmokeTest, boolean reconfigureClients, boolean useGeneratedConfigs, boolean useClusterHostInfo) throws AmbariException;
+
+ /**
* Getter for the url of JDK, stored at server resources folder
*/
String getJdkResourceUrl();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 735a511..26b2545 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -1148,7 +1148,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
private Stage createNewStage(long id, Cluster cluster, long requestId,
- String requestContext, String clusterHostInfo,
+ String requestContext,
String commandParamsStage, String hostParamsStage) {
String logDir = BASE_LOG_DIR + File.pathSeparator + requestId;
Stage stage =
@@ -2713,7 +2713,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
Map<String, Map<State, List<ServiceComponentHost>>> changedScHosts,
Map<String, String> requestParameters,
Map<String, String> requestProperties,
- boolean runSmokeTest, boolean reconfigureClients, boolean useLatestConfigs)
+ boolean runSmokeTest, boolean reconfigureClients, boolean useLatestConfigs, boolean useClusterHostInfo)
throws AmbariException {
@@ -2763,7 +2763,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
Stage stage = createNewStage(requestStages.getLastStageId(), cluster,
requestStages.getId(), requestProperties.get(REQUEST_CONTEXT_PROPERTY),
- clusterHostInfoJson, "{}", null);
+ "{}", null);
boolean skipFailure = false;
if (requestProperties.containsKey(Setting.SETTING_NAME_SKIP_FAILURE) && requestProperties.get(Setting.SETTING_NAME_SKIP_FAILURE).equalsIgnoreCase("true")) {
skipFailure = true;
@@ -3145,7 +3145,10 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
rg.setCommandExecutionType(CommandExecutionType.DEPENDENCY_ORDERED);
}
rg.build(stage);
- requestStages.setClusterHostInfo(clusterHostInfoJson);
+ if (useClusterHostInfo) {
+ requestStages.setClusterHostInfo(clusterHostInfoJson);
+ }
+
requestStages.addStages(rg.getStages());
if (!componentsToEnableKerberos.isEmpty()) {
@@ -3235,7 +3238,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
Map<String, String> hostParamsCmd = customCommandExecutionHelper.createDefaultHostParams(
cluster, scHost.getServiceComponent().getDesiredStackId());
- Stage stage = createNewStage(0, cluster, 1, "", clusterHostInfoJson, "{}", "");
+ Stage stage = createNewStage(0, cluster, 1, "", "{}", "");
Map<String, Map<String, String>> configTags = configHelper.getEffectiveDesiredTags(cluster, scHost.getHostName());
Map<String, Map<String, String>> configurations = configHelper.getEffectiveConfigProperties(cluster, configTags);
@@ -3264,9 +3267,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
hostParamsCmd.putAll(ec.getHostLevelParams());
ec.getHostLevelParams().putAll(hostParamsCmd);
- ec.setClusterHostInfo(
- StageUtils.getClusterHostInfo(cluster));
-
if (null != cluster) {
// Generate localComponents
for (ServiceComponentHost sch : cluster.getServiceComponentHosts(scHost.getHostName())) {
@@ -3466,13 +3466,25 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
Collection<ServiceComponentHost> ignoredHosts, boolean runSmokeTest,
boolean reconfigureClients, boolean useGeneratedConfigs) throws AmbariException {
+ return addStages(requestStages, cluster, requestProperties, requestParameters, changedServices, changedComponents,
+ changedHosts, ignoredHosts, runSmokeTest, reconfigureClients, useGeneratedConfigs, false);
+ }
+
+ @Override
+ public RequestStageContainer addStages(RequestStageContainer requestStages, Cluster cluster, Map<String, String> requestProperties,
+ Map<String, String> requestParameters, Map<State, List<Service>> changedServices,
+ Map<State, List<ServiceComponent>> changedComponents,
+ Map<String, Map<State, List<ServiceComponentHost>>> changedHosts,
+ Collection<ServiceComponentHost> ignoredHosts, boolean runSmokeTest,
+ boolean reconfigureClients, boolean useGeneratedConfigs, boolean useClusterHostInfo) throws AmbariException {
+
if (requestStages == null) {
requestStages = new RequestStageContainer(actionManager.getNextRequestId(), null, requestFactory, actionManager);
}
requestStages = doStageCreation(requestStages, cluster, changedServices, changedComponents,
changedHosts, requestParameters, requestProperties,
- runSmokeTest, reconfigureClients, useGeneratedConfigs);
+ runSmokeTest, reconfigureClients, useGeneratedConfigs, useClusterHostInfo);
updateServiceStates(cluster, changedServices, changedComponents, changedHosts, ignoredHosts);
@@ -4101,7 +4113,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
commandParamsForStage = gson.toJson(commandParamsStage);
Stage stage = createNewStage(requestStageContainer.getLastStageId(), cluster, requestId, requestContext,
- jsons.getClusterHostInfo(), commandParamsForStage, jsons.getHostParamsForStage());
+ commandParamsForStage, jsons.getHostParamsForStage());
if (actionRequest.isCommand()) {
customCommandExecutionHelper.addExecutionCommandsToStage(actionExecContext, stage,
@@ -4122,7 +4134,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
List<Stage> stages = rg.getStages();
if (stages != null && !stages.isEmpty()) {
- requestStageContainer.setClusterHostInfo(jsons.getClusterHostInfo());
requestStageContainer.addStages(stages);
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/DeleteIdentityHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/DeleteIdentityHandler.java
index 9837d70..36cc169 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/DeleteIdentityHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/DeleteIdentityHandler.java
@@ -81,7 +81,6 @@ class DeleteIdentityHandler {
{
ServiceComponentHostServerActionEvent event = new ServiceComponentHostServerActionEvent(RootComponent.AMBARI_SERVER.name(), StageUtils.getHostName(), System.currentTimeMillis());
String hostParamsJson = StageUtils.getGson().toJson(customCommandExecutionHelper.createDefaultHostParams(cluster, cluster.getDesiredStackVersion()));
- stageContainer.setClusterHostInfo(StageUtils.getGson().toJson(StageUtils.getClusterHostInfo(cluster)));
if (manageIdentities) {
addPrepareDeleteIdentity(cluster, hostParamsJson, event, commandParameters, stageContainer);
addDestroyPrincipals(cluster, hostParamsJson, event, commandParameters, stageContainer);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index 3f0ea84..c492173 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -3394,7 +3394,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3418,7 +3417,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3442,7 +3440,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3466,7 +3463,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3490,7 +3486,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3514,7 +3509,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3538,7 +3532,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3571,7 +3564,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3604,7 +3596,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3625,7 +3616,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3676,7 +3666,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3720,7 +3709,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3744,7 +3732,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3778,7 +3765,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
@@ -3802,7 +3788,6 @@ public class KerberosHelperImpl implements KerberosHelper {
RoleGraph roleGraph = roleGraphFactory.createNew(roleCommandOrder);
roleGraph.build(stage);
- requestStageContainer.setClusterHostInfo(clusterHostInfoJson);
requestStageContainer.addStages(roleGraph.getStages());
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/OrderedRequestStageContainer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/OrderedRequestStageContainer.java
index 4ac6896..340a727 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/OrderedRequestStageContainer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/OrderedRequestStageContainer.java
@@ -55,8 +55,4 @@ public class OrderedRequestStageContainer {
public RequestStageContainer getRequestStageContainer() {
return requestStageContainer;
}
-
- public void setClusterHostInfo(String clusterHostInfo) {
- this.requestStageContainer.setClusterHostInfo(clusterHostInfo);
- }
}
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 837a7e2..8358525 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
@@ -563,15 +563,6 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
hostLevelParams.put(JDK_LOCATION, getManagementController().getJdkResourceUrl());
String hostParamsJson = StageUtils.getGson().toJson(hostLevelParams);
- // Generate cluster host info
- String clusterHostInfoJson;
- try {
- clusterHostInfoJson = StageUtils.getGson().toJson(
- StageUtils.getClusterHostInfo(cluster));
- } catch (AmbariException e) {
- throw new SystemException("Could not build cluster topology", e);
- }
-
int maxTasks = configuration.getAgentPackageParallelCommandsLimit();
int hostCount = hosts.size();
int batchCount = (int) (Math.ceil((double)hostCount / maxTasks));
@@ -653,7 +644,6 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
repoVersionEnt.getDisplayName()));
}
- req.setClusterHostInfo(clusterHostInfoJson);
req.addStages(stages);
req.persist();
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 ac63043..96197c0 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
@@ -317,7 +317,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
throw new IllegalArgumentException("Received an update request with no properties");
}
- RequestStageContainer requestStages = doUpdateResources(null, request, predicate, false, false);
+ RequestStageContainer requestStages = doUpdateResources(null, request, predicate, false, false, false);
RequestStatusResponse response = null;
if (requestStages != null) {
@@ -372,7 +372,9 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
return unsupportedProperties;
}
- public RequestStatusResponse install(String cluster, String hostname, Collection<String> skipInstallForComponents, Collection<String> dontSkipInstallForComponents, boolean skipFailure) throws SystemException,
+ public RequestStatusResponse install(String cluster, String hostname, Collection<String> skipInstallForComponents,
+ Collection<String> dontSkipInstallForComponents,
+ boolean skipFailure, boolean useClusterHostInfo) throws SystemException,
UnsupportedPropertyException, NoSuchParentResourceException {
RequestStageContainer requestStages;
@@ -403,7 +405,8 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
LOG.info("Installing all components on host: " + hostname);
// we need send special parameters to send install/start commands with configs
- requestStages = doUpdateResources(null, installRequest, installPredicate, true, true);
+ requestStages = doUpdateResources(null, installRequest, installPredicate, true,
+ true, useClusterHostInfo);
notifyUpdate(Resource.Type.HostComponent, installRequest, installPredicate);
try {
requestStages.persist();
@@ -424,10 +427,11 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
public RequestStatusResponse start(String cluster, String hostName) throws SystemException,
UnsupportedPropertyException, NoSuchParentResourceException {
- return this.start(cluster, hostName, Collections.emptySet(), false);
+ return this.start(cluster, hostName, Collections.emptySet(), false, false);
}
- public RequestStatusResponse start(String cluster, String hostName, Collection<String> installOnlyComponents, boolean skipFailure) throws SystemException,
+ public RequestStatusResponse start(String cluster, String hostName, Collection<String> installOnlyComponents,
+ boolean skipFailure, boolean useClusterHostInfo) throws SystemException,
UnsupportedPropertyException, NoSuchParentResourceException {
Map<String, String> requestInfo = new HashMap<>();
@@ -480,7 +484,8 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
}
- requestStages = doUpdateResources(null, startRequest, startPredicate, true, true);
+ requestStages = doUpdateResources(null, startRequest, startPredicate, true,
+ true, useClusterHostInfo);
notifyUpdate(Resource.Type.HostComponent, startRequest, startPredicate);
try {
requestStages.persist();
@@ -516,7 +521,8 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
protected RequestStageContainer updateHostComponents(RequestStageContainer stages,
Set<ServiceComponentHostRequest> requests,
Map<String, String> requestProperties,
- boolean runSmokeTest, boolean useGeneratedConfigs) throws AmbariException, AuthorizationException {
+ boolean runSmokeTest, boolean useGeneratedConfigs,
+ boolean useClusterHostInfo) throws AmbariException, AuthorizationException {
Clusters clusters = getManagementController().getClusters();
@@ -696,7 +702,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
return getManagementController().addStages(
stages, cluster, requestProperties, null, null, null,
- changedScHosts, ignoredScHosts, runSmokeTest, false, useGeneratedConfigs);
+ changedScHosts, ignoredScHosts, runSmokeTest, false, useGeneratedConfigs, useClusterHostInfo);
}
@Override
@@ -785,6 +791,8 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
* @param request request
* @param predicate request predicate
* @param performQueryEvaluation should query be evaluated for matching resource set
+ * @param useGeneratedConfigs should update request contains actual configs
+ * @param useClusterHostInfo should update request contain cluster topology info
* @return
* @throws UnsupportedPropertyException an unsupported property was specified in the request
* @throws SystemException an unknown exception occurred
@@ -792,7 +800,8 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
* @throws NoSuchParentResourceException a specified parent resource doesn't exist
*/
private RequestStageContainer doUpdateResources(final RequestStageContainer stages, final Request request,
- Predicate predicate, boolean performQueryEvaluation, boolean useGeneratedConfigs)
+ Predicate predicate, boolean performQueryEvaluation,
+ boolean useGeneratedConfigs, boolean useClusterHostInfo)
throws UnsupportedPropertyException,
SystemException,
NoSuchResourceException,
@@ -842,7 +851,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
RequestStageContainer stageContainer = null;
try {
stageContainer = updateHostComponents(stages, requests, request.getRequestInfoProperties(),
- runSmokeTest, useGeneratedConfigs);
+ runSmokeTest, useGeneratedConfigs, useClusterHostInfo);
} catch (Exception e) {
LOG.info("Caught an exception while updating host components, will not try again: {}", e.getMessage(), e);
// !!! IllegalArgumentException results in a 400 response, RuntimeException results in 500.
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index b07e834..53c4fe3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -696,7 +696,10 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
}
}
- public RequestStatusResponse install(final String cluster, final String hostname, Collection<String> skipInstallForComponents, Collection<String> dontSkipInstallForComponents, final boolean skipFailure)
+ public RequestStatusResponse install(final String cluster, final String hostname,
+ Collection<String> skipInstallForComponents,
+ Collection<String> dontSkipInstallForComponents, final boolean skipFailure,
+ boolean useClusterHostInfo)
throws ResourceAlreadyExistsException,
SystemException,
NoSuchParentResourceException,
@@ -704,7 +707,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
return ((HostComponentResourceProvider) getResourceProvider(Resource.Type.HostComponent)).
- install(cluster, hostname, skipInstallForComponents, dontSkipInstallForComponents, skipFailure);
+ install(cluster, hostname, skipInstallForComponents, dontSkipInstallForComponents, skipFailure, useClusterHostInfo);
}
public RequestStatusResponse start(final String cluster, final String hostname)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index d4424d0..707337d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -478,7 +478,6 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
stageId = 1L;
}
stage.setStageId(stageId);
- req.setClusterHostInfo(clusterHostInfoJson);
req.addStages(Collections.singletonList(stage));
try {
@@ -525,7 +524,6 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
stageId = 1L;
}
stage.setStageId(stageId);
- req.setClusterHostInfo(clusterHostInfoJson);
req.addStages(Collections.singletonList(stage));
actionContext = new ActionExecutionContext(
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 869b256..bbb9de4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -107,7 +107,6 @@ import org.apache.ambari.server.state.stack.upgrade.UpdateStackGrouping;
import org.apache.ambari.server.state.stack.upgrade.UpgradeScope;
import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent;
-import org.apache.ambari.server.utils.StageUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.annotate.JsonProperty;
@@ -917,11 +916,6 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
requestStages.setRequestContext(String.format("%s %s %s", direction.getVerb(true),
direction.getPreposition(), repositoryVersion.getVersion()));
- Cluster cluster = upgradeContext.getCluster();
- Map<String, Set<String>> clusterHostInfo = StageUtils.getClusterHostInfo(cluster);
- String clusterHostInfoJson = StageUtils.getGson().toJson(clusterHostInfo);
- requestStages.setClusterHostInfo(clusterHostInfoJson);
-
return requestStages;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java
index a3370da..eddb5c8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java
@@ -148,7 +148,6 @@ public class UserHookService implements HookService {
stage.addServerActionCommand(PostUserCreationHookServerAction.class.getName(), "ambari", Role.AMBARI_SERVER_ACTION,
RoleCommand.EXECUTE, clsData.getClusterName(), serverActionEvent, commandParams, stageContextText, null, null, false, false);
- requestStageContainer.setClusterHostInfo("{}");
requestStageContainer.addStages(Collections.singletonList(stage));
requestStageContainer.persist();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
index 4c1eec0..170ad4c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
@@ -477,7 +477,7 @@ public class AmbariContext {
public RequestStatusResponse installHost(String hostName, String clusterName, Collection<String> skipInstallForComponents, Collection<String> dontSkipInstallForComponents, boolean skipFailure) {
try {
return getHostResourceProvider().install(clusterName, hostName, skipInstallForComponents,
- dontSkipInstallForComponents, skipFailure);
+ dontSkipInstallForComponents, skipFailure, true);
} catch (Exception e) {
LOG.error("INSTALL Host request submission failed:", e);
throw new RuntimeException("INSTALL Host request submission failed: " + e, e);
@@ -486,7 +486,7 @@ public class AmbariContext {
public RequestStatusResponse startHost(String hostName, String clusterName, Collection<String> installOnlyComponents, boolean skipFailure) {
try {
- return getHostComponentResourceProvider().start(clusterName, hostName, installOnlyComponents, skipFailure);
+ return getHostComponentResourceProvider().start(clusterName, hostName, installOnlyComponents, skipFailure, true);
} catch (Exception e) {
LOG.error("START Host request submission failed:", e);
throw new RuntimeException("START Host request submission failed: " + e, e);
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index d67f9e5..d70a38a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -1312,8 +1312,6 @@ public class AmbariManagementControllerTest {
assertEquals("0", ec.getCommandParams().get("max_duration_for_retries"));
assertTrue(ec.getCommandParams().containsKey("command_retry_enabled"));
assertEquals("false", ec.getCommandParams().get("command_retry_enabled"));
- Map<String, Set<String>> chInfo = ec.getClusterHostInfo();
- assertTrue(chInfo.containsKey("namenode_hosts"));
assertFalse(ec.getCommandParams().containsKey("custom_folder"));
ec = controller.getExecutionCommand(cluster,
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
index 8c9e7e9..5c6f693 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
@@ -1095,8 +1095,6 @@ public class KerberosHelperTest extends EasyMockSupport {
// Create Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(anyObject(List.class));
expectLastCall().once();
@@ -1104,22 +1102,16 @@ public class KerberosHelperTest extends EasyMockSupport {
// Create Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(anyObject(List.class));
expectLastCall().once();
// Create Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(anyObject(List.class));
expectLastCall().once();
// Distribute Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(anyObject(List.class));
expectLastCall().once();
}
@@ -1127,9 +1119,6 @@ public class KerberosHelperTest extends EasyMockSupport {
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
-
requestStageContainer.addStages(anyObject(List.class));
expectLastCall().once();
// TODO: Add more of these when more stages are added.
@@ -1137,9 +1126,6 @@ public class KerberosHelperTest extends EasyMockSupport {
expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
-
requestStageContainer.addStages(anyObject(List.class));
expectLastCall().once();
@@ -1270,58 +1256,42 @@ public class KerberosHelperTest extends EasyMockSupport {
// Hook Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(anyObject(List.class));
expectLastCall().once();
// StopZk Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(anyObject(List.class));
expectLastCall().once();
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Update Configs Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Destroy Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Delete Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(2L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Cleanup Stage
expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
@@ -1482,43 +1452,31 @@ public class KerberosHelperTest extends EasyMockSupport {
// Create Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Create Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Create Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(0L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Distribute Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Update Configurations Stage
expect(requestStageContainer.getLastStageId()).andReturn(1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(3L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
} else {
@@ -3184,43 +3142,31 @@ public class KerberosHelperTest extends EasyMockSupport {
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Getting missing keytabs
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Create Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Create Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Distribute Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
@@ -3397,29 +3343,21 @@ public class KerberosHelperTest extends EasyMockSupport {
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Delete Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Delete Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
@@ -3581,44 +3519,32 @@ public class KerberosHelperTest extends EasyMockSupport {
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Getting missing keytabs
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Create Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Create Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Distribute Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
}
@@ -3770,29 +3696,21 @@ public class KerberosHelperTest extends EasyMockSupport {
// Preparation Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Delete Principals Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Delete Keytabs Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
// Clean-up/Finalize Stage
expect(requestStageContainer.getLastStageId()).andReturn(-1L).anyTimes();
expect(requestStageContainer.getId()).andReturn(1L).once();
- requestStageContainer.setClusterHostInfo(anyString());
- expectLastCall().once();
requestStageContainer.addStages(EasyMock.anyObject());
expectLastCall().once();
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 00ccd0d..24dd8ce 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
@@ -373,7 +373,7 @@ public class HostComponentResourceProviderTest {
changedHosts.put("Component100", Collections.singletonMap(State.STARTED, changedComponentHosts));
expect(managementController.addStages(null, cluster, mapRequestProps, null, null, null, changedHosts,
- Collections.emptyList(), false, false, false)).andReturn(stageContainer).once();
+ Collections.emptyList(), false, false, false, false)).andReturn(stageContainer).once();
stageContainer.persist();
expect(stageContainer.getRequestStatusResponse()).andReturn(response).once();
@@ -616,7 +616,8 @@ public class HostComponentResourceProviderTest {
provider.setFieldValue("maintenanceStateHelper", injector.getInstance(MaintenanceStateHelper.class));
provider.setFieldValue("hostVersionDAO", injector.getInstance(HostVersionDAO.class));
- RequestStageContainer requestStages = provider.updateHostComponents(null, requests, requestProperties, runSmokeTest, false);
+ RequestStageContainer requestStages = provider.updateHostComponents(null, requests, requestProperties,
+ runSmokeTest, false, false);
requestStages.persist();
return requestStages.getRequestStatusResponse();
}
--
To stop receiving notification emails like this one, please contact
mpapirkovskyy@apache.org.