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/1b46747d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1b46747d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1b46747d Branch: refs/heads/trunk Commit: 1b46747d433672c1dc15e79548bbec76f1f0ad78 Parents: 99c8216 b89b9e1 Author: Nate Cole <[email protected]> Authored: Tue Nov 1 09:55:29 2016 -0400 Committer: Nate Cole <[email protected]> Committed: Tue Nov 1 09:55:29 2016 -0400 ---------------------------------------------------------------------- .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../AmbariCustomCommandExecutionHelper.java | 10 + .../orm/entities/ServiceDesiredStateEntity.java | 22 -- .../ambari/server/state/SecurityType.java | 7 + .../org/apache/ambari/server/state/Service.java | 31 -- .../apache/ambari/server/state/ServiceImpl.java | 95 ----- .../ambari/server/state/UpgradeContext.java | 3 +- .../ambari/server/state/UpgradeHelper.java | 8 +- .../state/stack/upgrade/ClusterGrouping.java | 36 +- .../server/state/stack/upgrade/Condition.java | 47 +++ .../stack/upgrade/ConfigurationCondition.java | 116 ++++++ .../server/state/stack/upgrade/Grouping.java | 17 + .../state/stack/upgrade/SecurityCondition.java | 64 ++++ .../server/upgrade/AbstractUpgradeCatalog.java | 29 +- .../server/upgrade/UpgradeCatalog242.java | 17 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 2 - .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 - .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 - .../resources/Ambari-DDL-Postgres-CREATE.sql | 2 - .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 - .../resources/Ambari-DDL-SQLServer-CREATE.sql | 2 - .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 2 +- .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../GLUSTERFS/configuration/hadoop-env.xml | 2 +- .../GLUSTERFS/configuration/hadoop-env.xml | 2 +- .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 4 +- .../services/HDFS/configuration/hadoop-env.xml | 4 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 4 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 4 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.4.xml | 4 +- .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 2 +- .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 2 +- .../stacks/HDP/2.2/upgrades/upgrade-2.4.xml | 2 +- .../GLUSTERFS/configuration/hadoop-env.xml | 2 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 4 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 4 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 8 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 8 +- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 2 +- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 2 +- .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 6 +- .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 6 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 4 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 8 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 8 +- .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 2 +- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 6 +- .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 6 +- .../stacks/HDP/2.5/services/SPARK/metainfo.xml | 2 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 7 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 7 +- .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 5 +- .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 5 +- .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 7 +- .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 5 +- .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../src/main/resources/upgrade-pack.xsd | 54 ++- .../ambari/server/state/UpgradeHelperTest.java | 65 +++- .../stack/upgrade/StageWrapperBuilderTest.java | 8 +- .../upgrade/AbstractUpgradeCatalogTest.java | 43 +-- .../server/upgrade/UpgradeCatalog242Test.java | 1 + .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../HDP/2.1.1/upgrades/upgrade_direction.xml | 6 +- .../upgrades/upgrade_nonrolling_new_stack.xml | 4 +- .../stacks/HDP/2.1.1/upgrades/upgrade_test.xml | 2 +- .../HDP/2.1.1/upgrades/upgrade_test_checks.xml | 2 +- .../2.1.1/upgrades/upgrade_test_nonrolling.xml | 4 +- .../HDP/2.1.1/upgrades/upgrade_test_partial.xml | 2 +- .../HDP/2.1.1/upgrades/upgrade_to_new_stack.xml | 2 +- .../stacks/HDP/2.2.0/upgrades/upgrade_test.xml | 2 +- .../HDP/2.2.0/upgrades/upgrade_test_15388.xml | 2 +- .../HDP/2.2.0/upgrades/upgrade_test_checks.xml | 2 +- .../2.2.0/upgrades/upgrade_test_conditions.xml | 62 ++++ .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../services/HDFS/configuration/hadoop-env.xml | 4 +- .../HDP/2.2.0/upgrades/upgrade_test_15388.xml | 4 +- .../app/controllers/global/update_controller.js | 4 +- .../nameNode/step3_controller.js | 105 ++++++ .../nameNode/step5_controller.js | 14 + .../nameNode/step7_controller.js | 17 +- .../nameNode/step9_controller.js | 166 ++++++++- .../nameNode/wizard_controller.js | 8 +- ambari-web/app/data/HDP2/ha_properties.js | 195 +++++++++- ambari-web/app/messages.js | 18 +- .../app/routes/high_availability_routes.js | 3 + ambari-web/app/styles/application.less | 40 +- .../common/assign_master_components.hbs | 223 +++++------ .../configs/widgets/plain_config_text_field.hbs | 2 +- .../configs/widgets/slider_config_widget.hbs | 2 +- .../app/templates/common/editable_list.hbs | 2 +- .../app/templates/common/filter_combobox.hbs | 2 +- .../common/modal_popups/prompt_popup.hbs | 2 +- ambari-web/app/templates/common/progress.hbs | 95 ++--- ambari-web/app/templates/installer.hbs | 5 +- .../hawq/activateStandby/step1.hbs | 12 +- .../hawq/activateStandby/step2.hbs | 52 +-- .../hawq/activateStandby/wizard.hbs | 2 - .../highAvailability/hawq/addStandby/step1.hbs | 12 +- .../highAvailability/hawq/addStandby/step3.hbs | 71 ++-- .../highAvailability/hawq/addStandby/wizard.hbs | 2 - .../hawq/removeStandby/step1.hbs | 12 +- .../hawq/removeStandby/step2.hbs | 46 +-- .../hawq/removeStandby/wizard.hbs | 2 - .../highAvailability/journalNode/step1.hbs | 10 +- .../highAvailability/journalNode/step2.hbs | 37 +- .../highAvailability/journalNode/step3.hbs | 31 +- .../highAvailability/journalNode/step5.hbs | 20 +- .../highAvailability/journalNode/wizard.hbs | 4 +- .../nameNode/rollbackHA/rollback_wizard.hbs | 4 +- .../nameNode/rollbackHA/step1.hbs | 22 +- .../nameNode/rollbackHA/step2.hbs | 6 +- .../nameNode/rollbackHA/step3.hbs | 7 +- .../admin/highAvailability/nameNode/step1.hbs | 31 +- .../admin/highAvailability/nameNode/step3.hbs | 121 +++--- .../admin/highAvailability/nameNode/step4.hbs | 10 +- .../admin/highAvailability/nameNode/step6.hbs | 6 +- .../admin/highAvailability/nameNode/step8.hbs | 6 +- .../admin/highAvailability/nameNode/wizard.hbs | 4 +- .../highAvailability/rangerAdmin/step1.hbs | 36 +- .../highAvailability/rangerAdmin/step3.hbs | 68 ++-- .../highAvailability/rangerAdmin/wizard.hbs | 4 +- .../highAvailability/resourceManager/step1.hbs | 12 +- .../highAvailability/resourceManager/step3.hbs | 46 +-- .../highAvailability/resourceManager/wizard.hbs | 2 - .../app/templates/main/admin/kerberos/step1.hbs | 63 ++-- .../app/templates/main/admin/kerberos/step2.hbs | 24 +- .../app/templates/main/admin/kerberos/step3.hbs | 117 +++--- .../app/templates/main/admin/kerberos/step4.hbs | 19 +- .../app/templates/main/admin/kerberos/step5.hbs | 40 +- .../templates/main/admin/kerberos/wizard.hbs | 4 +- .../main/admin/stack_upgrade/services.hbs | 2 +- .../upgrade_configs_merge_table.hbs | 10 +- .../add_alert_definition.hbs | 4 +- .../main/alerts/add_alert_definition/step1.hbs | 26 +- .../main/alerts/add_alert_definition/step2.hbs | 21 +- .../main/alerts/add_alert_definition/step3.hbs | 29 +- .../main/alerts/definition_details.hbs | 2 +- .../main/dashboard/edit_widget_popup.hbs | 4 +- .../edit_widget_popup_single_threshold.hbs | 2 +- ambari-web/app/templates/main/host/add.hbs | 2 - .../app/templates/main/host/rack_id_popup.hbs | 2 +- ambari-web/app/templates/main/service/add.hbs | 4 +- .../service/info/confirm_delete_service.hbs | 2 +- .../app/templates/main/service/reassign.hbs | 12 +- .../main/service/widgets/create/step1.hbs | 40 +- .../main/service/widgets/create/step2.hbs | 35 +- .../main/service/widgets/create/step2_graph.hbs | 50 +-- .../service/widgets/create/step2_number.hbs | 24 +- .../service/widgets/create/step2_template.hbs | 56 +-- .../main/service/widgets/create/step3.hbs | 82 +++-- .../create/widget_property_threshold.hbs | 4 +- .../main/service/widgets/create/wizard.hbs | 4 +- .../app/templates/main/service/widgets/edit.hbs | 4 +- ambari-web/app/templates/wizard/step0.hbs | 52 +-- ambari-web/app/templates/wizard/step1.hbs | 365 ++++++++++--------- ambari-web/app/templates/wizard/step10.hbs | 61 ++-- .../wizard/step1_addLocalRepository.hbs | 2 +- ambari-web/app/templates/wizard/step2.hbs | 237 ++++++------ ambari-web/app/templates/wizard/step3.hbs | 238 ++++++------ ambari-web/app/templates/wizard/step4.hbs | 79 ++-- ambari-web/app/templates/wizard/step6.hbs | 137 +++---- ambari-web/app/templates/wizard/step7.hbs | 24 +- ambari-web/app/templates/wizard/step8.hbs | 106 +++--- ambari-web/app/templates/wizard/step9.hbs | 209 ++++++----- ambari-web/app/utils/ajax/ajax.js | 11 + .../utils/configs/nn_ha_config_initializer.js | 30 +- ambari-web/app/utils/validator.js | 2 +- .../configs/selectable_popup_body_view.js | 2 +- ambari-web/app/views/common/filter_view.js | 3 +- .../common/host_progress_popup_body_view.js | 2 +- ambari-web/app/views/common/table_view.js | 3 +- ambari-web/app/views/main/service/service.js | 2 +- ambari-web/app/views/wizard/step1_view.js | 4 + ambari-web/app/views/wizard/step3_view.js | 3 + ambari-web/karma.conf.js | 4 +- ambari-web/package.json | 2 +- .../nameNode/step3_controller_test.js | 24 +- ambari-web/test/utils/validator_test.js | 3 +- .../test/views/common/filter_view_test.js | 5 + .../test/views/common/quick_link_view_test.js | 2 +- contrib/docs/Apache_Ambari_Stack_Definition.pdf | Bin 0 -> 926535 bytes .../resources/ui/app/components/hdfs-browser.js | 3 +- .../app/templates/components/hdfs-browser.hbs | 2 +- 184 files changed, 2921 insertions(+), 1926 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1b46747d/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/Grouping.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1b46747d/ambari-server/src/main/resources/upgrade-pack.xsd ----------------------------------------------------------------------
