Merge branch 'trunk' into branch-feature-AMBARI-20053
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8e2df21 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8e2df21 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8e2df21 Branch: refs/heads/branch-feature-AMBARI-20053 Commit: e8e2df21f7fe91fa8a028bb3043bed831093a090 Parents: f4638d2 a5dc2d2 Author: Jonathan Hurley <[email protected]> Authored: Fri Feb 17 16:29:16 2017 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Fri Feb 17 16:29:16 2017 -0500 ---------------------------------------------------------------------- .../libraries/functions/constants.py | 2 + .../functions/setup_ranger_plugin_xml.py | 23 +- .../actionmanager/ActionDBAccessorImpl.java | 108 ++-- .../server/actionmanager/ActionScheduler.java | 31 + .../ambari/server/actionmanager/Request.java | 8 +- .../ambari/server/actionmanager/Stage.java | 25 + .../checks/DatabaseConsistencyCheckHelper.java | 19 + .../AmbariCustomCommandExecutionHelper.java | 8 + .../controller/internal/CalculatedStatus.java | 390 +++++++++++- .../ambari/server/events/TaskCreateEvent.java | 48 ++ .../apache/ambari/server/events/TaskEvent.java | 66 ++ .../ambari/server/events/TaskUpdateEvent.java | 35 ++ .../listeners/tasks/TaskStatusListener.java | 609 +++++++++++++++++++ .../events/publishers/TaskEventPublisher.java | 62 ++ .../server/orm/dao/HostRoleCommandDAO.java | 67 +- .../ambari/server/orm/dao/RequestDAO.java | 8 + .../apache/ambari/server/orm/dao/StageDAO.java | 32 +- .../orm/entities/HostRoleCommandEntity.java | 4 +- .../server/orm/entities/RequestEntity.java | 49 +- .../ambari/server/orm/entities/StageEntity.java | 70 ++- .../server/orm/entities/StageEntityPK.java | 12 + .../ambari/server/state/ConfigHelper.java | 2 + .../ambari/server/topology/HostRequest.java | 2 +- .../server/upgrade/UpgradeCatalog300.java | 70 +++ .../main/resources/Ambari-DDL-Derby-CREATE.sql | 7 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 7 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 7 +- .../resources/Ambari-DDL-Postgres-CREATE.sql | 7 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 7 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 7 +- .../RANGER/0.4.0/package/scripts/params.py | 18 + .../0.4.0/package/scripts/setup_ranger_xml.py | 67 +- .../0.5.0/configuration/ranger-admin-site.xml | 12 + .../0.7.0/configuration/ranger-admin-site.xml | 31 + .../0.5.0.2.3/configuration/kms-env.xml | 10 + .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 51 +- .../0.5.0.2.3/package/scripts/params.py | 10 + .../HDP/2.0.6/configuration/cluster-env.xml | 11 + .../HDP/2.0.6/properties/stack_features.json | 10 + .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 7 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 4 + .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 7 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 4 + .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 7 + .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 13 +- .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 + .../configuration/ranger-kms-site.xml | 68 +++ .../stacks/HDP/2.6/services/stack_advisor.py | 20 +- .../actionmanager/TestActionDBAccessorImpl.java | 3 +- .../actionmanager/TestActionScheduler.java | 71 ++- .../alerts/AmbariPerformanceRunnableTest.java | 7 +- .../internal/UpgradeResourceProviderTest.java | 1 - .../UpgradeSummaryResourceProviderTest.java | 1 - .../listeners/tasks/TaskStatusListenerTest.java | 164 +++++ .../ambari/server/state/ConfigHelperTest.java | 2 + .../cluster/ClusterEffectiveVersionTest.java | 5 +- .../services/RetryUpgradeActionServiceTest.java | 1 - .../server/upgrade/UpgradeCatalog300Test.java | 20 + .../stacks/2.3/ATLAS/test_metadata_server.py | 6 +- .../stacks/2.5/RANGER/test_ranger_admin.py | 16 +- .../stacks/2.5/RANGER/test_ranger_usersync.py | 8 +- .../stacks/2.5/RANGER_KMS/test_kms_server.py | 70 ++- .../stacks/2.6/RANGER/test_ranger_admin.py | 40 +- .../stacks/2.6/RANGER/test_ranger_tagsync.py | 19 +- .../stacks/2.6/common/test_stack_advisor.py | 69 +++ .../2.6/configs/ranger-admin-default.json | 6 +- ambari-web/app/assets/test/tests.js | 1 + .../controllers/main/service/info/configs.js | 35 +- ambari-web/app/data/dashboard_widgets.js | 196 ++++++ ambari-web/app/messages.js | 2 +- .../app/mixins/common/track_request_mixin.js | 11 +- .../mixins/main/dashboard/widgets/editable.js | 91 +-- .../dashboard/widgets/editable_with_limit.js | 106 +--- .../widgets/single_numeric_threshold.js | 127 +--- .../common/configs/service_config_category.hbs | 4 +- .../main/dashboard/edit_widget_popup.hbs | 20 +- .../edit_widget_popup_single_threshold.hbs | 12 +- ambari-web/app/views.js | 1 + .../app/views/common/configs/controls_view.js | 2 +- .../modal_popups/edit_dashboard_widget_popup.js | 436 +++++++++++++ ambari-web/app/views/main/dashboard/widget.js | 173 ++---- ambari-web/app/views/main/dashboard/widgets.js | 266 +------- .../views/main/dashboard/widgets/text_widget.js | 23 +- .../app/views/main/host/combo_search_box.js | 1 + .../main/service/info/config_test.js | 45 ++ .../edit_dashboard_widget_popup_test.js | 214 +++++++ .../test/views/main/dashboard/widget_test.js | 112 +--- .../test/views/main/dashboard/widgets_test.js | 10 +- .../views/main/host/combo_search_box_test.js | 6 +- docs/pom.xml | 34 +- 92 files changed, 3577 insertions(+), 1005 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e2df21/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql ----------------------------------------------------------------------
