ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [50/50] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
Date Tue, 26 Jan 2016 21:45:53 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/c7be26ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7be26ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7be26ad

Branch: refs/heads/branch-dev-patch-upgrade
Commit: c7be26ad659d35bc6bc57d3d022da7847a967184
Parents: abc961a 7bac2a1
Author: Nate Cole <ncole@hortonworks.com>
Authored: Tue Jan 26 16:44:49 2016 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Tue Jan 26 16:44:49 2016 -0500

----------------------------------------------------------------------
 KEYS                                            |  34 ++
 .../libraries/functions/ranger_functions.py     |  27 +-
 .../libraries/functions/ranger_functions_v2.py  |  30 +-
 ambari-server/conf/unix/ca.config               |   2 +-
 ambari-server/conf/windows/ca.config            |   2 +-
 .../server/actionmanager/ActionScheduler.java   |   2 +-
 .../resources/ResourceInstanceFactoryImpl.java  |   4 +
 .../api/services/AdminSettingService.java       | 148 ++++++
 .../server/checks/PreviousUpgradeCompleted.java |  40 +-
 .../server/configuration/Configuration.java     |  26 ++
 .../ambari/server/controller/AmbariServer.java  |   2 +
 .../server/controller/ControllerModule.java     |   2 +
 .../server/controller/KerberosHelperImpl.java   |  14 +-
 .../controller/ResourceProviderFactory.java     |   4 +
 .../AbstractControllerResourceProvider.java     |   2 +
 .../internal/AdminSettingResourceProvider.java  | 245 ++++++++++
 .../internal/DefaultProviderModule.java         |   4 +-
 .../internal/UpgradeResourceProvider.java       |  44 +-
 .../controller/jmx/JMXPropertyProvider.java     |  19 +-
 .../ThreadPoolEnabledPropertyProvider.java      |  40 +-
 .../metrics/timeline/AMSPropertyProvider.java   |  20 +-
 .../ambari/server/controller/spi/Resource.java  |  16 +-
 ...eredThreadPoolExecutorCompletionService.java |  98 ++++
 .../utilities/ScalingThreadPoolExecutor.java    |  48 ++
 .../ambari/server/orm/dao/AdminSettingDAO.java  | 100 ++++
 .../server/orm/entities/AdminSettingEntity.java | 149 ++++++
 .../authorization/RoleAuthorization.java        |   1 +
 .../security/ldap/AmbariLdapDataPopulator.java  |   1 +
 .../PrepareDisableKerberosServerAction.java     |  24 +
 .../server/state/cluster/ClusterImpl.java       |  17 +-
 .../AbstractKerberosDescriptorContainer.java    |  12 +
 .../state/kerberos/KerberosDescriptor.java      |  41 ++
 .../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 +
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql     |   2 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   2 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   2 +
 .../src/main/resources/META-INF/persistence.xml |   3 +-
 .../HAWQ/2.0.0/package/scripts/common.py        |  11 -
 .../2.0.0/package/scripts/hawq_constants.py     |   6 +-
 .../HAWQ/2.0.0/package/scripts/hawqsegment.py   |   1 -
 .../HAWQ/2.0.0/package/scripts/master_helper.py |  10 -
 .../HAWQ/2.0.0/package/scripts/params.py        |  28 ++
 .../HAWQ/2.0.0/package/scripts/service_check.py | 144 ++++--
 .../HAWQ/2.0.0/package/scripts/utils.py         |   6 +-
 .../2.0.0/package/templates/hawq-profile.sh.j2  |  27 --
 .../common-services/HDFS/2.1.0.2.0/alerts.json  | 464 +++++++++++++++++++
 .../package/alerts/alert_metrics_deviation.py   | 357 ++++++++++++++
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |   8 +-
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml |  16 +
 .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml |   5 -
 .../4.0.0.2.0/configuration/oozie-log4j.xml     |   5 +-
 .../4.2.0.2.3/configuration/oozie-site.xml      |  16 +
 .../common-services/PXF/3.0.0/kerberos.json     |   6 +-
 .../PXF/3.0.0/package/scripts/pxf.py            |  12 +-
 .../SPARK/1.2.0.2.2/package/scripts/params.py   |   1 +
 .../1.2.0.2.2/package/scripts/setup_spark.py    |  12 +-
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  24 +-
 .../stacks/HDP/2.1/services/stack_advisor.py    |  59 ++-
 .../services/HIVE/configuration/hive-site.xml   |  34 +-
 .../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 +-
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |   2 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |   5 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml     |   2 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml     |   3 +-
 .../stacks/HDP/2.4/role_command_order.json      |   8 +
 .../stacks/HDP/2.4/services/SPARK/metainfo.xml  |   1 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |  32 ++
 .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml     |   2 +-
 .../services/HIVE/configuration/hive-env.xml    |   6 +
 .../services/OOZIE/configuration/oozie-env.xml  |  11 -
 .../stacks/HDPWIN/2.1/services/stack_advisor.py |  14 +
 .../services/HIVE/configuration/hive-site.xml   |  31 +-
 .../stacks/HDPWIN/2.2/services/stack_advisor.py |  48 +-
 .../services/OOZIE/configuration/oozie-env.xml  |  11 -
 .../services/OOZIE/configuration/oozie-site.xml |  33 +-
 .../stacks/HDPWIN/2.3/services/stack_advisor.py |  19 +-
 .../KdcServerConnectionVerificationTest.java    |   8 +-
 .../api/services/AdminSettingServiceTest.java   | 101 ++++
 .../checks/PreviousUpgradeCompletedTest.java    | 220 +++++++++
 .../server/configuration/ConfigurationTest.java |  15 +
 .../AmbariManagementControllerImplTest.java     |  18 +-
 .../AmbariManagementControllerTest.java         |   5 +-
 .../AdminSettingResourceProviderTest.java       | 345 ++++++++++++++
 .../StackDefinedPropertyProviderTest.java       |   4 +
 .../metrics/JMXPropertyProviderTest.java        |  12 +
 .../RestMetricsPropertyProviderTest.java        |   4 +
 ...ThreadPoolExecutorCompletionServiceTest.java | 188 ++++++++
 .../server/orm/dao/AdminSettingDAOTest.java     |  89 ++++
 .../orm/entities/AdminSettingEntityTest.java    |  91 ++++
 .../state/kerberos/KerberosDescriptorTest.java  |   9 +-
 .../stacks/2.1/common/test_stack_advisor.py     | 102 +++-
 .../stacks/2.2/SPARK/test_job_history_server.py |  14 +
 .../stacks/2.2/SPARK/test_spark_client.py       |  14 +
 .../stacks/2.2/common/test_stack_advisor.py     |  10 +-
 .../2.3/SPARK/test_spark_thrift_server.py       |   7 +
 .../src/test/resources/log4j.properties         |   4 +-
 ambari-web/app/assets/test/tests.js             |   1 +
 ambari-web/app/controllers.js                   |   7 +
 .../global/user_settings_controller.js          |  23 +-
 .../hawq/addStandby/step1_controller.js         |  24 +
 .../hawq/addStandby/step2_controller.js         |  35 ++
 .../hawq/addStandby/step3_controller.js         | 146 ++++++
 .../hawq/addStandby/step4_controller.js         |  90 ++++
 .../hawq/addStandby/wizard_controller.js        | 129 ++++++
 .../main/admin/highAvailability_controller.js   |   9 +
 .../main/admin/service_auto_start.js            |  30 ++
 .../alerts/definition_configs_controller.js     |  12 +-
 .../main/host/bulk_operations_controller.js     |  24 +
 .../controllers/main/host/combo_search_box.js   | 130 ++++++
 .../controllers/main/service/info/configs.js    |  17 -
 ambari-web/app/controllers/main/service/item.js |  69 +--
 .../service/widgets/create/step2_controller.js  |   4 +-
 ambari-web/app/controllers/wizard.js            |   2 +
 .../app/controllers/wizard/step0_controller.js  |   5 +
 .../app/controllers/wizard/step3_controller.js  |   6 +-
 .../app/controllers/wizard/step4_controller.js  |   5 +
 .../app/controllers/wizard/step6_controller.js  |  14 +-
 .../app/controllers/wizard/step7_controller.js  |  18 +-
 .../app/data/HDP2.3/hawq_ha_properties.js       |  43 ++
 ambari-web/app/data/HDP2/ui_properties.js       |  22 +-
 ambari-web/app/data/controller_route.js         |   4 +
 ambari-web/app/data/db_properties_info.js       |   6 +-
 .../app/mappers/alert_definitions_mapper.js     |  24 +-
 ambari-web/app/messages.js                      |  42 +-
 .../mixins/common/widgets/time_range_mixin.js   |   2 +-
 .../app/mixins/common/widgets/widget_mixin.js   |  11 +-
 .../app/mixins/common/widgets/widget_section.js |   2 +-
 .../mixins/wizard/assign_master_components.js   |   8 +-
 .../wizard/wizardProgressPageController.js      |  54 ++-
 ambari-web/app/models/alerts/alert_config.js    |  20 +-
 .../app/models/alerts/alert_definition.js       |  32 +-
 ambari-web/app/models/cluster_states.js         |   2 +
 .../configs/objects/service_config_property.js  |  14 +-
 ambari-web/app/models/host_component.js         |   8 +
 ambari-web/app/models/service.js                |   3 +-
 ambari-web/app/router.js                        |   1 +
 .../app/routes/add_hawq_standby_routes.js       | 203 ++++++++
 ambari-web/app/routes/add_service_routes.js     |   5 +-
 ambari-web/app/routes/installer.js              |  80 ++--
 ambari-web/app/routes/main.js                   |  11 +
 ambari-web/app/styles/application.less          |   6 +
 .../highAvailability/hawq/addStandby/step1.hbs  |  28 ++
 .../highAvailability/hawq/addStandby/step3.hbs  |  58 +++
 .../highAvailability/hawq/addStandby/step4.hbs  |  18 +
 .../highAvailability/hawq/addStandby/wizard.hbs |  45 ++
 .../templates/main/admin/service_auto_start.hbs |  32 ++
 ambari-web/app/templates/main/host.hbs          |   2 +-
 ambari-web/app/utils/ajax/ajax.js               |  20 -
 .../app/utils/configs/config_initializer.js     |   2 -
 ambari-web/app/utils/configs/database.js        |   6 +-
 .../utils/configs/hawq_ha_config_initializer.js |  52 +++
 ambari-web/app/utils/db.js                      |   1 +
 ambari-web/app/views.js                         |   6 +
 .../app/views/common/chart/linear_time.js       |  49 +-
 .../views/common/configs/config_history_flow.js |   8 +
 ambari-web/app/views/common/controls_view.js    |  52 +--
 .../app/views/common/quick_view_link_view.js    |   3 +
 ambari-web/app/views/main/admin.js              |   7 +
 .../hawq/addStandby/step1_view.js               |  26 ++
 .../hawq/addStandby/step2_view.js               |  28 ++
 .../hawq/addStandby/step3_view.js               |  29 ++
 .../hawq/addStandby/step4_view.js               |  36 ++
 .../hawq/addStandby/wizard_view.js              |  74 +++
 .../app/views/main/admin/service_auto_start.js  |  28 ++
 .../app/views/main/host/combo_search_box.js     | 107 +----
 .../views/main/host/hosts_table_menu_view.js    |   7 +
 ambari-web/app/views/main/menu.js               |   9 +-
 .../app/views/main/service/info/summary.js      |   9 +-
 ambari-web/app/views/main/service/item.js       |   3 +
 ambari-web/app/views/wizard/step10_view.js      |   3 +-
 ambari-web/app/views/wizard/step3_view.js       |   1 -
 ambari-web/app/views/wizard/step4_view.js       |   3 +-
 ambari-web/app/views/wizard/step7_view.js       |   1 -
 ambari-web/app/views/wizard/step8_view.js       |   1 -
 ambari-web/app/views/wizard/step9_view.js       |   1 -
 .../hawq/addStandby/step3_controller_test.js    | 189 ++++++++
 .../definitions_configs_controller_test.js      |   7 +-
 .../host/bulk_operations_controller_test.js     |  10 +
 .../test/controllers/main/service/item_test.js  |  63 ++-
 ambari-web/test/controllers/main_test.js        |   2 +-
 .../test/controllers/wizard/step0_test.js       |  13 +-
 .../test/controllers/wizard/step3_test.js       |  15 +
 .../test/controllers/wizard/step4_test.js       |  21 +
 .../test/controllers/wizard/step5_test.js       |  20 +
 .../test/controllers/wizard/step7_test.js       |  37 +-
 .../test/mixins/common/widget_mixin_test.js     |   2 +-
 .../utils/configs/config_initializer_test.js    |  30 +-
 .../test/views/common/chart/linear_time_test.js |  70 ++-
 .../test/views/common/controls_view_test.js     |  56 ---
 .../test/views/common/quick_link_view_test.js   |  94 +++-
 .../views/main/service/info/summary_test.js     |  56 +++
 ambari-web/test/views/wizard/step4_view_test.js |   2 +-
 ambari-web/test/views/wizard/step7_view_test.js |   4 +-
 .../view/filebrowser/PropertyValidator.java     |  10 +-
 .../view/filebrowser/PropertyValidatorTest.java |  75 +++
 .../ambari/view/hive/PropertyValidator.java     |  28 +-
 .../ui/hive-web/app/controllers/tez-ui.js       |   2 +-
 .../ui/hive-web/tests/helpers/api-mock.js       |   5 +-
 .../ambari/view/pig/PropertyValidator.java      |  26 +-
 contrib/views/utils/pom.xml                     |   5 +
 .../view/utils/ambari/ValidatorUtils.java       |  46 ++
 206 files changed, 6093 insertions(+), 934 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c7be26ad/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7be26ad/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7be26ad/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7be26ad/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7be26ad/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7be26ad/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7be26ad/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7be26ad/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------


Mime
View raw message