Merge branch 'trunk' into branch-feature-AMBARI-18634
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f9814d2b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f9814d2b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f9814d2b Branch: refs/heads/branch-feature-AMBARI-18634 Commit: f9814d2bfb4c77740da38223305c4c570dba8221 Parents: cfe738d 43a181a Author: Nate Cole <[email protected]> Authored: Thu Nov 3 11:25:51 2016 -0400 Committer: Nate Cole <[email protected]> Committed: Thu Nov 3 11:25:51 2016 -0400 ---------------------------------------------------------------------- ambari-agent/conf/unix/ambari-agent | 12 +- ambari-agent/conf/unix/ambari-agent.ini | 1 - ambari-agent/conf/windows/service_wrapper.py | 1 + .../src/main/python/ambari_agent/ActionQueue.py | 34 +- .../main/python/ambari_agent/AmbariConfig.py | 44 +- .../src/main/python/ambari_agent/Controller.py | 10 - .../src/main/python/ambari_agent/Facter.py | 21 +- .../src/main/python/ambari_agent/Hardware.py | 8 +- .../src/main/python/ambari_agent/Heartbeat.py | 5 +- .../ambari_agent/PythonReflectiveExecutor.py | 20 +- .../src/main/python/ambari_agent/Register.py | 2 +- .../ambari_agent/StatusCommandsExecutor.py | 90 -- .../src/main/python/ambari_agent/main.py | 49 +- .../test/python/ambari_agent/TestActionQueue.py | 76 +- .../test/python/ambari_agent/TestCheckWebUI.py | 2 + .../test/python/ambari_agent/TestController.py | 1 - .../test/python/ambari_agent/TestHardware.py | 30 +- .../src/test/python/ambari_agent/TestMain.py | 7 +- .../libraries/script/dummy.py | 106 ++ .../ambari/server/api/GsonJsonProvider.java | 12 +- .../checks/DatabaseConsistencyChecker.java | 12 +- .../ambari/server/controller/AmbariServer.java | 2 + .../server/controller/ServiceRequest.java | 32 +- .../server/controller/ServiceResponse.java | 47 +- .../server/controller/StackServiceRequest.java | 46 +- .../server/controller/StackServiceResponse.java | 51 + .../internal/ServiceResourceProvider.java | 78 +- .../internal/StackServiceResourceProvider.java | 16 +- .../server/state/CredentialStoreInfo.java | 96 ++ .../apache/ambari/server/state/ServiceImpl.java | 5 +- .../apache/ambari/server/state/ServiceInfo.java | 85 +- .../server/upgrade/UpgradeCatalog242.java | 17 + .../server/upgrade/UpgradeCatalog250.java | 17 - .../src/main/python/ambari_server/utils.py | 5 +- .../LOGSEARCH/0.5.0/metainfo.xml | 2 +- .../common-services/SPARK2/2.0.0/metainfo.xml | 1 + .../2.0.0/package/scripts/spark_service.py | 9 +- .../src/main/resources/properties.json | 4 + .../main/resources/scripts/Ambaripreupload.py | 19 +- .../src/main/resources/scripts/stack_advisor.py | 11 +- .../HDP/2.0.6/configuration/cluster-env.xml | 10 + .../stacks/HDP/2.0.6/services/stack_advisor.py | 50 +- .../stacks/HDP/2.1/services/stack_advisor.py | 20 +- .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 963 ------------ .../main/resources/stacks/HDP/2.2/metainfo.xml | 2 +- .../stacks/HDP/2.2/services/stack_advisor.py | 7 + .../stacks/HDP/2.2/upgrades/config-upgrade.xml | 1099 -------------- .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 891 ----------- .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 1289 ---------------- .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 1395 ------------------ .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 709 --------- .../PERF/1.0/configuration/cluster-env.xml | 75 + .../1.0/hooks/after-INSTALL/scripts/hook.py | 28 + .../PERF/1.0/hooks/before-ANY/scripts/hook.py | 28 + .../1.0/hooks/before-INSTALL/scripts/hook.py | 28 + .../1.0/hooks/before-RESTART/scripts/hook.py | 28 + .../PERF/1.0/hooks/before-START/scripts/hook.py | 28 + .../main/resources/stacks/PERF/1.0/metainfo.xml | 22 + .../PERF/1.0/properties/stack_features.json | 14 + .../stacks/PERF/1.0/properties/stack_tools.json | 4 + .../stacks/PERF/1.0/repos/repoinfo.xml | 27 + .../stacks/PERF/1.0/role_command_order.json | 8 + .../services/HAPPY/configuration/happy-site.xml | 36 + .../stacks/PERF/1.0/services/HAPPY/metainfo.xml | 57 + .../1.0/services/HAPPY/package/scripts/dwarf.py | 38 + .../HAPPY/package/scripts/service_check.py | 30 + .../PERF/1.0/services/HAPPY/themes/theme.json | 65 + .../services/SNOW/configuration/snow-site.xml | 36 + .../stacks/PERF/1.0/services/SNOW/metainfo.xml | 57 + .../SNOW/package/scripts/service_check.py | 30 + .../services/SNOW/package/scripts/snow_white.py | 38 + .../PERF/1.0/services/SNOW/themes/theme.json | 65 + .../src/main/resources/stacks/stack_advisor.py | 200 ++- .../internal/ServiceResourceProviderTest.java | 45 +- .../ambari/server/state/ServiceInfoTest.java | 224 +++ .../server/upgrade/UpgradeCatalog242Test.java | 90 +- .../server/upgrade/UpgradeCatalog250Test.java | 92 -- ambari-server/src/test/python/TestUtils.py | 4 +- .../stacks/2.0.6/common/test_stack_advisor.py | 34 +- .../stacks/2.1/common/test_stack_advisor.py | 5 + .../stacks/2.2/common/test_stack_advisor.py | 20 +- .../test/python/stacks/test_stack_adviser.py | 239 +++ ambari-web/app/controllers.js | 2 + .../global/background_operations_controller.js | 4 +- .../app/controllers/global/update_controller.js | 4 +- .../journalNode/step1_controller.js | 51 +- .../journalNode/step2_controller.js | 19 +- .../journalNode/step4_controller.js | 28 +- .../journalNode/step6_controller.js | 12 +- .../journalNode/step7_controller.js | 30 + .../journalNode/step8_controller.js | 35 + .../journalNode/wizard_controller.js | 64 +- .../main/admin/stack_and_upgrade_controller.js | 48 +- ambari-web/app/controllers/main/host.js | 3 +- ambari-web/app/controllers/wizard.js | 14 +- .../app/controllers/wizard/step4_controller.js | 2 +- .../app/controllers/wizard/step7_controller.js | 16 - .../app/controllers/wizard/step8_controller.js | 2 +- ambari-web/app/mappers/stack_service_mapper.js | 7 +- ambari-web/app/messages.js | 47 +- ambari-web/app/mixins.js | 1 - ambari-web/app/models/stack_service.js | 8 +- .../app/routes/manage_journalnode_routes.js | 55 +- ambari-web/app/styles/application.less | 16 +- ambari-web/app/styles/log_file_search.less | 4 +- ambari-web/app/styles/modal_popups.less | 1 + .../app/styles/theme/bootstrap-ambari.css | 17 +- .../templates/common/host_progress_popup.hbs | 10 +- .../app/templates/common/log_file_search.hbs | 2 +- ambari-web/app/templates/common/modal_popup.hbs | 6 +- .../common/modal_popups/log_tail_popup.hbs | 12 +- .../common/modal_popups/logs_popup.hbs | 2 +- .../highAvailability/journalNode/step2.hbs | 33 +- .../highAvailability/journalNode/step7.hbs | 24 + .../highAvailability/journalNode/step8.hbs | 18 + .../highAvailability/journalNode/wizard.hbs | 3 + .../upgrade_configs_merge_table.hbs | 2 +- .../admin/stack_upgrade/upgrade_options.hbs | 110 +- .../main/admin/stack_upgrade/upgrade_task.hbs | 4 +- .../main/admin/stack_upgrade/versions.hbs | 2 +- ambari-web/app/templates/main/host/logs.hbs | 2 +- ambari-web/app/templates/wizard/step4.hbs | 2 +- .../wizard/step9/step9HostTasksLogPopup.hbs | 8 +- ambari-web/app/utils/config.js | 21 - .../app/utils/configs/config_initializer.js | 28 +- .../mount_points_based_initializer_mixin.js | 340 ----- ambari-web/app/utils/helper.js | 3 +- ambari-web/app/views.js | 3 + .../common/host_progress_popup_body_view.js | 88 +- ambari-web/app/views/common/modal_popup.js | 4 +- .../views/common/modal_popups/log_tail_popup.js | 6 +- .../app/views/common/not-scrollable-textarea.js | 44 + .../highAvailability/journalNode/step2_view.js | 12 +- .../highAvailability/journalNode/step3_view.js | 4 +- .../highAvailability/journalNode/step5_view.js | 5 +- .../highAvailability/journalNode/step7_view.js | 31 + .../highAvailability/journalNode/step8_view.js | 29 + .../highAvailability/journalNode/wizard_view.js | 24 +- .../views/wizard/step9/hostLogPopupBody_view.js | 42 +- ambari-web/pom.xml | 10 +- .../admin/stack_and_upgrade_controller_test.js | 34 +- .../test/controllers/wizard/step8_test.js | 10 +- ambari-web/test/controllers/wizard_test.js | 88 +- ambari-web/test/utils/ajax/ajax_test.js | 9 +- .../utils/configs/config_initializer_test.js | 476 ------ .../host_progress_popup_body_view_test.js | 2 +- ambari-web/test/views/wizard/step3_view_test.js | 4 + .../src/main/resources/ui/app/app.js | 22 + .../ui/app/components/labelCapacityBar.js | 7 +- .../resources/ui/app/components/queueMapping.js | 1 + .../ui/app/components/sunburstChart.js | 27 +- .../resources/ui/app/controllers/advanced.js | 15 + .../resources/ui/app/controllers/capsched.js | 39 +- .../resources/ui/app/controllers/editqueue.js | 3 + .../resources/ui/app/controllers/queuesconf.js | 25 + .../resources/ui/app/controllers/scheduler.js | 15 + .../src/main/resources/ui/app/models/queue.js | 3 +- .../src/main/resources/ui/app/router.js | 38 +- .../resources/ui/app/styles/application.less | 7 +- .../ui/app/templates/capsched/advanced.hbs | 7 +- .../templates/capsched/partials/preemption.hbs | 2 + .../templates/components/editLabelCapacity.hbs | 4 +- .../app/templates/components/queueMapping.hbs | 12 + .../ambari/view/hive2/ConnectionFactory.java | 19 +- .../ambari/view/hive2/ConnectionSystem.java | 18 +- .../ambari/view/hive2/actor/JdbcConnector.java | 6 +- .../view/hive2/client/AsyncJobRunner.java | 1 - .../view/hive2/client/AsyncJobRunnerImpl.java | 13 +- .../view/hive2/client/ConnectionConfig.java | 7 +- .../ambari/view/hive2/internal/Connectable.java | 6 + .../hive2/internal/HiveConnectionWrapper.java | 18 + .../resources/browser/ConnectionService.java | 155 ++ .../resources/browser/HiveBrowserService.java | 4 +- .../view/hive2/resources/jobs/JobService.java | 31 +- .../app/controllers/index/history-query/logs.js | 22 +- .../ui/hive-web/app/controllers/splash.js | 35 +- .../ui/hive-web/app/initializers/i18n.js | 1 + .../resources/ui/hive-web/app/routes/splash.js | 52 +- .../resources/ui/hive-web/app/services/ldap.js | 59 + .../ui/hive-web/app/utils/constants.js | 1 + .../views/hive-next/src/main/resources/view.xml | 15 + .../ui/app/components/search-create-new-bar.js | 3 +- 182 files changed, 3954 insertions(+), 8002 deletions(-) ----------------------------------------------------------------------
