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 Fri, 02 Dec 2016 20:26: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/06327e65
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/06327e65
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/06327e65

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 06327e65e9703830e003f3a6effdfe382e5c8de7
Parents: f70591b 05fe423
Author: Nate Cole <ncole@hortonworks.com>
Authored: Fri Dec 2 15:25:46 2016 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Fri Dec 2 15:25:46 2016 -0500

----------------------------------------------------------------------
 .../admin-web/app/scripts/services/Cluster.js   |   51 -
 .../app/scripts/services/RoleDetailsModal.js    |   31 +-
 .../app/views/modals/RoleDetailsModal.html      |    6 +-
 .../src/main/python/ambari_agent/ActionQueue.py |   21 +-
 .../ambari_agent/CustomServiceOrchestrator.py   |   11 +-
 .../src/main/python/ambari_agent/FileCache.py   |   12 +-
 .../test/python/ambari_agent/TestActionQueue.py |   48 +
 .../TestCustomServiceOrchestrator.py            |   30 +-
 .../test/python/ambari_agent/TestFileCache.py   |   10 +-
 .../ambari_commons/ambari_metrics_helper.py     |   45 +-
 .../simulate_perf_cluster_alert_behaviour.py    |  108 ++
 .../libraries/script/script.py                  |   15 +-
 .../ambari/logfeeder/mapper/MapperDateTest.java |   56 -
 .../logsearch/common/ExternalServerClient.java  |   12 +-
 .../ambari/logsearch/dao/SolrCollectionDao.java |   64 +-
 .../timeline/AbstractTimelineMetricsSink.java   |    6 +-
 .../AbstractTimelineMetricSinkTest.java         |   10 +-
 .../conf/unix/ambari-metrics-grafana            |    6 +-
 .../timeline/HadoopTimelineMetricsSink.java     |    4 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java |    6 +-
 .../src/main/python/core/config_reader.py       |    9 +-
 .../src/test/python/core/TestEmitter.py         |    2 +-
 ambari-server/conf/unix/ambari.properties       |    4 +-
 ambari-server/conf/windows/ambari.properties    |    2 +
 ambari-server/docs/configuration/index.md       |   33 +-
 .../ambari/server/agent/ExecutionCommand.java   |    1 +
 .../ambari/server/agent/HeartBeatHandler.java   |    2 +-
 .../ambari/server/agent/HeartbeatProcessor.java |    2 +-
 .../server/checks/ServicePresenceCheck.java     |   55 +-
 .../server/configuration/Configuration.java     |   53 +
 .../AmbariManagementControllerImpl.java         |    9 +
 .../controller/internal/CalculatedStatus.java   |   52 +-
 .../internal/RequestResourceProvider.java       |   34 +-
 .../internal/StageResourceProvider.java         |    2 +-
 .../internal/UpgradeResourceProvider.java       |   24 +-
 .../orm/AmbariJpaLocalTxnInterceptor.java       |    9 +-
 .../security/AbstractSecurityHeaderFilter.java  |   14 +
 .../AmbariServerSecurityHeaderFilter.java       |    1 +
 .../AmbariViewsSecurityHeaderFilter.java        |    1 +
 .../kerberos/MITKerberosOperationHandler.java   |   22 +-
 .../ambari/server/state/ComponentInfo.java      |   14 +
 .../ambari/server/state/quicklinks/Link.java    |   21 +
 .../services/RetryUpgradeActionService.java     |    2 +-
 .../stack/upgrade/ConfigurationCondition.java   |   72 +-
 .../server/upgrade/UpgradeCatalog211.java       |   24 +-
 .../server/upgrade/UpgradeCatalog250.java       |   58 +
 .../ambari/server/utils/RequestUtils.java       |   10 +
 .../ambari/server/utils/ShellCommandUtil.java   |   11 +-
 ambari-server/src/main/python/ambari-server.py  |   12 +-
 .../python/ambari_server/serverConfiguration.py |   14 +-
 .../main/python/ambari_server/serverUtils.py    |   11 +
 .../src/main/python/ambari_server/utils.py      |   81 +-
 .../src/main/python/ambari_server_main.py       |   70 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   11 +-
 .../1.6.1.2.2.0/package/scripts/params.py       |    2 +-
 .../AMBARI_METRICS/0.1.0/metainfo.xml           |    1 +
 .../0.1.0/package/scripts/params.py             |    2 +-
 .../0.1.0/package/scripts/service_check.py      |    2 +-
 .../package/scripts/metadata_server.py          |   18 +
 .../FLUME/1.4.0.2.0/package/scripts/params.py   |    2 +-
 .../0.96.0.2.0/package/scripts/params_linux.py  |    2 +-
 .../package/alerts/alert_metrics_deviation.py   |    2 +-
 .../KAFKA/0.8.1/package/scripts/params.py       |    2 +-
 .../RANGER/0.4.0/package/scripts/params.py      |   14 +
 .../0.4.0/package/scripts/setup_ranger_xml.py   |   21 +
 .../common-services/RANGER/0.6.0/metainfo.xml   |    2 +
 .../STORM/0.9.1/package/scripts/params_linux.py |    2 +-
 .../2.1.0.2.0/package/scripts/service_check.py  |   66 +-
 .../ZOOKEEPER/3.4.6/metainfo.xml                |    2 +-
 .../custom_actions/scripts/install_packages.py  |    2 +-
 .../src/main/resources/scripts/stack_advisor.py |   11 +-
 .../HDP/2.0.6/configuration/cluster-env.xml     |   10 +
 .../2.0.6/hooks/before-START/scripts/params.py  |    2 +-
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |   47 +-
 .../stacks/HDP/2.1/services/stack_advisor.py    |   20 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |    7 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml |   27 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |   27 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |   32 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   32 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     |    5 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |    5 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml |   27 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |   32 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   32 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml     |    5 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |    5 +-
 .../stacks/HDP/2.5/services/KNOX/metainfo.xml   |    4 -
 .../stacks/HDP/2.5/services/OOZIE/metainfo.xml  |    4 +
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |   12 +
 .../HDP/2.5/upgrades/host-ordered-upgrade.xml   |   11 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml |   27 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   31 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |    3 +
 .../configuration/hive-interactive-site.xml     |   58 +
 .../HIVE/configuration/tez-interactive-site.xml |   78 +
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |   27 +-
 .../2.1/hooks/before-START/scripts/params.py    |    4 +-
 .../stacks/PERF/1.0/services/HAPPY/alerts.json  |   20 +
 .../HAPPY/configuration/happy-alert-config.xml  |   75 +
 .../stacks/PERF/1.0/services/HAPPY/metainfo.xml |    5 +
 .../HAPPY/package/alerts/alert_happy_process.py |   59 +
 .../stacks/PERF/1.0/services/HBASE/alerts.json  |  110 +-
 .../HBASE/configuration/hbase-alert-config.xml  |   75 +
 .../stacks/PERF/1.0/services/HBASE/metainfo.xml |    1 +
 .../package/alerts/hbase_master_process.py      |   59 +
 .../alerts/hbase_regionserver_process.py        |   59 +
 .../stacks/PERF/1.0/services/HDFS/alerts.json   | 1728 +-----------------
 .../HDFS/configuration/hdfs-alert-config.xml    |   75 +
 .../stacks/PERF/1.0/services/HDFS/metainfo.xml  |    1 +
 .../package/alerts/alert_checkpoint_time.py     |   38 +-
 .../alerts/alert_datanode_unmounted_data_dir.py |   47 +-
 .../package/alerts/alert_ha_namenode_health.py  |   75 -
 .../package/alerts/alert_metrics_deviation.py   |   85 -
 .../package/alerts/alert_nfs_gateway_process.py |   59 +
 .../package/alerts/alert_snamenode_process.py   |   59 +
 .../package/alerts/alert_upgrade_finalized.py   |   49 +-
 .../stacks/PERF/1.0/services/SLEEPY/alerts.json |   20 +
 .../configuration/sleepy-alert-config.xml       |   75 +
 .../PERF/1.0/services/SLEEPY/metainfo.xml       |    5 +
 .../package/alerts/alert_sleepy_process.py      |   59 +
 .../stacks/PERF/1.0/services/SNOW/alerts.json   |   20 +
 .../SNOW/configuration/snow-alert-config.xml    |   75 +
 .../stacks/PERF/1.0/services/SNOW/metainfo.xml  |    5 +
 .../SNOW/package/alerts/alert_snow_process.py   |   59 +
 .../stacks/PERF/1.0/services/YARN/alerts.json   |  361 +---
 .../YARN/configuration/yarn-alert-config.xml    |   75 +
 .../stacks/PERF/1.0/services/YARN/metainfo.xml  |    3 +
 .../package/alerts/alert_history_process.py     |   59 +
 .../package/alerts/alert_nodemanager_health.py  |   36 +-
 .../alerts/alert_nodemanagers_summary.py        |   68 -
 .../alerts/alert_resourcemanager_process.py     |   59 +
 .../package/alerts/alert_timeline_process.py    |   59 +
 .../PERF/1.0/services/ZOOKEEPER/alerts.json     |   20 +
 .../ZOOKEEPER/configuration/zk-alert-config.xml |   75 +
 .../PERF/1.0/services/ZOOKEEPER/metainfo.xml    |    4 +
 .../package/alerts/alert_zk_server_process.py   |   59 +
 .../src/main/resources/stacks/stack_advisor.py  |  209 ++-
 .../src/main/resources/upgrade-pack.xsd         |    8 +-
 .../AmbariManagementControllerTest.java         |    9 +
 .../internal/CalculatedStatusTest.java          |   31 +
 .../internal/RequestResourceProviderTest.java   |   12 +-
 .../internal/UpgradeResourceProviderTest.java   |    4 +-
 .../orm/AmbariJpaLocalTxnInterceptorTest.java   |  155 ++
 .../server/orm/InMemoryDefaultTestModule.java   |    5 +
 .../AbstractSecurityHeaderFilterTest.java       |   29 +-
 .../MITKerberosOperationHandlerTest.java        |   23 +
 .../QuickLinksConfigurationModuleTest.java      |   36 +
 .../server/upgrade/UpgradeCatalog250Test.java   |   20 +-
 .../ambari/server/utils/RequestUtilsTest.java   |   18 +
 .../server/utils/TestShellCommandUtil.java      |   13 +-
 .../src/test/python/TestAmbariServer.py         |    6 +-
 ambari-server/src/test/python/TestMpacks.py     |  102 +-
 ambari-server/src/test/python/TestUtils.py      |   37 +-
 .../2.0.6/YARN/test_yarn_service_check.py       |  111 +-
 .../stacks/2.0.6/common/test_stack_advisor.py   |   16 +-
 .../stacks/2.1/common/test_stack_advisor.py     |    2 +
 .../stacks/2.2/common/test_stack_advisor.py     |   17 +-
 .../stacks/2.3/ATLAS/test_metadata_server.py    |    5 +-
 .../test/python/stacks/test_stack_adviser.py    |  239 +++
 .../child_quicklinks_with_properties.json       |   64 +
 .../src/test/resources/dashboards/README.txt    |   18 +
 .../parent_quicklinks_with_properties.json      |   65 +
 .../stacks/HDP/0.1/services/HDFS/metainfo.xml   |    1 +
 .../admin/stack_upgrade_history_controller.js   |    2 +-
 .../controllers/main/service/info/configs.js    |    2 +-
 .../controllers/main/service/info/summary.js    |   37 +-
 ambari-web/app/controllers/main/service/item.js |   49 +-
 .../main/service/reassign/step4_controller.js   |   19 +-
 .../app/controllers/wizard/step6_controller.js  |   58 +-
 .../app/controllers/wizard/step7_controller.js  |    2 +-
 .../app/mappers/stack_upgrade_history_mapper.js |    2 +-
 ambari-web/app/messages.js                      |   13 +-
 ambari-web/app/mixins.js                        |    1 -
 .../mixins/main/dashboard/widgets/editable.js   |   47 +-
 .../app/mixins/main/service/groups_mapping.js   |    2 +-
 .../stack_version/stack_upgrade_history.js      |    2 +-
 ambari-web/app/styles/stack_versions.less       |   16 +-
 .../highAvailability/journalNode/step2.hbs      |    2 +
 .../templates/main/admin/service_auto_start.hbs |   24 +-
 .../main/dashboard/edit_widget_popup.hbs        |    4 +-
 .../edit_widget_popup_single_threshold.hbs      |    2 +-
 .../main/dashboard/plus_button_filter.hbs       |    2 +-
 .../app/templates/main/dashboard/widgets.hbs    |    8 +-
 .../main/dashboard/widgets/pie_chart.hbs        |    5 +-
 .../info/delete_service_warning_popup.hbs       |   28 +
 .../main/service/info/service_alert_popup.hbs   |   15 +-
 ambari-web/app/templates/wizard/step1.hbs       |    2 +-
 .../app/utils/configs/config_initializer.js     |   28 +-
 .../mount_points_based_initializer_mixin.js     |  340 ----
 .../app/views/common/not-scrollable-textarea.js |    2 +-
 ambari-web/app/views/main/admin.js              |    3 +-
 .../app/views/main/admin/service_auto_start.js  |    5 +
 .../service_auto_start/component_auto_start.js  |    1 +
 .../upgrade_history_details_view.js             |    2 +-
 .../admin/stack_upgrade/upgrade_history_view.js |  120 +-
 ambari-web/app/views/main/dashboard/widget.js   |  159 +-
 ambari-web/app/views/main/dashboard/widgets.js  |  824 ++++-----
 .../main/dashboard/widgets/datanode_live.js     |    7 -
 .../main/dashboard/widgets/flume_agent_live.js  |    7 -
 .../main/dashboard/widgets/hawqsegment_live.js  |    7 -
 .../dashboard/widgets/hbase_average_load.js     |   11 +-
 .../views/main/dashboard/widgets/hbase_links.js |    4 -
 .../main/dashboard/widgets/hbase_master_heap.js |    4 -
 .../dashboard/widgets/hbase_master_uptime.js    |    5 -
 .../widgets/hbase_regions_in_transition.js      |   10 +-
 .../main/dashboard/widgets/hdfs_capacity.js     |    4 -
 .../views/main/dashboard/widgets/hdfs_links.js  |    4 -
 .../views/main/dashboard/widgets/metrics_cpu.js |    3 -
 .../main/dashboard/widgets/metrics_load.js      |    3 -
 .../main/dashboard/widgets/metrics_memory.js    |    3 -
 .../main/dashboard/widgets/metrics_network.js   |    3 -
 .../main/dashboard/widgets/namenode_cpu.js      |    4 -
 .../main/dashboard/widgets/namenode_heap.js     |    4 -
 .../main/dashboard/widgets/namenode_rpc.js      |   10 +-
 .../main/dashboard/widgets/namenode_uptime.js   |    5 -
 .../dashboard/widgets/node_managers_live.js     |    7 -
 .../main/dashboard/widgets/pie_chart_widget.js  |   16 +-
 .../views/main/dashboard/widgets/pxf_live.js    |    6 -
 .../dashboard/widgets/resource_manager_heap.js  |    4 -
 .../widgets/resource_manager_uptime.js          |    5 -
 .../main/dashboard/widgets/supervisor_live.js   |    7 -
 .../views/main/dashboard/widgets/text_widget.js |    4 +-
 .../widgets/text_widget_single_threshold.js     |    6 +-
 .../dashboard/widgets/uptime_text_widget.js     |    2 -
 .../views/main/dashboard/widgets/yarn_links.js  |    4 -
 .../views/main/dashboard/widgets/yarn_memory.js |    4 -
 ambari-web/app/views/wizard/step1_view.js       |    7 +
 .../test/controllers/main/service/item_test.js  |   13 +-
 .../service/reassign/step4_controller_test.js   |    2 +-
 .../test/controllers/wizard/step6_test.js       |    6 +-
 ambari-web/test/utils/ajax/ajax_test.js         |    9 +-
 .../utils/configs/config_initializer_test.js    |  457 -----
 .../test/views/main/dashboard/widget_test.js    |  200 +-
 .../widgets/hbase_average_load_test.js          |    4 +-
 .../widgets/hbase_regions_in_transition_test.js |    6 +-
 .../main/dashboard/widgets/namenode_rpc_test.js |   13 +-
 .../text_widget_single_threshold_test.js        |   10 +-
 .../main/dashboard/widgets/text_widget_test.js  |   10 +-
 .../widgets/uptime_text_widget_test.js          |    2 +-
 .../test/views/main/dashboard/widgets_test.js   |  669 +++----
 contrib/utils/perf/deploy-gce-perf-cluster.py   |  243 ++-
 .../src/main/resources/ui/app/app.js            |   14 +-
 .../src/main/resources/ui/pig-web/app/app.js    |   14 +-
 contrib/views/pom.xml                           |    1 -
 .../resources/ui/app/components/job-details.js  |    3 +
 contrib/views/zeppelin/pom.xml                  |  190 --
 .../view/zeppelin/ZeppelinServiceCheck.java     |   55 -
 .../ambari/view/zeppelin/ZeppelinServlet.java   |  113 --
 .../zeppelin/src/main/resources/WEB-INF/web.xml |   40 -
 .../src/main/resources/view.log4j.properties    |   27 -
 .../views/zeppelin/src/main/resources/view.xml  |   48 -
 docs/pom.xml                                    |    4 +-
 253 files changed, 5213 insertions(+), 6089 deletions(-)
----------------------------------------------------------------------


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


Mime
View raw message