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/31 14:10:40 UTC
[25/25] ambari git commit: Merge branch 'branch-2.6' into
branch-feature-AMBARI-21450
Merge branch 'branch-2.6' into branch-feature-AMBARI-21450
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2f873b00
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2f873b00
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2f873b00
Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 2f873b009200949bece41eb57b8b7cc7b986351f
Parents: 68cffbf 9e0a7fb
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Jul 31 10:02:14 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Jul 31 10:02:14 2017 -0400
----------------------------------------------------------------------
.../libraries/functions/constants.py | 2 +
.../libraries/functions/version.py | 17 +-
ambari-server/pom.xml | 2 +-
.../AmbariCustomCommandExecutionHelper.java | 8 +
.../AmbariManagementControllerImpl.java | 38 +---
.../internal/RequestResourceProvider.java | 4 +-
.../pam/PamAuthenticationFactory.java | 35 ++++
.../AmbariPamAuthenticationProvider.java | 5 +-
.../upgrades/FixAuthToLocalMappingAction.java | 149 ++++++++++++++++
.../upgrades/RemoveObsoleteAlerts.java | 75 ++++++++
.../apache/ambari/server/stack/StackModule.java | 3 +
.../0.1.0/package/scripts/params_linux.py | 6 +
.../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 22 +++
.../ATLAS/0.1.0.2.3/package/scripts/params.py | 1 +
.../0.96.0.2.0/configuration/hbase-env.xml | 4 +-
.../0.96.0.2.0/package/scripts/params_linux.py | 2 +
.../2.1.0.2.0/package/scripts/params_linux.py | 3 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 6 +-
.../ranger-kafka-plugin-properties.xml | 6 +
.../4.0.0.2.0/package/scripts/params_linux.py | 2 +
.../0.12.0.2.0/package/scripts/params_linux.py | 1 +
.../0.12.0.2.0/package/scripts/service_check.py | 2 +-
.../RANGER/0.4.0/package/scripts/params.py | 5 +-
.../0.5.0.2.3/package/scripts/params.py | 5 +-
.../SPARK/1.2.1/package/scripts/params.py | 5 +
.../2.0.0/package/scripts/livy2_server.py | 2 +-
.../SPARK2/2.0.0/package/scripts/params.py | 3 +-
.../TITAN/1.0.0/package/scripts/params.py | 3 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 4 +-
.../0.6.0.2.5/package/scripts/params.py | 3 +-
.../4.2.5/upgrades/config-upgrade.xml | 53 +++++-
.../upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 57 +++++-
.../package/alerts/alert_checkpoint_time.py | 2 -
.../BigInsights/4.2/upgrades/config-upgrade.xml | 68 ++++++++
.../upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 53 +++++-
.../2.0.6/hooks/after-INSTALL/scripts/params.py | 3 +-
.../2.0.6/hooks/before-ANY/scripts/params.py | 4 +
.../before-START/scripts/custom_extensions.py | 174 +++++++++++++++++++
.../2.0.6/hooks/before-START/scripts/hook.py | 3 +
.../2.0.6/hooks/before-START/scripts/params.py | 12 +-
.../HDP/2.0.6/properties/stack_features.json | 10 ++
.../stacks/HDP/2.3/services/stack_advisor.py | 5 +
.../stacks/HDP/2.6/services/ATLAS/metainfo.xml | 1 +
.../services/HBASE/configuration/hbase-env.xml | 87 ++++++++++
.../services/HBASE/configuration/hbase-site.xml | 8 +
.../services/HDFS/configuration/core-site.xml | 29 ++++
.../services/HDFS/configuration/hadoop-env.xml | 5 +
.../services/HIVE/configuration/hive-env.xml | 3 +-
.../services/HIVE/configuration/hive-site.xml | 9 +
.../HDP/2.6/services/SPARK2/kerberos.json | 6 +-
.../YARN/configuration-mapred/mapred-site.xml | 9 +
.../services/YARN/configuration/yarn-site.xml | 2 +-
.../AmbariManagementControllerTest.java | 73 ++++++++
.../BlueprintConfigurationProcessorTest.java | 3 +
.../internal/RequestResourceProviderTest.java | 9 +-
.../AmbariPamAuthenticationProviderTest.java | 147 +++++++++-------
.../FixAuthToLocalMappingActionTest.java | 126 ++++++++++++++
.../ClusterConfigurationRequestTest.java | 7 +
.../stacks/2.3/ATLAS/test_metadata_server.py | 6 +-
.../stacks/2.3/common/test_stack_advisor.py | 22 ++-
.../stacks/2.5/ATLAS/test_atlas_server.py | 2 +-
.../mixins/common/configs/enhanced_configs.js | 23 ++-
.../common/configs/enhanced_configs_test.js | 44 +++++
63 files changed, 1343 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f873b00/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f873b00/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f873b00/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/livy2_server.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f873b00/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py
----------------------------------------------------------------------
diff --cc ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py
index 24f9076,65c687d..4d7eaee
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/after-INSTALL/scripts/params.py
@@@ -40,7 -40,11 +40,8 @@@ sudo = AMBARI_SUDO_BINAR
stack_version_unformatted = config['hostLevelParams']['stack_version']
stack_version_formatted = format_stack_version(stack_version_unformatted)
+ major_stack_version = get_major_version(stack_version_formatted)
-# current host stack version
-current_version = default("/hostLevelParams/current_version", None)
-
# default hadoop params
mapreduce_libs_path = "/usr/lib/hadoop-mapreduce/*"
hadoop_libexec_dir = stack_select.get_hadoop_dir("libexec")
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f873b00/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------