You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/02/24 16:07:52 UTC
[05/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
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/abc961a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/abc961a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/abc961a1
Branch: refs/heads/trunk
Commit: abc961a13a15cdced7bb3678e4ac67364ba656aa
Parents: fc402eb 77ea2eb
Author: Nate Cole <nc...@hortonworks.com>
Authored: Thu Jan 21 14:20:49 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Thu Jan 21 14:20:49 2016 -0500
----------------------------------------------------------------------
.../python/resource_management/TestScript.py | 4 +-
.../src/main/python/ambari_commons/firewall.py | 6 +-
.../libraries/functions/get_lzo_packages.py | 5 +-
.../libraries/functions/package_conditions.py | 64 ++++
.../libraries/functions/ranger_functions.py | 2 +-
.../libraries/functions/ranger_functions_v2.py | 2 +-
.../libraries/script/script.py | 21 +-
.../2.1.1/services/AMBARI_METRICS/metainfo.xml | 1 +
.../metrics/timeline/PhoenixHBaseAccessor.java | 2 +-
.../aggregators/TimelineMetricReadHelper.java | 4 +-
.../server/checks/AbstractCheckDescriptor.java | 4 +
.../ambari/server/checks/CheckDescription.java | 7 +
.../HiveDynamicServiceDiscoveryCheck.java | 2 +-
.../checks/HiveMultipleMetastoreCheck.java | 2 +-
.../server/checks/HostMaintenanceModeCheck.java | 2 +-
.../checks/HostsMasterMaintenanceCheck.java | 2 +-
.../server/checks/InstallPackagesCheck.java | 2 +-
...apReduce2JobHistoryStatePreservingCheck.java | 2 +-
.../server/checks/PreviousUpgradeCompleted.java | 144 +++++++++
.../server/checks/RangerPasswordCheck.java | 2 +-
.../checks/SecondaryNamenodeDeletedCheck.java | 2 +-
.../checks/ServicesMaintenanceModeCheck.java | 2 +-
.../ServicesMapReduceDistributedCacheCheck.java | 2 +-
.../ServicesNamenodeHighAvailabilityCheck.java | 2 +-
.../checks/ServicesNamenodeTruncateCheck.java | 2 +-
.../ServicesTezDistributedCacheCheck.java | 2 +-
.../checks/ServicesYarnWorkPreservingCheck.java | 2 +-
.../server/checks/StormRestAPIDeletedCheck.java | 2 +-
.../checks/YarnRMHighAvailabilityCheck.java | 2 +-
.../YarnTimelineServerStatePreservingCheck.java | 2 +-
.../AmbariManagementControllerImpl.java | 9 +
.../ambari/server/orm/dao/ClusterDAO.java | 19 ++
.../server/orm/dao/HostRoleCommandDAO.java | 9 +
.../apache/ambari/server/state/ServiceImpl.java | 28 +-
.../ambari/server/state/ServiceOsSpecific.java | 17 +-
.../server/topology/ClusterTopologyImpl.java | 7 +-
.../server/upgrade/SchemaUpgradeHelper.java | 1 +
.../server/upgrade/UpgradeCatalog240.java | 298 +++++++++++++++++++
.../0.1.0/package/scripts/metrics_monitor.py | 4 +-
.../0.96.0.2.0/configuration/hbase-env.xml | 2 +-
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 3 +-
.../0.96.0.2.0/package/scripts/hbase_client.py | 4 +-
.../0.96.0.2.0/package/scripts/hbase_master.py | 3 +-
.../package/scripts/hbase_regionserver.py | 3 +-
.../0.96.0.2.0/package/scripts/params_linux.py | 5 -
.../package/scripts/phoenix_queryserver.py | 3 +-
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 4 +
.../HDFS/2.1.0.2.0/package/scripts/datanode.py | 4 +-
.../2.1.0.2.0/package/scripts/hdfs_client.py | 4 +-
.../2.1.0.2.0/package/scripts/journalnode.py | 4 +-
.../HDFS/2.1.0.2.0/package/scripts/namenode.py | 4 +-
.../2.1.0.2.0/package/scripts/nfsgateway.py | 2 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 4 -
.../HDFS/2.1.0.2.0/package/scripts/snamenode.py | 2 +-
.../2.1.0.2.0/package/scripts/zkfc_slave.py | 2 +-
.../HIVE/0.12.0.2.0/metainfo.xml | 4 +
.../0.12.0.2.0/package/scripts/hcat_client.py | 2 +-
.../0.12.0.2.0/package/scripts/hive_client.py | 2 +-
.../package/scripts/hive_metastore.py | 2 +-
.../0.12.0.2.0/package/scripts/hive_server.py | 2 +-
.../0.12.0.2.0/package/scripts/mysql_server.py | 2 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 18 +-
.../package/scripts/params_windows.py | 2 -
.../package/scripts/webhcat_server.py | 2 +-
.../KERBEROS/1.10.3-10/metainfo.xml | 6 +
.../package/scripts/kerberos_client.py | 2 +-
.../common-services/PXF/3.0.0/metainfo.xml | 6 +
.../PXF/3.0.0/package/scripts/params.py | 31 +-
.../PXF/3.0.0/package/scripts/pxf_constants.py | 26 ++
.../PXF/3.0.0/package/scripts/pxf_utils.py | 49 +++
.../PXF/3.0.0/package/scripts/service_check.py | 266 +++++++++++++++++
.../SQOOP/1.4.4.2.0/metainfo.xml | 1 +
.../custom_actions/scripts/install_packages.py | 17 +-
.../stacks/HDP/2.1/services/HIVE/metainfo.xml | 4 +
.../stacks/HDP/2.2/services/HBASE/metainfo.xml | 2 +
.../stacks/HDP/2.2/services/HDFS/metainfo.xml | 4 +
.../stacks/HDP/2.2/services/HIVE/metainfo.xml | 5 +
.../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 1 +
.../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 1 +
.../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 6 +
.../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 6 +
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 3 +
.../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 3 +
.../stacks/HDP/2.3/role_command_order.json | 6 +-
.../stacks/HDP/2.3/services/HDFS/metainfo.xml | 3 +
.../stacks/HDP/2.3/services/HIVE/metainfo.xml | 7 +
.../stacks/HDP/2.3/services/OOZIE/metainfo.xml | 1 +
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 17 ++
.../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 6 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 9 +
.../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 5 +
.../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 5 +
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 23 ++
.../server/checks/UpgradeCheckOrderTest.java | 26 +-
.../AmbariManagementControllerImplTest.java | 5 +
.../timeline/AMSPropertyProviderTest.java | 179 ++++++++++-
.../ambari/server/state/CheckHelperTest.java | 2 +
.../server/state/cluster/ClusterTest.java | 19 +-
.../topology/ClusterTopologyImplTest.java | 28 +-
.../server/upgrade/UpgradeCatalog240Test.java | 130 ++++++++
.../src/test/python/TestAmbariServer.py | 4 +-
.../configs/install_packages_config.json | 4 +-
.../stacks/2.0.6/configs/hbase_no_phx.json | 2 +-
.../stacks/2.0.6/configs/hbase_with_phx.json | 2 +-
.../python/stacks/2.3/configs/pxf_default.json | 2 +-
.../ams/single_host_component_metrics_h1.json | 21 ++
.../ams/single_host_component_metrics_h2.json | 22 ++
ambari-web/app/assets/test/tests.js | 43 +++
ambari-web/app/controllers/main/service/item.js | 176 ++++++-----
.../app/mixins/common/configs/configs_saver.js | 4 +
.../mixins/common/widgets/time_range_mixin.js | 32 +-
ambari-web/app/router.js | 3 +
ambari-web/app/utils/ajax/ajax.js | 6 +-
ambari-web/app/utils/ajax/ajax_queue.js | 29 +-
ambari-web/app/utils/helper.js | 2 +-
.../app/views/common/chart/linear_time.js | 18 +-
.../app/views/common/custom_date_popup.js | 7 +-
.../app/views/common/select_custom_date_view.js | 4 +-
ambari-web/app/views/main/service/item.js | 120 ++++----
ambari-web/package.json | 2 +-
ambari-web/test/controllers/application_test.js | 24 +-
.../global/background_operations_test.js | 19 +-
.../global/cluster_controller_test.js | 71 ++---
.../global/update_controller_test.js | 23 +-
.../global/user_settings_controller_test.js | 4 -
ambari-web/test/controllers/installer_test.js | 10 -
.../progress_controller_test.js | 11 +-
.../progress_popup_controller_test.js | 43 +--
.../resourceManager/step3_controller_test.js | 11 +-
.../controllers/main/admin/kerberos_test.js | 30 +-
.../admin/stack_and_upgrade_controller_test.js | 175 ++++-------
.../main/alert_definitions_controller_test.js | 9 +-
.../add_alert_definition_controller_test.js | 20 +-
.../alerts/alert_instances_controller_test.js | 21 +-
.../definitions_configs_controller_test.js | 10 +-
.../definitions_details_controller_test.js | 37 +--
...anage_alert_notifications_controller_test.js | 15 +-
.../controllers/main/charts/heatmap_test.js | 61 +---
.../dashboard/config_history_controller_test.js | 26 +-
.../main/host/add_controller_test.js | 42 ++-
.../test/controllers/main/host/details_test.js | 197 ++++++------
ambari-web/test/controllers/main/host_test.js | 14 +-
.../main/service/add_controller_test.js | 75 +----
.../main/service/info/config_test.js | 21 +-
.../main/service/info/summary_test.js | 107 +------
.../test/controllers/main/service/item_test.js | 27 +-
.../service/reassign/step1_controller_test.js | 27 +-
.../service/reassign/step4_controller_test.js | 201 ++++++-------
.../service/reassign/step6_controller_test.js | 24 +-
.../service/reassign/step7_controller_test.js | 53 ++--
.../test/controllers/main/service_test.js | 31 +-
.../controllers/main/views_controller_test.js | 9 +-
ambari-web/test/controllers/main_test.js | 25 +-
.../test/controllers/wizard/step2_test.js | 11 +-
.../test/controllers/wizard/step3_test.js | 95 ++----
.../test/controllers/wizard/step6_test.js | 9 -
.../test/controllers/wizard/step7_test.js | 18 +-
.../test/controllers/wizard/step8_test.js | 85 ++----
.../test/controllers/wizard/step9_test.js | 31 +-
ambari-web/test/controllers/wizard_test.js | 8 +-
ambari-web/test/helpers.js | 77 +++++
.../common/table_server_view_mixin_test.js | 1 +
.../test/mixins/common/widget_mixin_test.js | 91 +++---
.../common/widgets/export_metrics_mixin_test.js | 15 +-
.../common/widgets/time_range_mixin_test.js | 10 +-
.../host_components/decommissionable_test.js | 25 +-
.../host_components/install_component_test.js | 97 +++---
.../wizard/wizardProgressPageController_test.js | 24 +-
ambari-web/test/models/cluster_states_test.js | 2 -
ambari-web/test/models/host_test.js | 4 -
ambari-web/test/router_test.js | 40 +--
ambari-web/test/utils/ajax/ajax_queue_test.js | 8 -
ambari-web/test/utils/ajax/ajax_test.js | 17 +-
.../test/utils/batch_scheduled_requests_test.js | 71 -----
.../test/utils/host_progress_popup_test.js | 2 -
ambari-web/test/utils/updater_test.js | 149 +++++-----
.../test/views/common/chart/linear_time_test.js | 16 +-
.../common/configs/config_history_flow_test.js | 12 +-
.../test/views/common/controls_view_test.js | 9 +-
.../test/views/common/quick_link_view_test.js | 59 ++--
.../common/select_custom_date_view_test.js | 49 +++
.../common/widget/gauge_widget_view_test.js | 24 +-
.../common/widget/graph_widget_view_test.js | 12 +-
.../common/widget/number_widget_view_test.js | 24 +-
.../stack_upgrade/upgrade_group_view_test.js | 16 +-
.../stack_upgrade/upgrade_wizard_view_test.js | 107 ++++---
.../admin/stack_upgrade/version_view_test.js | 85 +++---
.../test/views/main/dashboard/widget_test.js | 11 +-
.../main/dashboard/widgets/namenode_cpu_test.js | 31 +-
.../test/views/main/dashboard/widgets_test.js | 18 +-
.../host_component_views/datanode_view_test.js | 15 +-
.../decommissionable_test.js | 28 +-
ambari-web/test/views/main/service/item_test.js | 16 +-
.../views/main/service/services/ranger_test.js | 10 -
194 files changed, 3023 insertions(+), 2076 deletions(-)
----------------------------------------------------------------------