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 2017/07/11 16:25:47 UTC
[14/50] [abbrv] ambari git commit: Merge branch 'branch-2.5' into
branch-feature-AMBARI-21348
Merge branch 'branch-2.5' into branch-feature-AMBARI-21348
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f5b21987
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f5b21987
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f5b21987
Branch: refs/heads/branch-2.5
Commit: f5b2198799875b46f15b9523dacddb9c46c5c374
Parents: cdc7897 065dd9c
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Jul 7 10:48:15 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Jul 7 10:48:15 2017 -0400
----------------------------------------------------------------------
ambari-agent/conf/unix/install-helper.sh | 8 ++
ambari-agent/etc/init.d/ambari-agent | 22 +--
ambari-agent/pom.xml | 11 --
.../src/main/package/rpm/posttrans_agent.sh | 7 +
.../ambari_agent/AlertSchedulerHandler.py | 10 +-
.../python/ambari_agent/alerts/base_alert.py | 8 +-
.../python/ambari_agent/alerts/port_alert.py | 107 ++++++++------
ambari-agent/src/packages/tarball/all.xml | 2 +-
.../ambari_agent/TestAlertSchedulerHandler.py | 17 ++-
.../ambari_commons/resources/os_family.json | 3 +-
.../libraries/functions/mounted_dirs_helper.py | 1 +
.../metrics/timeline/PhoenixHBaseAccessor.java | 69 ++++++++-
.../timeline/TimelineMetricConfiguration.java | 3 +
.../timeline/TimelineMetricsAggregatorSink.java | 60 ++++++++
.../timeline/PhoenixHBaseAccessorTest.java | 73 ++++++++++
.../TimelineMetricsAggregatorMemorySink.java | 141 +++++++++++++++++++
.../server/agent/AlertDefinitionCommand.java | 7 +-
.../ambari/server/agent/HeartBeatHandler.java | 4 +-
.../checks/DatabaseConsistencyCheckHelper.java | 14 ++
.../AmbariCustomCommandExecutionHelper.java | 19 +--
.../AmbariManagementControllerImpl.java | 14 +-
.../server/controller/ExecuteCommandJson.java | 4 +
.../server/controller/KerberosHelperImpl.java | 8 +-
.../internal/AbstractProviderModule.java | 49 +++++--
.../internal/ClientConfigResourceProvider.java | 2 +
.../internal/UpgradeResourceProvider.java | 4 +-
.../server/controller/jmx/JMXHostProvider.java | 15 ++
.../controller/jmx/JMXPropertyProvider.java | 25 ++++
.../dispatchers/AlertScriptDispatcher.java | 7 +-
.../ambari/server/orm/DBAccessorImpl.java | 43 +++---
.../orm/helpers/dbms/GenericDbmsHelper.java | 2 +-
.../state/ClientConfigFileDefinition.java | 15 +-
.../org/apache/ambari/server/state/Cluster.java | 8 ++
.../server/state/alert/AlertDefinitionHash.java | 14 +-
.../server/state/cluster/ClusterImpl.java | 18 +++
.../services/AlertNoticeDispatchService.java | 8 ++
.../main/python/ambari_server/setupSecurity.py | 4 -
.../ATLAS/0.1.0.2.3/package/scripts/params.py | 4 +-
.../HBASE/0.96.0.2.0/role_command_order.json | 9 ++
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 4 +-
.../package/scripts/namenode_upgrade.py | 2 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 4 +
.../HIVE/0.12.0.2.0/metainfo.xml | 1 +
.../PXF/3.0.0/configuration/pxf-profiles.xml | 23 +++
.../STORM/0.9.1/package/scripts/nimbus.py | 8 +-
.../0.6.0.2.5/configuration/zeppelin-env.xml | 5 +
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 10 +-
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 7 +-
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 5 +-
.../services/ATLAS/configuration/atlas-env.xml | 6 +
.../stacks/HDP/2.6/services/stack_advisor.py | 21 +++
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 9 ++
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 6 +
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
.../AmbariCustomCommandExecutionHelperTest.java | 6 +-
.../metrics/JMXPropertyProviderTest.java | 9 ++
.../dispatchers/AlertScriptDispatcherTest.java | 28 +++-
.../state/alerts/AlertDefinitionHashTest.java | 4 +-
.../src/test/python/TestAmbariServer.py | 13 +-
.../configs/ha_bootstrap_standby_node.json | 2 +-
...ha_bootstrap_standby_node_initial_start.json | 2 +-
...dby_node_initial_start_dfs_nameservices.json | 2 +-
.../stacks/2.1/STORM/test_storm_nimbus.py | 60 +++++++-
.../stacks/2.1/configs/default-storm-start.json | 14 ++
.../test/python/stacks/2.1/configs/default.json | 13 ++
.../stacks/2.1/configs/secured-storm-start.json | 13 ++
.../test/python/stacks/2.1/configs/secured.json | 15 +-
.../stacks/2.6/common/test_stack_advisor.py | 123 +++++++++++-----
.../mixins/common/configs/enhanced_configs.js | 3 +-
.../hive2/resources/uploads/UploadService.java | 4 +-
.../src/main/resources/ui/app/styles/app.less | 4 +-
.../wfmanager/src/main/resources/ui/bower.json | 4 +-
.../hdfs-directory-viewer/addon/styles/app.css | 1 +
.../wfmanager/src/main/resources/ui/yarn.lock | 68 ++++++---
74 files changed, 1090 insertions(+), 249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f5b21987/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f5b21987/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f5b21987/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f5b21987/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------