Merge branch 'trunk' into branch-feature-logsearch-ui
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/309ba3b4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/309ba3b4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/309ba3b4 Branch: refs/heads/branch-feature-logsearch-ui Commit: 309ba3b4016dfd769e0fcd242d261d93e04cd3b4 Parents: f4bb14c c802a29 Author: ababiichuk <[email protected]> Authored: Tue Aug 15 17:27:46 2017 +0300 Committer: ababiichuk <[email protected]> Committed: Tue Aug 15 17:27:46 2017 +0300 ---------------------------------------------------------------------- .../libraries/functions/packages_analyzer.py | 4 +- .../libraries/functions/repository_util.py | 1 + .../MetricCollectorHAController.java | 2 +- ambari-server/checkstyle.xml | 4 +- .../server/api/predicate/QueryParser.java | 4 +- .../api/predicate/operators/InOperator.java | 2 +- .../DistributeRepositoriesStructuredOutput.java | 70 -------- .../internal/StackAdvisorResourceProvider.java | 20 ++- .../VersionDefinitionResourceProvider.java | 51 ++++-- .../DistributeRepositoriesActionListener.java | 104 ++++++------ .../upgrade/StackUpgradeFinishListener.java | 6 +- .../server/orm/dao/RepositoryVersionDAO.java | 15 +- .../orm/entities/RepositoryVersionEntity.java | 25 ++- .../server/state/cluster/ClusterImpl.java | 8 +- .../stack/upgrade/RepositoryVersionHelper.java | 15 -- .../ambari/server/topology/AmbariContext.java | 39 ++++- .../0.7.0.3.0/configuration/atlas-log4j.xml | 4 +- .../2.1.0.2.0/package/scripts/hdfs_snamenode.py | 6 + .../3.0.0.3.0/package/scripts/hdfs_snamenode.py | 6 + .../scripts/alerts/alert_spark_thrift_port.py | 2 +- .../scripts/alerts/alert_spark2_thrift_port.py | 2 +- .../YARN/2.1.0.2.0/package/scripts/yarn.py | 2 +- .../custom_actions/scripts/install_packages.py | 66 ++----- .../resources/host_scripts/alert_disk_space.py | 2 +- .../scripts/shared_initialization.py | 15 -- .../HDFS/package/scripts/hdfs_snamenode.py | 6 + .../scripts/shared_initialization.py | 16 +- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 10 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 4 + .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 + .../ATLAS/configuration/atlas-log4j.xml | 4 +- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 5 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 + .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 + .../scripts/shared_initialization.py | 16 +- .../ExecutionCommandWrapperTest.java | 12 +- .../server/agent/HeartbeatProcessorTest.java | 65 ++++++- .../server/api/predicate/QueryParserTest.java | 18 ++ ...ClusterStackVersionResourceProviderTest.java | 4 +- .../StackAdvisorResourceProviderTest.java | 25 +++ .../VersionDefinitionResourceProviderTest.java | 170 ++++++++++++++++++- .../upgrade/StackUpgradeFinishListenerTest.java | 6 + .../server/topology/AmbariContextTest.java | 93 +++++++++- ambari-server/src/test/python/TestMpacks.py | 2 +- .../custom_actions/TestInstallPackages.py | 86 ++++------ .../configs/install_packages_config.json | 2 +- .../stacks/2.0.6/YARN/test_historyserver.py | 2 + .../src/test/python/stacks/utils/RMFTestCase.py | 10 +- .../scripts/shared_initialization.py | 14 -- .../scripts/shared_initialization.py | 14 -- 50 files changed, 673 insertions(+), 392 deletions(-) ----------------------------------------------------------------------
