Merge branch 'trunk' into branch-feature-AMBARI-18456
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/88c28925 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/88c28925 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/88c28925 Branch: refs/heads/trunk Commit: 88c2892527b0a6ee97a3e237ebc76a896ce865e9 Parents: 803f44b d1293e0 Author: Jonathan Hurley <[email protected]> Authored: Wed Dec 7 16:16:53 2016 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Wed Dec 7 16:16:53 2016 -0500 ---------------------------------------------------------------------- ambari-agent/conf/unix/ambari-agent.ini | 1 + .../src/main/python/ambari_agent/Hardware.py | 52 +- .../src/main/python/ambari_agent/HostInfo.py | 12 +- .../TestCustomServiceOrchestrator.py | 4 +- .../test/python/ambari_agent/TestHardware.py | 70 ++ .../ambari_commons/ambari_metrics_helper.py | 26 +- .../main/python/ambari_commons/logging_utils.py | 5 +- .../libraries/functions/copy_tarball.py | 2 +- .../dynamic_variable_interpretation.py | 2 +- .../timeline/AbstractTimelineMetricsSink.java | 40 +- .../availability/MetricCollectorHAHelper.java | 1 - .../availability/MetricCollectorHATest.java | 1 - .../src/main/python/core/config_reader.py | 2 +- .../timeline/HBaseTimelineMetricStore.java | 18 +- .../timeline/TimelineMetricConfiguration.java | 14 + .../aggregators/AbstractTimelineAggregator.java | 6 +- .../MetricCollectorHAController.java | 4 +- .../TestApplicationHistoryServer.java | 14 +- .../MetricCollectorHAControllerTest.java | 4 +- ambari-project/pom.xml | 41 + ambari-server/checkstyle.xml | 17 + ambari-server/pom.xml | 4 + .../ambari/server/agent/AgentRequests.java | 2 +- .../ambari/server/agent/HeartbeatProcessor.java | 15 +- .../ambari/server/checks/CheckDescription.java | 4 +- .../internal/AlertTargetResourceProvider.java | 2 +- .../ClusterStackVersionResourceProvider.java | 4 +- .../internal/UpgradeResourceProvider.java | 2 +- .../logging/LogSearchDataRetrievalService.java | 7 +- .../apache/ambari/server/orm/dao/AlertsDAO.java | 6 +- .../ambari/server/orm/entities/GroupEntity.java | 5 +- .../server/security/authorization/Users.java | 10 +- .../apache/ambari/server/state/ServiceImpl.java | 2 +- .../server/state/cluster/ClustersImpl.java | 2 +- .../ambari/server/state/host/HostImpl.java | 2 +- .../services/RetryUpgradeActionService.java | 2 +- .../ambari/server/state/stack/UpgradePack.java | 19 +- .../svccomphost/ServiceComponentHostImpl.java | 2 +- .../server/upgrade/AbstractUpgradeCatalog.java | 25 +- .../server/upgrade/UpgradeCatalog240.java | 4 +- .../main/python/ambari_server/serverUpgrade.py | 38 +- .../AMBARI_INFRA/0.1.0/metainfo.xml | 1 + .../0.1.0/package/scripts/setup_infra_solr.py | 3 +- .../0.1.0/configuration/ams-env.xml | 2 +- .../0.1.0/configuration/ams-site.xml | 12 + .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 1 + .../0.1.0/package/scripts/metrics_collector.py | 2 + .../package/scripts/metrics_grafana_util.py | 7 +- .../0.1.0/package/scripts/params.py | 22 +- .../0.1.0/package/scripts/service_check.py | 2 +- .../LOGSEARCH/0.5.0/metainfo.xml | 1 + .../0.5.0/package/scripts/setup_logsearch.py | 3 +- .../stacks/HDP/2.3/services/stack_advisor.py | 4 +- .../HDP/3.0/configuration/cluster-env.xml | 293 +++++++ .../HDP/3.0/hooks/after-INSTALL/scripts/hook.py | 37 + .../3.0/hooks/after-INSTALL/scripts/params.py | 97 +++ .../scripts/shared_initialization.py | 111 +++ .../hooks/before-ANY/files/changeToSecureUid.sh | 53 ++ .../HDP/3.0/hooks/before-ANY/scripts/hook.py | 36 + .../HDP/3.0/hooks/before-ANY/scripts/params.py | 231 ++++++ .../before-ANY/scripts/shared_initialization.py | 226 +++++ .../3.0/hooks/before-INSTALL/scripts/hook.py | 37 + .../3.0/hooks/before-INSTALL/scripts/params.py | 113 +++ .../scripts/repo_initialization.py | 68 ++ .../scripts/shared_initialization.py | 37 + .../3.0/hooks/before-RESTART/scripts/hook.py | 29 + .../hooks/before-START/files/checkForFormat.sh | 65 ++ .../before-START/files/fast-hdfs-resource.jar | Bin 0 -> 19285850 bytes .../before-START/files/task-log4j.properties | 134 +++ .../hooks/before-START/files/topology_script.py | 66 ++ .../HDP/3.0/hooks/before-START/scripts/hook.py | 39 + .../3.0/hooks/before-START/scripts/params.py | 326 ++++++++ .../before-START/scripts/rack_awareness.py | 47 ++ .../scripts/shared_initialization.py | 191 +++++ .../templates/commons-logging.properties.j2 | 43 + .../templates/exclude_hosts_list.j2 | 21 + .../templates/hadoop-metrics2.properties.j2 | 105 +++ .../before-START/templates/health_check.j2 | 81 ++ .../templates/include_hosts_list.j2 | 21 + .../templates/topology_mappings.data.j2 | 24 + .../main/resources/stacks/HDP/3.0/kerberos.json | 78 ++ .../main/resources/stacks/HDP/3.0/metainfo.xml | 24 + .../HDP/3.0/properties/stack_features.json | 323 ++++++++ .../stacks/HDP/3.0/properties/stack_tools.json | 4 + .../resources/stacks/HDP/3.0/repos/repoinfo.xml | 132 +++ .../services/HDFS/configuration/core-site.xml | 56 ++ .../services/HDFS/configuration/hadoop-env.xml | 200 +++++ .../services/HDFS/configuration/hdfs-log4j.xml | 226 +++++ .../services/HDFS/configuration/hdfs-site.xml | 153 ++++ .../HDFS/configuration/ranger-hdfs-audit.xml | 217 +++++ .../ranger-hdfs-plugin-properties.xml | 98 +++ .../configuration/ranger-hdfs-policymgr-ssl.xml | 67 ++ .../HDFS/configuration/ranger-hdfs-security.xml | 65 ++ .../services/HDFS/configuration/widgets.json | 649 +++++++++++++++ .../stacks/HDP/3.0/services/HDFS/kerberos.json | 246 ++++++ .../stacks/HDP/3.0/services/HDFS/metainfo.xml | 190 +++++ .../services/HDFS/quicklinks/quicklinks.json | 80 ++ .../HDP/3.0/services/HDFS/themes/theme.json | 179 ++++ .../HDP/3.0/services/YARN/YARN_widgets.json | 670 +++++++++++++++ .../YARN/configuration-mapred/mapred-env.xml | 51 ++ .../YARN/configuration-mapred/mapred-site.xml | 134 +++ .../YARN/configuration/capacity-scheduler.xml | 71 ++ .../YARN/configuration/ranger-yarn-audit.xml | 177 ++++ .../ranger-yarn-plugin-properties.xml | 82 ++ .../configuration/ranger-yarn-policymgr-ssl.xml | 66 ++ .../YARN/configuration/ranger-yarn-security.xml | 58 ++ .../services/YARN/configuration/yarn-env.xml | 200 +++++ .../services/YARN/configuration/yarn-log4j.xml | 103 +++ .../services/YARN/configuration/yarn-site.xml | 814 +++++++++++++++++++ .../stacks/HDP/3.0/services/YARN/kerberos.json | 278 +++++++ .../stacks/HDP/3.0/services/YARN/metainfo.xml | 173 ++++ .../YARN/quicklinks-mapred/quicklinks.json | 80 ++ .../services/YARN/quicklinks/quicklinks.json | 80 ++ .../3.0/services/YARN/themes-mapred/theme.json | 132 +++ .../HDP/3.0/services/YARN/themes/theme.json | 250 ++++++ .../HDP/3.0/services/ZOOKEEPER/metainfo.xml | 54 ++ .../main/resources/stacks/HDP/3.0/widgets.json | 95 +++ .../2.1/hooks/before-START/scripts/params.py | 2 +- .../LogSearchDataRetrievalServiceTest.java | 142 ++-- .../ldap/AmbariLdapDataPopulatorTest.java | 3 +- .../ambari/server/state/UpgradeHelperTest.java | 39 +- .../server/upgrade/UpgradeCatalog210Test.java | 2 + .../stacks/2.3/common/test_stack_advisor.py | 29 +- .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py | 2 +- .../stacks/2.4/LOGSEARCH/test_logsearch.py | 2 +- .../app/controllers/global/update_controller.js | 5 +- ambari-web/app/controllers/installer.js | 3 +- .../journalNode/step4_controller.js | 6 +- .../journalNode/wizard_controller.js | 28 +- .../main/admin/stack_and_upgrade_controller.js | 13 +- .../app/controllers/wizard/step1_controller.js | 21 +- ambari-web/app/messages.js | 2 - .../common/widgets/export_metrics_mixin.js | 28 +- .../main/host/details/actions/check_host.js | 3 +- .../mixins/wizard/assign_master_components.js | 1 + .../app/routes/manage_journalnode_routes.js | 4 +- .../app/styles/theme/bootstrap-ambari.css | 29 +- ambari-web/app/styles/wizard.less | 13 +- .../templates/common/host_progress_popup.hbs | 8 +- .../highAvailability/journalNode/wizard.hbs | 13 +- .../admin/stack_upgrade/upgrade_options.hbs | 58 +- .../app/templates/main/host/host_alerts.hbs | 8 +- ambari-web/app/templates/wizard/step8.hbs | 2 +- ambari-web/app/views/common/controls_view.js | 3 +- .../highAvailability/journalNode/step2_view.js | 5 +- .../admin/stack_upgrade/upgrade_wizard_view.js | 6 +- .../app/views/main/host/host_alerts_view.js | 41 +- ambari-web/app/views/main/host/menu.js | 4 +- ambari-web/test/controllers/installer_test.js | 13 +- .../test/views/common/controls_view_test.js | 74 +- .../stack_upgrade/upgrade_wizard_view_test.js | 2 +- .../views/main/host/host_alerts_view_test.js | 3 +- .../ui/app/templates/components/job-details.hbs | 2 +- pom.xml | 1 + utility/pom.xml | 33 +- ...AvoidTransactionalOnPrivateMethodsCheck.java | 55 ++ .../src/main/resources/checkstyle_packages.xml | 15 + ...dTransactionalOnPrivateMethodsCheckTest.java | 49 ++ .../InputTransactionalOnPrivateMethods.java | 46 ++ 159 files changed, 10080 insertions(+), 377 deletions(-) ----------------------------------------------------------------------
