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/18 15:03:20 UTC
[44/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/1e09ad0b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e09ad0b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e09ad0b
Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 1e09ad0b074f197ef36ea9c9f3a70de443e80e1e
Parents: 061467b 651fe3d
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Jul 17 12:19:45 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Jul 17 12:19:45 2017 -0400
----------------------------------------------------------------------
.../controllers/groups/GroupsEditCtrl.js | 3 +
.../stackVersions/StackVersionsCreateCtrl.js | 3 +-
.../libraries/functions/stack_tools.py | 2 +-
.../kafka/KafkaTimelineMetricsReporter.java | 6 +-
ambari-server/pom.xml | 2 +-
ambari-server/sbin/ambari-server | 6 +-
.../ambari/server/checks/CheckDescription.java | 38 +-
.../checks/ComponentsExistInRepoCheck.java | 142 ++++++
.../AmbariCustomCommandExecutionHelper.java | 14 +-
.../AmbariManagementControllerImpl.java | 122 +++--
.../internal/HostResourceProvider.java | 1 +
.../apache/ambari/server/orm/DBAccessor.java | 14 +
.../ambari/server/orm/DBAccessorImpl.java | 24 +
.../LdapToPamMigrationHelper.java | 73 +++
.../server/security/authorization/Users.java | 4 +
.../org/apache/ambari/server/state/Host.java | 4 +-
.../ambari/server/state/PropertyInfo.java | 2 +
.../ambari/server/state/host/HostImpl.java | 29 +-
.../KerberosDescriptorUpdateHelper.java | 9 +-
.../server/upgrade/UpgradeCatalog220.java | 197 +-------
.../server/upgrade/UpgradeCatalog252.java | 11 +-
ambari-server/src/main/python/ambari-server.py | 10 +-
.../main/python/ambari_server/setupActions.py | 1 +
.../main/python/ambari_server/setupSecurity.py | 123 ++++-
.../HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 6 +
.../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 8 +
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 26 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 11 +-
.../2.1.0.2.0/package/scripts/params_windows.py | 7 +
.../package/templates/include_hosts_list.j2 | 21 +
.../0.10.0/configuration/ranger-kafka-audit.xml | 58 +++
.../common-services/KAFKA/0.10.0/kerberos.json | 79 ++++
.../common-services/KAFKA/0.10.0/metainfo.xml | 28 ++
.../KAFKA/0.8.1/package/scripts/kafka.py | 12 +
.../KAFKA/0.8.1/package/scripts/params.py | 3 +
.../KAFKA/0.9.0/configuration/kafka-broker.xml | 2 +-
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 26 +-
.../4.0.0.2.0/package/scripts/oozie_server.py | 4 +-
.../package/scripts/oozie_server_upgrade.py | 15 +-
.../4.0.0.2.0/package/scripts/params_linux.py | 15 +-
.../YARN/2.1.0.2.0/configuration/yarn-site.xml | 6 +
.../2.1.0.2.0/package/scripts/params_linux.py | 12 +-
.../2.1.0.2.0/package/scripts/params_windows.py | 10 +-
.../package/scripts/resourcemanager.py | 18 +-
.../package/templates/include_hosts_list.j2 | 21 +
.../0.6.0.2.5/configuration/zeppelin-env.xml | 2 +-
.../services/HDFS/configuration/hdfs-site.xml | 6 +
.../HDFS/package/scripts/hdfs_namenode.py | 12 +-
.../0.8/services/HDFS/package/scripts/params.py | 11 +-
.../package/templates/include_hosts_list.j2 | 21 +
.../services/YARN/configuration/yarn-site.xml | 6 +
.../0.8/services/YARN/package/scripts/params.py | 10 +-
.../YARN/package/scripts/resourcemanager.py | 9 +-
.../package/templates/include_hosts_list.j2 | 21 +
.../BigInsights/4.0/services/SPARK/metainfo.xml | 2 +-
.../package/scripts/spark_thrift_server.py | 125 ++++++
.../SPARK/package/scripts/thrift_server.py | 125 ------
.../4.0/stack-advisor/stack_advisor_25.py | 5 +-
.../stacks/BigInsights/4.2.5/metainfo.xml | 2 +-
.../HBASE/package/files/draining_servers.rb | 164 +++++++
.../HBASE/package/files/hbase-smoke-cleanup.sh | 23 +
.../HBASE/package/files/hbaseSmokeVerify.sh | 34 ++
.../services/HBASE/package/scripts/__init__.py | 19 +
.../services/HBASE/package/scripts/functions.py | 54 +++
.../services/HBASE/package/scripts/hbase.py | 234 ++++++++++
.../HBASE/package/scripts/hbase_client.py | 82 ++++
.../HBASE/package/scripts/hbase_decommission.py | 93 ++++
.../HBASE/package/scripts/hbase_master.py | 163 +++++++
.../HBASE/package/scripts/hbase_regionserver.py | 166 +++++++
.../package/scripts/hbase_restgatewayserver.py | 83 ++++
.../HBASE/package/scripts/hbase_service.py | 93 ++++
.../HBASE/package/scripts/hbase_upgrade.py | 41 ++
.../services/HBASE/package/scripts/params.py | 29 ++
.../HBASE/package/scripts/params_linux.py | 447 +++++++++++++++++++
.../HBASE/package/scripts/params_windows.py | 43 ++
.../package/scripts/phoenix_queryserver.py | 88 ++++
.../HBASE/package/scripts/phoenix_service.py | 55 +++
.../HBASE/package/scripts/service_check.py | 95 ++++
.../HBASE/package/scripts/setup_ranger_hbase.py | 106 +++++
.../HBASE/package/scripts/status_params.py | 68 +++
.../services/HBASE/package/scripts/upgrade.py | 65 +++
...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 117 +++++
...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 116 +++++
.../HBASE/package/templates/hbase-smoke.sh.j2 | 44 ++
.../HBASE/package/templates/hbase.conf.j2 | 35 ++
.../package/templates/hbase_client_jaas.conf.j2 | 23 +
.../templates/hbase_grant_permissions.j2 | 40 ++
.../package/templates/hbase_master_jaas.conf.j2 | 26 ++
.../templates/hbase_queryserver_jaas.conf.j2 | 26 ++
.../templates/hbase_regionserver_jaas.conf.j2 | 26 ++
.../package/templates/hbase_rest_jaas.conf.j2 | 26 ++
.../HBASE/package/templates/regionservers.j2 | 20 +
.../services/HBASE/package/scripts/params.py | 4 +-
.../BigInsights/4.2/services/KNOX/kerberos.json | 6 -
.../RANGER/configuration/ranger-admin-site.xml | 14 +
.../BigInsights/4.2/services/SPARK/metainfo.xml | 2 +-
.../services/SPARK/package/scripts/params.py | 5 +-
.../package/scripts/spark_thrift_server.py | 119 +++++
.../SPARK/package/scripts/thrift_server.py | 119 -----
.../services/YARN/configuration/yarn-site.xml | 6 +
.../services/YARN/package/scripts/params.py | 9 +-
.../YARN/package/scripts/resourcemanager.py | 9 +-
.../package/templates/exclude_hosts_list.j2 | 21 +
.../package/templates/include_hosts_list.j2 | 21 +
.../hooks/before-ANY/files/changeToSecureUid.sh | 13 +-
.../before-ANY/scripts/shared_initialization.py | 45 +-
.../services/YARN/configuration/yarn-site.xml | 6 +
.../services/YARN/package/scripts/params.py | 10 +-
.../YARN/package/scripts/resourcemanager.py | 9 +-
.../package/templates/include_hosts_list.j2 | 21 +
.../stacks/HDP/2.5/services/KAFKA/metainfo.xml | 1 +
.../stacks/HDP/2.5/services/stack_advisor.py | 11 +-
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 4 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 +-
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
.../configuration/application-properties.xml | 17 +
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 4 +
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
.../src/main/resources/stacks/stack_advisor.py | 18 +
.../checks/ComponentExistsInRepoCheckTest.java | 329 ++++++++++++++
.../AmbariManagementControllerTest.java | 8 +-
.../KerberosDescriptorUpdateHelperTest.java | 70 +++
.../src/test/python/TestAmbariServer.py | 13 +-
.../python/stacks/2.0.6/HDFS/test_namenode.py | 2 +-
.../stacks/2.0.6/configs/altfs_plus_hdfs.json | 2 +-
.../python/stacks/2.0.6/configs/default.json | 2 +-
.../2.0.6/configs/default_ams_embedded.json | 2 +-
.../2.0.6/configs/default_hive_nn_ha.json | 2 +-
.../2.0.6/configs/default_hive_nn_ha_2.json | 2 +-
.../2.0.6/configs/default_hive_non_hdfs.json | 2 +-
.../2.0.6/configs/default_no_install.json | 2 +-
.../2.0.6/configs/default_oozie_mysql.json | 2 +-
.../default_update_exclude_file_only.json | 2 +-
.../2.0.6/configs/default_with_bucket.json | 2 +-
.../python/stacks/2.0.6/configs/flume_22.json | 2 +-
.../python/stacks/2.0.6/configs/flume_only.json | 2 +-
.../stacks/2.0.6/configs/hbase_no_phx.json | 2 +-
.../stacks/2.0.6/configs/hbase_with_phx.json | 2 +-
.../2.0.6/configs/oozie_existing_sqla.json | 2 +-
.../python/stacks/2.0.6/configs/secured.json | 2 +-
.../2.0.6/hooks/before-ANY/test_before_any.py | 294 +++++++-----
.../test/python/stacks/2.3/configs/ats_1_5.json | 2 +-
.../stacks/2.5/common/test_stack_advisor.py | 150 ++++---
.../python/stacks/2.5/configs/hsi_default.json | 2 +-
.../2.5/configs/hsi_default_for_restart.json | 2 +-
.../test/python/stacks/2.5/configs/hsi_ha.json | 2 +-
.../app/controllers/wizard/step7_controller.js | 67 +++
.../configs/stack_config_properties_mapper.js | 14 +-
ambari-web/app/styles/application.less | 15 +
...ontrols_service_config_usergroup_with_id.hbs | 27 ++
ambari-web/app/utils/config.js | 3 +
.../configs/service_configs_by_category_view.js | 6 +
ambari-web/app/views/common/controls_view.js | 39 ++
.../services/YARN/configuration/yarn-site.xml | 6 +
.../YARN/package/scripts/params_linux.py | 9 +-
.../YARN/package/scripts/params_windows.py | 10 +-
.../YARN/package/scripts/resourcemanager.py | 18 +-
.../package/templates/include_hosts_list.j2 | 21 +
159 files changed, 5154 insertions(+), 822 deletions(-)
----------------------------------------------------------------------