You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/08/27 16:05:16 UTC
[35/35] git commit: Merge branch 'trunk' into branch-alerts-dev
Merge branch 'trunk' into branch-alerts-dev
Conflicts:
ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ae8f1e77
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae8f1e77
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae8f1e77
Branch: refs/heads/branch-alerts-dev
Commit: ae8f1e77eafe32c2ad8bded7da24a2cef07b605f
Parents: 4a4644b a826334
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Wed Aug 27 10:04:14 2014 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Wed Aug 27 10:04:14 2014 -0400
----------------------------------------------------------------------
ambari-agent/conf/unix/install-helper.sh | 7 -
ambari-agent/pom.xml | 11 +-
ambari-server/conf/unix/install-helper.sh | 3 -
.../server/actionmanager/ActionScheduler.java | 33 ++
.../ambari/server/actionmanager/Stage.java | 32 +-
.../server/actionmanager/StageFactory.java | 4 +-
.../ambari/server/agent/ExecutionCommand.java | 2 +-
.../resources/RequestResourceDefinition.java | 12 +-
.../ServiceConfigVersionResourceDefinition.java | 10 +-
.../server/api/services/AmbariMetaInfo.java | 18 +
.../stackadvisor/StackAdvisorHelper.java | 14 +-
.../stackadvisor/StackAdvisorHelper.java.orig | 116 ----
.../stackadvisor/StackAdvisorResponse.java | 73 +++
...GetComponentLayoutRecommnedationCommand.java | 5 +-
.../GetComponentLayoutValidationCommand.java | 5 +-
.../GetConfigurationRecommnedationCommand.java | 18 +-
.../GetConfigurationValidationCommand.java | 5 +-
.../commands/StackAdvisorCommand.java | 30 +-
.../recommendations/RecommendationResponse.java | 38 +-
.../validations/ValidationResponse.java | 15 +-
.../server/api/util/StackExtensionHelper.java | 9 +
.../controller/AmbariActionExecutionHelper.java | 9 +-
.../AmbariCustomCommandExecutionHelper.java | 34 +-
.../AmbariManagementControllerImpl.java | 184 ++++---
.../server/controller/ClusterRequest.java | 28 +-
.../server/controller/ClusterResponse.java | 9 +-
.../server/controller/ConfigGroupRequest.java | 9 +
.../ambari/server/controller/HostRequest.java | 11 +-
.../controller/ServiceConfigVersionRequest.java | 23 +
.../ServiceConfigVersionResponse.java | 13 +-
.../StackServiceComponentResponse.java | 33 +-
.../server/controller/StackServiceResponse.java | 16 +-
.../internal/AbstractResourceProvider.java | 92 ++--
.../internal/BaseBlueprintProcessor.java | 37 +-
.../BlueprintConfigurationProcessor.java | 5 +-
.../internal/ClusterResourceProvider.java | 126 +++--
.../internal/ConfigGroupResourceProvider.java | 4 +
.../internal/HostResourceProvider.java | 54 +-
.../RecommendationResourceProvider.java | 4 +-
.../ServiceConfigVersionResourceProvider.java | 12 +-
.../StackServiceComponentResourceProvider.java | 22 +-
.../internal/StackServiceResourceProvider.java | 22 +-
.../internal/ValidationResourceProvider.java | 4 +-
.../internal/ViewInstanceResourceProvider.java | 9 +-
.../internal/ViewVersionResourceProvider.java | 3 +
.../ambari/server/orm/dao/ServiceConfigDAO.java | 41 +-
.../server/orm/entities/AlertGroupEntity.java | 74 ++-
.../ambari/server/orm/entities/StageEntity.java | 28 +
.../ambari/server/orm/entities/ViewEntity.java | 39 +-
.../ambari/server/stageplanner/RoleGraph.java | 3 +-
.../org/apache/ambari/server/state/Cluster.java | 15 +-
.../ambari/server/state/ComponentInfo.java | 14 +-
.../ambari/server/state/ConfigHelper.java | 15 +-
.../apache/ambari/server/state/ServiceInfo.java | 9 +
.../server/state/cluster/ClusterImpl.java | 119 +++-
.../server/upgrade/AbstractUpgradeCatalog.java | 3 +-
.../server/upgrade/UpgradeCatalog170.java | 19 +-
.../apache/ambari/server/utils/StageUtils.java | 13 +-
.../apache/ambari/server/view/ViewRegistry.java | 15 +
.../server/view/configuration/ViewConfig.java | 14 +
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 5 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 5 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 5 +-
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 5 +-
.../main/resources/custom_actions/check_host.py | 7 +-
.../src/main/resources/properties.json | 7 +-
.../src/main/resources/scripts/stack_advisor.py | 5 +-
.../1.3.2/hooks/before-ANY/scripts/params.py | 3 +-
.../hooks/before-INSTALL/scripts/params.py | 2 +-
.../HDP/1.3.2/services/GANGLIA/metainfo.xml | 3 +
.../HDP/1.3.2/services/HBASE/metainfo.xml | 4 +
.../stacks/HDP/1.3.2/services/HDFS/metainfo.xml | 5 +
.../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 11 +-
.../services/HIVE/package/scripts/params.py | 2 +-
.../HDP/1.3.2/services/MAPREDUCE/metainfo.xml | 5 +
.../HDP/1.3.2/services/NAGIOS/metainfo.xml | 2 +
.../HDP/1.3.2/services/OOZIE/metainfo.xml | 3 +
.../stacks/HDP/1.3.2/services/PIG/metainfo.xml | 2 +
.../HDP/1.3.2/services/SQOOP/metainfo.xml | 2 +
.../HDP/1.3.2/services/WEBHCAT/metainfo.xml | 4 +-
.../HDP/1.3.2/services/ZOOKEEPER/metainfo.xml | 3 +
.../stacks/HDP/1.3.2/services/stack_advisor.py | 519 ++++++++++++++++++
.../stacks/HDP/1.3.3/services/stack_advisor.py | 25 +
.../stacks/HDP/1.3/services/stack_advisor.py | 25 +
.../2.0.6/hooks/before-ANY/scripts/params.py | 3 +-
.../hooks/before-INSTALL/scripts/params.py | 2 +-
.../HDP/2.0.6/services/FLUME/metainfo.xml | 2 +
.../HDP/2.0.6/services/GANGLIA/metainfo.xml | 3 +
.../HDP/2.0.6/services/HBASE/metainfo.xml | 4 +
.../stacks/HDP/2.0.6/services/HDFS/metainfo.xml | 7 +
.../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 11 +-
.../services/HIVE/package/scripts/params.py | 2 +-
.../HDP/2.0.6/services/NAGIOS/metainfo.xml | 2 +
.../HDP/2.0.6/services/OOZIE/metainfo.xml | 3 +
.../stacks/HDP/2.0.6/services/PIG/metainfo.xml | 2 +
.../HDP/2.0.6/services/SQOOP/metainfo.xml | 2 +
.../HDP/2.0.6/services/WEBHCAT/metainfo.xml | 4 +-
.../stacks/HDP/2.0.6/services/YARN/metainfo.xml | 7 +
.../HDP/2.0.6/services/ZOOKEEPER/metainfo.xml | 2 +
.../FALCON/configuration/falcon-env.xml | 63 +++
.../2.1.GlusterFS/services/FALCON/metainfo.xml | 2 +-
.../services/FALCON/package/scripts/params.py | 32 +-
.../FALCON/package/scripts/status_params.py | 2 +-
.../GLUSTERFS/configuration/core-site.xml | 26 -
.../GLUSTERFS/configuration/hadoop-env.xml | 207 +++++++
.../services/GLUSTERFS/metainfo.xml | 7 +-
.../2.1.GlusterFS/services/OOZIE/metainfo.xml | 2 +-
.../services/STORM/configuration/storm-env.xml | 39 ++
.../2.1.GlusterFS/services/STORM/metainfo.xml | 2 +-
.../services/STORM/package/scripts/params.py | 12 +-
.../STORM/package/scripts/status_params.py | 2 +-
.../services/TEZ/configuration/tez-env.xml | 29 +
.../HDP/2.1.GlusterFS/services/TEZ/metainfo.xml | 2 +-
.../services/TEZ/package/scripts/params.py | 4 +-
.../services/YARN/configuration/global.xml | 64 ---
.../services/YARN/configuration/yarn-env.xml | 181 +++++++
.../2.1.GlusterFS/services/YARN/metainfo.xml | 3 +-
.../services/YARN/package/scripts/params.py | 41 +-
.../YARN/package/scripts/status_params.py | 8 +-
.../stacks/HDP/2.1/services/FALCON/metainfo.xml | 3 +
.../stacks/HDP/2.1/services/STORM/metainfo.xml | 6 +
.../stacks/HDP/2.1/services/TEZ/metainfo.xml | 2 +
.../stacks/HDP/2.1/services/YARN/metainfo.xml | 2 +
.../stacks/HDP/2.1/services/stack_advisor.py | 7 -
.../ExecutionCommandWrapperTest.java | 2 +-
.../actionmanager/TestActionDBAccessorImpl.java | 20 +-
.../server/actionmanager/TestActionManager.java | 31 +-
.../actionmanager/TestActionScheduler.java | 33 +-
.../ambari/server/actionmanager/TestStage.java | 4 +-
.../server/agent/TestHeartbeatHandler.java | 15 +-
.../server/agent/TestHeartbeatMonitor.java | 4 +-
.../server/api/services/AmbariMetaInfoTest.java | 9 +
.../stackadvisor/StackAdvisorHelperTest.java | 22 +-
...tConfigurationRecommnedationCommandTest.java | 103 ++++
.../commands/StackAdvisorCommandTest.java | 86 ++-
.../api/util/StackExtensionHelperTest.java | 2 +
.../AmbariManagementControllerTest.java | 164 +++---
...hYarnCapacitySchedulerReleaseConfigTest.java | 4 +-
.../internal/ClusterResourceProviderTest.java | 537 ++++++++++++++++++-
.../internal/JMXHostProviderTest.java | 10 +-
.../RecommendationResourceProviderTest.java | 31 ++
.../ValidationResourceProviderTest.java | 70 +++
.../ViewInstanceResourceProviderTest.java | 89 ++-
.../server/stageplanner/TestStagePlanner.java | 6 +-
.../ambari/server/state/ConfigHelperTest.java | 6 +-
.../server/state/cluster/ClusterTest.java | 66 ++-
.../server/state/cluster/ClustersTest.java | 3 +-
.../svccomphost/ServiceComponentHostTest.java | 3 +-
.../server/upgrade/UpgradeCatalog170Test.java | 41 +-
.../server/upgrade/UpgradeCatalogTest.java | 2 +-
.../ambari/server/utils/TestStageUtils.java | 6 +-
.../view/configuration/ViewConfigTest.java | 7 +
ambari-server/src/test/python/TestCheckHost.py | 29 +-
.../stacks/1.3.2/HIVE/test_hive_metastore.py | 4 +-
.../stacks/1.3.2/HIVE/test_hive_server.py | 4 +-
.../1.3.2/hooks/before-ANY/test_before_any.py | 6 +-
.../hooks/before-INSTALL/test_before_install.py | 4 +-
.../stacks/2.0.6/HIVE/test_hive_metastore.py | 4 +-
.../stacks/2.0.6/HIVE/test_hive_server.py | 4 +-
.../2.0.6/hooks/before-ANY/test_before_any.py | 6 +-
.../hooks/before-INSTALL/test_before_install.py | 4 +-
.../stacks/2.1/HIVE/test_hive_metastore.py | 4 +-
.../HDP/2.0.6/services/NAGIOS/metainfo.xml | 2 +
.../HDP/2.0.6/services/WEBHCAT/metainfo.xml | 1 +
.../stacks/HDP/2.0.6/services/YARN/metainfo.xml | 4 +
.../HDP/2.0.7/services/HBASE/metainfo.xml | 4 +
.../stacks/HDP/2.0.7/services/HDFS/metainfo.xml | 7 +
.../stacks/HDP/2.0.7/services/HIVE/metainfo.xml | 5 +
.../HDP/2.0.7/services/ZOOKEEPER/metainfo.xml | 3 +
.../HDP/2.0.8/services/SQOOP/metainfo.xml | 1 +
.../HDP/2.1.1/services/STORM/metainfo.xml | 4 +
.../org/apache/ambari/view/ViewDefinition.java | 7 +
.../data/configurations/service_version.json | 7 +-
.../data/configurations/service_versions.json | 77 +--
ambari-web/app/assets/test/tests.js | 2 +
ambari-web/app/config.js | 2 +-
.../main/dashboard/config_history_controller.js | 4 +-
.../controllers/main/service/info/configs.js | 8 +-
.../app/controllers/wizard/step3_controller.js | 1 -
ambari-web/app/data/HDP2/secure_properties.js | 1 +
ambari-web/app/data/HDP2/site_properties.js | 178 +++---
ambari-web/app/data/site_properties.js | 160 +++---
ambari-web/app/mappers.js | 1 +
.../mappers/service_config_version_mapper.js | 3 +-
ambari-web/app/mappers/stack_service_mapper.js | 2 +
ambari-web/app/messages.js | 5 +-
ambari-web/app/mixins.js | 1 -
ambari-web/app/mixins/common/serverValidator.js | 19 +-
ambari-web/app/mixins/models/service_mixin.js | 30 --
ambari-web/app/models/host_component.js | 28 +-
ambari-web/app/models/service.js | 7 +-
ambari-web/app/models/service_config_version.js | 12 +-
ambari-web/app/models/stack_service.js | 13 +-
.../app/models/stack_service_component.js | 10 +-
ambari-web/app/styles/application.less | 58 +-
.../common/configs/config_history_flow.hbs | 42 +-
.../templates/main/dashboard/config_history.hbs | 11 +-
ambari-web/app/utils/ajax/ajax.js | 2 +-
ambari-web/app/utils/config.js | 2 +-
ambari-web/app/utils/helper.js | 15 +-
.../views/common/configs/config_history_flow.js | 67 ++-
.../common/configs/overriddenProperty_view.js | 1 +
.../app/views/common/configs/services_config.js | 3 +-
.../views/main/dashboard/config_history_view.js | 12 +-
ambari-web/test/app_test.js | 54 +-
.../dashboard/config_history_controller_test.js | 25 +-
ambari-web/test/models/host_component_test.js | 212 +++++++-
ambari-web/test/models/host_test.js | 357 +++++++++++-
ambari-web/test/models/service_test.js | 59 +-
ambari-web/test/models/stack_service_test.js | 343 ++++++++++++
ambari-web/test/service_components.js | 61 +++
ambari-web/test/utils/blueprint_test.js | 1 -
ambari-web/test/utils/date_test.js | 4 +-
.../common/configs/config_history_flow_test.js | 26 +-
.../src/main/resources/ui/app/styles/main.less | 7 +-
docs/pom.xml | 18 +-
216 files changed, 5151 insertions(+), 1390 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-agent/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index 0600f27,33c5af4..75ba178
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@@ -42,53 -42,23 +42,53 @@@ public class ExecutionCommand extends A
super(AgentCommandType.EXECUTION_COMMAND);
}
+ @SerializedName("clusterName")
private String clusterName;
+
+ @SerializedName("taskId")
private long taskId;
+
+ @SerializedName("commandId")
private String commandId;
+
+ @SerializedName("hostname")
private String hostname;
+
+ @SerializedName("role")
private String role;
+
+ @SerializedName("hostLevelParams")
private Map<String, String> hostLevelParams = new HashMap<String, String>();
+
+ @SerializedName("roleParams")
private Map<String, String> roleParams = null;
+
+ @SerializedName("roleCommand")
private RoleCommand roleCommand;
- private Map<String, Set<String>> clusterHostInfo =
+
+ @SerializedName("clusterHostInfo")
+ private Map<String, Set<String>> clusterHostInfo =
new HashMap<String, Set<String>>();
+
+ @SerializedName("configurations")
private Map<String, Map<String, String>> configurations;
+
@SerializedName("configuration_attributes")
private Map<String, Map<String, Map<String, String>>> configurationAttributes;
+
+ @SerializedName("configurationTags")
private Map<String, Map<String, String>> configurationTags;
+
+ @SerializedName("forceRefreshConfigTags")
private Set<String> forceRefreshConfigTags = new HashSet<String>();
+
+ @SerializedName("commandParams")
- private Map<String, String> commandParams;
+ private Map<String, String> commandParams = new HashMap<String, String>();
+
+ @SerializedName("serviceName")
private String serviceName;
+
+ @SerializedName("componentName")
private String componentName;
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index 5d904ef,c3b6a86..b181399
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@@ -1370,10 -1338,9 +1370,10 @@@ public class ClusterImpl implements Clu
}
@Override
- public ServiceConfigVersionResponse addDesiredConfig(String user, Config config, String serviceConfigVersionNote) {
+ public ServiceConfigVersionResponse addDesiredConfig(String user, Set<Config> configs, String serviceConfigVersionNote) {
- if (null == user)
+ if (null == user) {
throw new NullPointerException("User must be specified.");
+ }
clusterGlobalLock.readLock().lock();
try {
@@@ -1525,10 -1505,9 +1538,10 @@@
}
@Override
- public boolean setServiceConfigVersion(String serviceName, Long version, String user, String note) throws AmbariException {
+ public ServiceConfigVersionResponse setServiceConfigVersion(String serviceName, Long version, String user, String note) throws AmbariException {
- if (null == user)
+ if (null == user) {
throw new NullPointerException("User must be specified.");
+ }
clusterGlobalLock.writeLock().lock();
try {
@@@ -1644,9 -1653,18 +1687,18 @@@
serviceConfigVersionResponse.setClusterName(getClusterName());
serviceConfigVersionResponse.setServiceName(serviceConfigEntity.getServiceName());
serviceConfigVersionResponse.setVersion(serviceConfigEntity.getVersion());
- serviceConfigVersionResponse.setCreateTime(serviceConfigEntity.getCreateTimestamp());
+ serviceConfigVersionResponse.setCreateTime(serviceConfigEntity.getCreateTimestamp());
serviceConfigVersionResponse.setUserName(serviceConfigEntity.getUser());
serviceConfigVersionResponse.setNote(serviceConfigEntity.getNote());
+ if (clusterConfigGroups != null) {
+ ConfigGroup configGroup = clusterConfigGroups.get(serviceConfigEntity.getGroupId());
+ if (configGroup != null) {
+ serviceConfigVersionResponse.setGroupId(configGroup.getId());
+ serviceConfigVersionResponse.setGroupName(configGroup.getName());
+ }
+ }
+
+
return serviceConfigVersionResponse;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index 0acd61b,0ac9da7..0884c50
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@@ -73,8 -73,6 +73,7 @@@ import org.apache.ambari.server.state.C
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.ConfigHelper;
+import org.apache.ambari.server.state.alert.Scope;
- import org.apache.ambari.server.view.configuration.InstanceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
----------------------------------------------------------------------
diff --cc ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
index d7c8c54,5d85b0d..79ae350
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
@@@ -1045,9 -1042,9 +1046,9 @@@ public class ServiceComponentHostTest
config.setTag(tag);
config.persist();
cluster.addConfig(config);
- cluster.addDesiredConfig("user", config);
+ cluster.addDesiredConfig("user", Collections.singleton(config));
}
-
+
@Test
public void testMaintenance() throws Exception {
String stackVersion="HDP-2.0.6";
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae8f1e77/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java
----------------------------------------------------------------------
diff --cc ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java
index d3f0e37,988c67b..8b134c4
--- a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java
@@@ -152,8 -147,8 +152,8 @@@ public class TestStageUtils
@Ignore
public void testJasonToExecutionCommand() throws JsonGenerationException,
JsonMappingException, JAXBException, IOException {
- Stage s = StageUtils.getATestStage(1, 2, "host1", "clusterHostInfo");
+ Stage s = StageUtils.getATestStage(1, 2, "host1", "clusterHostInfo", "hostParamsStage");
- ExecutionCommand cmd = s.getExecutionCommands("host1").get(0).getExecutionCommand();
+ ExecutionCommand cmd = s.getExecutionCommands("host1").get(0).getExecutionCommand();
HashMap<String, Map<String,String>> configTags = new HashMap<String, Map<String,String>>();
Map<String, String> globalTag = new HashMap<String, String>();
globalTag.put("tag", "version1");