Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b013be0b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b013be0b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b013be0b Branch: refs/heads/trunk Commit: b013be0b97c140b47d77149dcce93ee4f4d90b74 Parents: 9f63871 358a588 Author: Nate Cole <nc...@hortonworks.com> Authored: Mon Apr 17 16:17:45 2017 -0400 Committer: Nate Cole <nc...@hortonworks.com> Committed: Mon Apr 17 16:17:45 2017 -0400 ---------------------------------------------------------------------- .../stackVersions/StackVersionsCreateCtrl.js | 19 + .../ui/admin-web/app/scripts/services/Stack.js | 3 +- .../views/stackVersions/stackVersionPage.html | 3 +- .../ambari_agent/StatusCommandsExecutor.py | 279 +------- .../libraries/functions/decorator.py | 23 +- .../libraries/functions/jmx.py | 7 +- .../libraries/functions/namenode_ha_utils.py | 6 +- .../libraries/functions/stack_select.py | 5 + .../libraries/functions/stack_tools.py | 10 + .../libraries/functions/version_select_util.py | 42 ++ .../libraries/script/script.py | 63 +- .../HIVE/package/scripts/mysql_service.py | 5 + .../infra/solr/AmbariSolrCloudClient.java | 4 +- .../logsearch/steps/LogSearchDockerSteps.java | 14 +- .../ambari/logsearch/doc/DocConstants.java | 2 + .../logsearch/manager/AuditLogsManager.java | 5 + .../ambari/logsearch/manager/ManagerBase.java | 30 + .../logsearch/manager/ServiceLogsManager.java | 5 + .../logsearch/rest/AuditLogsResource.java | 10 + .../logsearch/rest/ServiceLogsResource.java | 11 + .../ambari/server/agent/ExecutionCommand.java | 11 + .../StackAdvisorBlueprintProcessor.java | 61 +- .../AmbariCustomCommandExecutionHelper.java | 20 +- .../AmbariManagementControllerImpl.java | 1 + .../ambari/server/controller/AmbariServer.java | 1 + .../internal/ClientConfigResourceProvider.java | 1 + .../ClusterStackVersionResourceProvider.java | 3 + .../internal/ExportBlueprintRequest.java | 6 - .../HostStackVersionResourceProvider.java | 5 + .../internal/ProvisionClusterRequest.java | 21 +- .../internal/ScaleClusterRequest.java | 7 - .../internal/UpgradeResourceProvider.java | 8 +- .../VersionDefinitionResourceProvider.java | 4 + .../orm/entities/HostRoleCommandEntity.java | 2 +- .../server/state/stack/upgrade/Grouping.java | 2 +- .../state/stack/upgrade/StageWrapper.java | 65 ++ .../ambari/server/state/stack/upgrade/Task.java | 6 + .../server/state/stack/upgrade/TaskWrapper.java | 25 +- .../state/stack/upgrade/TaskWrapperBuilder.java | 5 +- .../topology/ClusterConfigurationRequest.java | 8 +- .../ambari/server/topology/ClusterTopology.java | 2 + .../server/topology/ClusterTopologyImpl.java | 37 +- .../server/topology/PersistedStateImpl.java | 5 - .../ambari/server/topology/TopologyManager.java | 43 +- .../ambari/server/topology/TopologyRequest.java | 8 - .../validators/ChainedTopologyValidator.java | 58 ++ .../validators/HiveServiceValidator.java | 2 +- .../validators/RequiredPasswordValidator.java | 6 +- .../validators/StackConfigTypeValidator.java | 64 ++ .../validators/TopologyValidatorFactory.java | 34 + .../validators/TopologyValidatorService.java | 52 ++ .../server/upgrade/SchemaUpgradeHelper.java | 1 + .../server/upgrade/UpgradeCatalog251.java | 81 +++ .../main/resources/Ambari-DDL-Derby-CREATE.sql | 2 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +- .../resources/Ambari-DDL-Postgres-CREATE.sql | 2 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +- .../HDFS/2.1.0.2.0/package/scripts/datanode.py | 45 +- .../package/scripts/datanode_upgrade.py | 38 +- .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 11 +- .../2.1.0.2.0/package/scripts/params_linux.py | 2 + .../common-services/HIVE/2.1.0.3.0/metainfo.xml | 11 +- .../KAFKA/0.8.1/configuration/kafka-broker.xml | 12 +- .../KAFKA/0.8.1/package/scripts/kafka_broker.py | 6 + .../YARN/3.0.0.3.0/service_advisor.py | 76 +++ .../custom_actions/scripts/install_packages.py | 2 +- .../HIVE/package/scripts/mysql_service.py | 5 +- .../HIVE/package/scripts/postgresql_service.py | 5 +- .../2.0.6/hooks/after-INSTALL/scripts/params.py | 2 +- .../before-ANY/scripts/shared_initialization.py | 4 +- .../scripts/shared_initialization.py | 5 +- .../stacks/HDP/2.3/services/stack_advisor.py | 6 +- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 2 +- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 2 +- .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 2 +- .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 2 +- .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 2 +- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 2 +- .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 2 +- .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 2 +- .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 2 +- .../services/YARN/configuration/yarn-env.xml | 18 + .../stacks/HDP/2.6/services/stack_advisor.py | 113 +++- .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 2 +- .../before-ANY/scripts/shared_initialization.py | 4 +- .../src/main/resources/upgrade-pack.xsd | 1 + .../StackAdvisorBlueprintProcessorTest.java | 6 +- .../ServicesNamenodeTruncateCheckTest.java | 1 - .../AmbariCustomCommandExecutionHelperTest.java | 1 + .../AmbariManagementControllerTest.java | 4 +- .../BlueprintConfigurationProcessorTest.java | 660 ++++++++++--------- .../internal/ProvisionClusterRequestTest.java | 32 - .../internal/ScaleClusterRequestTest.java | 6 - .../internal/UpgradeResourceProviderTest.java | 66 +- .../ambari/server/stack/StackManagerTest.java | 12 + .../ClusterDeployWithStartOnlyTest.java | 37 +- ...InstallWithoutStartOnComponentLevelTest.java | 33 +- .../ClusterInstallWithoutStartTest.java | 37 +- .../topology/ClusterTopologyImplTest.java | 57 +- .../topology/RequiredPasswordValidatorTest.java | 113 +++- .../server/topology/TopologyManagerTest.java | 5 +- .../validators/HiveServiceValidatorTest.java | 3 + .../StackConfigTypeValidatorTest.java | 126 ++++ .../server/upgrade/UpgradeCatalog251Test.java | 166 +++++ .../server/upgrade/UpgradeCatalog300Test.java | 6 + .../python/stacks/2.0.6/HDFS/test_datanode.py | 66 +- .../hooks/after-INSTALL/test_after_install.py | 25 +- .../stacks/2.5/common/test_stack_advisor.py | 7 + .../stacks/2.6/common/test_stack_advisor.py | 452 ++++++++++++- .../stacks/HDP/2.1.1/upgrades/upgrade_test.xml | 2 +- .../manage_alert_notifications_controller.js | 28 +- ambari-web/app/messages.js | 2 + .../app/styles/theme/bootstrap-ambari.css | 20 +- .../stack_upgrade/stack_upgrade_wizard.hbs | 10 +- .../main/alerts/create_alert_notification.hbs | 12 + ...anage_alert_notifications_controller_test.js | 165 ++++- .../resources/ui/app/components/job-details.js | 30 +- .../app/templates/components/bundle-config.hbs | 2 +- .../app/templates/components/coord-config.hbs | 2 +- .../app/templates/components/flow-designer.hbs | 2 +- .../app/templates/components/hdfs-browser.hbs | 44 +- .../components/workflow-job-details.hbs | 6 + 124 files changed, 2717 insertions(+), 1128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java ---------------------------------------------------------------------- diff --cc ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java index df1aa37,7d1f907..2954f0d --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesNamenodeTruncateCheckTest.java @@@ -53,8 -50,6 +53,7 @@@ public class ServicesNamenodeTruncateCh private Clusters m_clusters = EasyMock.createMock(Clusters.class); private ServicesNamenodeTruncateCheck m_check = new ServicesNamenodeTruncateCheck(); - private final Map<String, String> m_configMap = new HashMap<String, String>(); + private RepositoryVersionDAO m_repositoryVersionDAO = EasyMock.createMock(RepositoryVersionDAO.class); private final Map<String, String> m_configMap = new HashMap<>(); @Before http://git-wip-us.apache.org/repos/asf/ambari/blob/b013be0b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java ----------------------------------------------------------------------
