ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [50/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
Date Wed, 07 Dec 2016 15:00:48 GMT
Merge branch 'trunk' into branch-dev-patch-upgrade


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/90cb3a4c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/90cb3a4c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/90cb3a4c

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 90cb3a4ce92c4cfb57356073d1fa603e2403f632
Parents: 06327e6 234838f
Author: Nate Cole <ncole@hortonworks.com>
Authored: Wed Dec 7 09:59:40 2016 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Wed Dec 7 09:59:40 2016 -0500

----------------------------------------------------------------------
 ambari-agent/conf/unix/ambari-agent.ini         |   3 +
 .../ambari_agent/CustomServiceOrchestrator.py   | 120 +++
 .../src/main/python/ambari_agent/HostInfo.py    |  12 +-
 ambari-agent/src/packages/tarball/all.xml       |  30 +
 .../ambari_commons/ambari_metrics_helper.py     |  26 +-
 .../libraries/functions/constants.py            |   1 +
 .../libraries/functions/copy_tarball.py         |   2 +-
 .../dynamic_variable_interpretation.py          |   2 +-
 .../libraries/functions/setup_atlas_hook.py     |  47 +-
 .../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/ExecutionCommand.java   |  28 +
 .../ambari/server/agent/HeartBeatHandler.java   |   2 +-
 .../AmbariManagementControllerImpl.java         |   5 +
 .../internal/AlertTargetResourceProvider.java   |   2 +-
 .../BlueprintConfigurationProcessor.java        |   3 +-
 .../ClusterStackVersionResourceProvider.java    |   4 +-
 .../internal/UpgradeResourceProvider.java       |   2 +-
 .../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 +-
 .../ambari/server/topology/TopologyManager.java |  19 +-
 .../server/upgrade/AbstractUpgradeCatalog.java  |  25 +-
 .../server/upgrade/UpgradeCatalog240.java       |   4 +-
 .../server/upgrade/UpgradeCatalog250.java       |  30 +
 .../src/main/python/ambari_server_main.py       |   8 +-
 .../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 +
 .../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 +-
 .../0.5.0.2.1/configuration/falcon-env.xml      |  17 +
 .../FALCON/0.5.0.2.1/metainfo.xml               |   7 +
 .../FALCON/0.5.0.2.1/package/scripts/falcon.py  |   2 +-
 .../0.5.0.2.1/package/scripts/params_linux.py   |   5 +-
 .../FALCON/0.5.0.2.1/quicklinks/quicklinks.json |  35 +
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |  17 +
 .../HIVE/0.12.0.2.0/package/scripts/hcat.py     |   2 +-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |   2 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |   5 +-
 .../HIVE/0.12.0.2.0/package/scripts/webhcat.py  |   2 +-
 .../configuration/logsearch-properties.xml      |   2 +-
 .../LOGSEARCH/0.5.0/metainfo.xml                |   1 +
 .../0.5.0/package/scripts/setup_logsearch.py    |   3 +-
 .../RANGER/0.4.0/package/scripts/params.py      |   1 +
 .../0.4.0/package/scripts/ranger_admin.py       |  36 +-
 .../SQOOP/1.4.4.2.0/configuration/sqoop-env.xml |  17 +
 .../1.4.4.2.0/configuration/sqoop-site.xml      |   6 +
 .../1.4.4.2.0/package/scripts/params_linux.py   |   5 +-
 .../SQOOP/1.4.4.2.0/package/scripts/sqoop.py    |   2 +-
 .../STORM/0.10.0/configuration/storm-env.xml    |  17 +
 .../STORM/0.9.1/package/scripts/params_linux.py |   6 +-
 .../STORM/0.9.1/package/scripts/storm.py        |   2 +-
 .../scripts/post-user-creation-hook.sh          |   7 +
 .../HDP/2.0.6/properties/stack_features.json    |   5 +
 .../services/HIVE/configuration/hive-site.xml   |   4 +
 .../services/STORM/configuration/storm-site.xml |   4 +
 .../stacks/HDP/2.3/services/stack_advisor.py    |  61 +-
 .../services/HDFS/configuration/hadoop-env.xml  | 176 ++++
 .../stacks/HDP/2.5/services/stack_advisor.py    |   6 -
 .../HDP/2.6/services/ACCUMULO/metainfo.xml      |   2 +-
 .../stacks/HDP/2.6/services/FALCON/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/FLUME/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/HBASE/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/HDFS/metainfo.xml   |   2 +-
 .../stacks/HDP/2.6/services/HIVE/metainfo.xml   |   2 +-
 .../stacks/HDP/2.6/services/KAFKA/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/KNOX/metainfo.xml   |   2 +-
 .../stacks/HDP/2.6/services/MAHOUT/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/OOZIE/metainfo.xml  |   1 +
 .../stacks/HDP/2.6/services/PIG/metainfo.xml    |   2 +-
 .../stacks/HDP/2.6/services/RANGER/metainfo.xml |   2 +-
 .../HDP/2.6/services/RANGER_KMS/metainfo.xml    |   2 +-
 .../stacks/HDP/2.6/services/SLIDER/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/SPARK/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/SPARK2/metainfo.xml |   2 +-
 .../stacks/HDP/2.6/services/SQOOP/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/STORM/metainfo.xml  |   2 +-
 .../stacks/HDP/2.6/services/TEZ/metainfo.xml    |   2 +-
 .../stacks/HDP/2.6/services/YARN/metainfo.xml   |   4 +-
 .../HDP/2.6/services/ZOOKEEPER/metainfo.xml     |   2 +-
 .../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 +-
 .../HAPPY/configuration/happy-alert-config.xml  |   5 +
 .../HBASE/configuration/hbase-alert-config.xml  |   5 +
 .../HDFS/configuration/hdfs-alert-config.xml    |   5 +
 .../configuration/sleepy-alert-config.xml       |   5 +
 .../SNOW/configuration/snow-alert-config.xml    |   5 +
 .../YARN/configuration/yarn-alert-config.xml    |   5 +
 .../ZOOKEEPER/configuration/zk-alert-config.xml |   5 +
 .../server/agent/TestHeartbeatHandler.java      |  28 +-
 .../BlueprintConfigurationProcessorTest.java    |  11 +
 .../ldap/AmbariLdapDataPopulatorTest.java       |   3 +-
 .../ambari/server/state/UpgradeHelperTest.java  |  39 +-
 .../server/upgrade/UpgradeCatalog210Test.java   |   2 +
 .../server/upgrade/UpgradeCatalog250Test.java   |  93 +++
 .../stacks/2.3/common/test_stack_advisor.py     |  57 +-
 .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py  |   2 +-
 .../stacks/2.4/LOGSEARCH/test_logsearch.py      |   2 +-
 .../stacks/2.6/RANGER/test_ranger_admin.py      | 504 ++++++++++++
 .../2.6/configs/ranger-admin-default.json       | 704 ++++++++++++++++
 .../2.6/configs/ranger-admin-secured.json       | 773 ++++++++++++++++++
 .../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                      |   3 -
 .../common/widgets/export_metrics_mixin.js      |  28 +-
 .../main/host/details/actions/check_host.js     |   3 +-
 .../configs/objects/service_config_property.js  |   7 -
 .../app/routes/manage_journalnode_routes.js     |   4 +-
 .../app/styles/theme/bootstrap-ambari.css       |  29 +-
 ambari-web/app/styles/wizard.less               |  19 +-
 .../common/configs/notifications_configs.hbs    |   2 +-
 .../templates/common/host_progress_popup.hbs    |   8 +-
 .../highAvailability/journalNode/wizard.hbs     |  13 +-
 .../admin/stack_upgrade/upgrade_options.hbs     |  58 +-
 ambari-web/app/templates/wizard/step1.hbs       |   2 +-
 ambari-web/app/templates/wizard/step8.hbs       |   2 +-
 .../notification_configs_view.js                |  18 +-
 .../configs/service_configs_by_category_view.js |   9 +-
 .../widgets/slider_config_widget_view.js        |   7 +-
 ambari-web/app/views/common/controls_view.js    |   3 +-
 .../highAvailability/journalNode/step2_view.js  |   5 +-
 .../admin/stack_upgrade/upgrade_wizard_view.js  |   6 +-
 ambari-web/app/views/main/host/menu.js          |   4 +-
 ambari-web/app/views/wizard/step1_view.js       |  21 +-
 ambari-web/test/controllers/installer_test.js   |  13 +-
 .../widgets/slider_config_widget_view_test.js   |  23 -
 .../test/views/common/controls_view_test.js     |  74 +-
 .../stack_upgrade/upgrade_wizard_view_test.js   |   2 +-
 .../test/views/main/dashboard/widgets_test.js   |   2 +-
 contrib/utils/perf/deploy-gce-perf-cluster.py   |  10 +-
 contrib/views/ambari-views-package/pom.xml      |   4 +-
 .../src/main/resources/view.xml                 |  23 +-
 contrib/views/files/src/main/resources/view.xml |   7 +
 .../views/hive-next/src/main/resources/view.xml |   7 +
 contrib/views/tez/src/main/resources/view.xml   |   7 +
 pom.xml                                         |   1 +
 utility/pom.xml                                 |  33 +-
 ...AvoidTransactionalOnPrivateMethodsCheck.java |  55 ++
 .../src/main/resources/checkstyle_packages.xml  |  15 +
 ...dTransactionalOnPrivateMethodsCheckTest.java |  49 ++
 .../InputTransactionalOnPrivateMethods.java     |  46 ++
 229 files changed, 12765 insertions(+), 414 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/90cb3a4c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/90cb3a4c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/90cb3a4c/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------


Mime
View raw message