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 2017/04/27 20:19:56 UTC
[09/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/863d995c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/863d995c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/863d995c
Branch: refs/heads/trunk
Commit: 863d995c1a7363b33e17b8e4d14970d09855a6bf
Parents: 83f54c2 95233eb
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Nov 14 13:27:01 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Nov 14 13:27:01 2016 -0500
----------------------------------------------------------------------
ambari-agent/conf/unix/agent-multiplier.py | 372 ++++++
ambari-agent/conf/unix/ambari-agent.ini | 3 +-
ambari-agent/conf/windows/ambari-agent.ini | 5 +-
.../src/main/python/ambari_agent/ActionQueue.py | 36 +-
.../main/python/ambari_agent/AmbariConfig.py | 4 -
.../src/main/python/ambari_agent/Controller.py | 10 +
.../ambari_agent/CustomServiceOrchestrator.py | 3 +-
.../src/main/python/ambari_agent/FileCache.py | 10 +
.../ambari_agent/PythonReflectiveExecutor.py | 20 +-
.../ambari_agent/StatusCommandsExecutor.py | 91 ++
.../src/main/python/ambari_agent/main.py | 21 +-
.../test/python/ambari_agent/TestActionQueue.py | 76 +-
.../test/python/ambari_agent/TestController.py | 1 +
.../TestCustomServiceOrchestrator.py | 11 +-
.../test/python/ambari_agent/TestFileCache.py | 12 +
.../src/test/python/ambari_agent/TestMain.py | 3 +-
.../src/main/python/ambari_commons/constants.py | 1 +
.../libraries/functions/conf_select.py | 2 +-
.../libraries/script/script.py | 34 +-
.../conf/unix/ambari-metrics-grafana | 17 +
ambari-server/docs/configuration/index.md | 7 +-
ambari-server/src/main/assemblies/server.xml | 8 +
.../ambari/server/checks/CheckDescription.java | 6 +-
.../server/checks/HostMaintenanceModeCheck.java | 14 +-
.../server/configuration/Configuration.java | 108 +-
.../AmbariManagementControllerImpl.java | 20 +-
.../ambari/server/controller/AmbariServer.java | 23 +
.../server/controller/ControllerModule.java | 78 +-
.../ClusterStackVersionResourceProvider.java | 221 ++--
.../internal/ComponentResourceProvider.java | 4 +-
.../internal/HostComponentResourceProvider.java | 2 +-
.../internal/ServiceResourceProvider.java | 4 +-
.../internal/UpgradeResourceProvider.java | 24 +-
.../ambari/server/events/AmbariEvent.java | 7 +-
.../ambari/server/hooks/AmbariEventFactory.java | 33 +
.../apache/ambari/server/hooks/HookContext.java | 26 +
.../ambari/server/hooks/HookContextFactory.java | 44 +
.../apache/ambari/server/hooks/HookService.java | 36 +
.../users/PostUserCreationHookContext.java | 55 +
.../server/hooks/users/UserCreatedEvent.java | 45 +
.../server/hooks/users/UserHookParams.java | 49 +
.../server/hooks/users/UserHookService.java | 279 +++++
.../dispatchers/AmbariSNMPDispatcher.java | 150 +++
.../dispatchers/SNMPDispatcher.java | 25 +-
.../server/orm/entities/AlertHistoryEntity.java | 3 +
.../ambari/server/orm/entities/StackEntity.java | 10 +-
.../AmbariLdapBindAuthenticator.java | 15 +-
.../authorization/LdapServerProperties.java | 26 +
.../server/security/authorization/Users.java | 119 +-
.../serveraction/AbstractServerAction.java | 2 +-
.../server/serveraction/ServerAction.java | 4 +-
.../kerberos/ADKerberosOperationHandler.java | 3 +
.../kerberos/MITKerberosOperationHandler.java | 28 +-
.../users/CollectionPersisterService.java | 46 +
.../CollectionPersisterServiceFactory.java | 24 +
.../users/CsvFilePersisterService.java | 103 ++
.../users/PostUserCreationHookServerAction.java | 163 +++
.../users/ShellCommandCallableFactory.java | 26 +
.../users/ShellCommandUtilityCallable.java | 48 +
.../users/ShellCommandUtilityWrapper.java | 57 +
.../org/apache/ambari/server/state/Cluster.java | 6 +-
.../org/apache/ambari/server/state/Host.java | 14 +
.../server/state/alert/AlertDefinitionHash.java | 11 +-
.../ambari/server/state/alert/TargetType.java | 7 +-
.../server/state/cluster/ClusterImpl.java | 17 +-
.../ambari/server/state/host/HostImpl.java | 27 +
.../services/AlertNoticeDispatchService.java | 19 +
.../state/stack/upgrade/HostOrderGrouping.java | 9 +-
.../server/topology/AsyncCallableService.java | 25 +-
.../topology/ClusterConfigurationRequest.java | 41 +-
.../server/topology/HostOfferResponse.java | 46 +-
.../ambari/server/topology/HostRequest.java | 18 +-
.../ambari/server/topology/LogicalRequest.java | 13 +-
.../ambari/server/topology/TopologyManager.java | 49 +-
.../server/upgrade/SchemaUpgradeHelper.java | 43 +-
.../server/upgrade/UpgradeCatalog242.java | 4 +
.../server/upgrade/UpgradeCatalog250.java | 4 +-
.../ambari/server/utils/ShellCommandUtil.java | 2 +-
.../python/ambari_server/resourceFilesKeeper.py | 8 +-
.../python/ambari_server/serverConfiguration.py | 24 +
.../src/main/python/ambari_server/utils.py | 9 +-
.../0.1.0/package/scripts/metrics_grafana.py | 8 +
.../package/scripts/metrics_grafana_util.py | 8 +-
.../0.1.0/package/scripts/params.py | 3 +
.../0.1.0/package/scripts/split_points.py | 30 +-
.../2.0.0/package/scripts/hawq_constants.py | 2 +-
.../HAWQ/2.0.0/package/scripts/params.py | 6 +
.../HAWQ/2.0.0/package/scripts/service_check.py | 1 +
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 22 +-
.../2.1.0.2.0/package/scripts/zkfc_slave.py | 3 +-
.../package/scripts/webhcat_service.py | 7 +-
.../KAFKA/0.8.1/package/scripts/kafka.py | 26 +-
.../package/scripts/kerberos_common.py | 3 +
.../4.0.0.2.0/package/scripts/oozie_server.py | 6 +-
.../RANGER/0.4.0/package/scripts/params.py | 2 +-
.../0.4.0/package/scripts/setup_ranger_xml.py | 7 +-
.../SPARK/1.2.1/package/scripts/params.py | 10 +-
.../3.4.5/package/scripts/zookeeper.py | 8 -
.../3.4.5/package/scripts/zookeeper_server.py | 4 +-
.../3.4.5/package/scripts/zookeeper_service.py | 11 -
.../scripts/post-user-creation-hook.sh | 133 +++
.../2.0.6/hooks/before-ANY/scripts/params.py | 4 +-
.../stacks/HDP/2.0.6/services/stack_advisor.py | 3 +-
.../services/HIVE/configuration/hive-env.xml | 1 +
.../stacks/HDP/2.3/services/RANGER/metainfo.xml | 6 +-
.../stacks/HDP/2.3/services/stack_advisor.py | 119 +-
.../stacks/HDP/2.4/services/RANGER/metainfo.xml | 6 +-
.../stacks/HDP/2.5/services/HIVE/metainfo.xml | 4 +
.../stacks/HDP/2.5/services/KNOX/metainfo.xml | 4 +
.../stacks/HDP/2.5/services/RANGER/metainfo.xml | 4 +
.../stacks/HDP/2.5/services/stack_advisor.py | 15 +-
.../stacks/HDP/2.6/services/SPARK/kerberos.json | 126 ++
.../server/agent/TestHeartbeatHandler.java | 17 +-
.../checks/HostMaintenanceModeCheckTest.java | 47 +
.../server/configuration/ConfigurationTest.java | 6 +-
.../ActiveWidgetLayoutResourceProviderTest.java | 4 +
...ClusterStackVersionResourceProviderTest.java | 184 +++
.../StackUpgradeConfigurationMergeTest.java | 5 +
.../internal/UpgradeResourceProviderTest.java | 7 +-
.../UserAuthorizationResourceProviderTest.java | 4 +
.../internal/UserResourceProviderTest.java | 4 +
.../server/hooks/users/UserHookServiceTest.java | 224 ++++
.../dispatchers/AmbariSNMPDispatcherTest.java | 553 +++++++++
.../AmbariAuthorizationFilterTest.java | 4 +
...uthenticationProviderForDNWithSpaceTest.java | 28 +-
.../AmbariLdapBindAuthenticatorTest.java | 17 +-
.../security/authorization/UsersTest.java | 10 +
.../ADKerberosOperationHandlerTest.java | 14 +
.../MITKerberosOperationHandlerTest.java | 57 +-
.../PostUserCreationHookServerActionTest.java | 182 +++
.../ambari/server/state/UpgradeHelperTest.java | 10 +
.../cluster/ClusterEffectiveVersionTest.java | 5 +-
.../server/state/cluster/ClusterTest.java | 33 +-
.../topology/AsyncCallableServiceTest.java | 59 +-
.../ClusterConfigurationRequestTest.java | 59 +-
.../server/upgrade/SchemaUpgradeHelperTest.java | 163 +++
.../server/upgrade/UpgradeCatalog240Test.java | 35 +
.../server/upgrade/UpgradeCatalog242Test.java | 2 +
.../server/upgrade/UpgradeCatalog250Test.java | 11 +-
.../src/test/python/TestResourceFilesKeeper.py | 16 +-
ambari-server/src/test/python/TestUtils.py | 17 +-
.../common-services/HAWQ/test_hawqmaster.py | 4 +
.../python/stacks/2.0.6/HDFS/test_namenode.py | 10 +-
.../stacks/2.0.6/HIVE/test_webhcat_server.py | 28 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 29 +
.../stacks/2.0.6/configs/client-upgrade.json | 2 +-
.../test/python/stacks/2.0.6/configs/nn_eu.json | 2 +-
.../stacks/2.0.6/configs/nn_eu_standby.json | 2 +-
.../python/stacks/2.0.6/configs/nn_ru_lzo.json | 2 +-
.../stacks/2.1/configs/client-upgrade.json | 2 +-
.../2.1/configs/hive-metastore-upgrade.json | 2 +-
.../stacks/2.2/configs/falcon-upgrade.json | 2 +-
.../python/stacks/2.2/configs/hive-upgrade.json | 2 +-
.../journalnode-upgrade-hdfs-secure.json | 2 +-
.../stacks/2.2/configs/journalnode-upgrade.json | 2 +-
.../python/stacks/2.2/configs/knox_upgrade.json | 2 +-
.../stacks/2.2/configs/oozie-downgrade.json | 2 +-
.../stacks/2.2/configs/oozie-upgrade.json | 2 +-
.../2.2/configs/ranger-admin-upgrade.json | 2 +-
.../2.2/configs/ranger-usersync-upgrade.json | 2 +-
.../stacks/2.3/common/test_stack_advisor.py | 28 +
.../stacks/2.5/common/test_stack_advisor.py | 9 +-
.../app/assets/data/stack_versions/upgrade.json | 42 +-
ambari-web/app/assets/test/tests.js | 2 +
ambari-web/app/config.js | 4 +-
ambari-web/app/controllers/application.js | 4 +-
.../journalNode/step1_controller.js | 5 +-
.../resourceManager/step2_controller.js | 2 +-
.../main/admin/stack_and_upgrade_controller.js | 49 +-
.../add_alert_definition/step1_controller.js | 2 +-
ambari-web/app/controllers/main/host/details.js | 20 +-
.../controllers/main/service/info/configs.js | 28 +-
.../main/service/reassign/step2_controller.js | 2 +-
.../main/service/reassign/step4_controller.js | 2 +-
.../app/controllers/wizard/step6_controller.js | 169 +--
.../app/controllers/wizard/step7_controller.js | 3 +-
.../app/controllers/wizard/step8_controller.js | 5 +-
ambari-web/app/data/custom_stack_map.js | 2 +-
.../app/mappers/configs/config_groups_mapper.js | 2 +-
ambari-web/app/mappers/configs/themes_mapper.js | 4 +-
ambari-web/app/messages.js | 3 +
ambari-web/app/mixins.js | 3 +
ambari-web/app/mixins/common/blueprint.js | 24 +-
.../host_component_recommendation_mixin.js | 127 ++
.../hosts/host_component_validation_mixin.js | 106 ++
ambari-web/app/mixins/common/serverValidator.js | 97 +-
.../app/mixins/common/track_request_mixin.js | 47 +
.../app/mixins/common/widgets/widget_mixin.js | 8 +-
.../main/host/details/actions/check_host.js | 21 +-
.../app/mixins/main/service/groups_mapping.js | 4 +-
.../mixins/wizard/assign_master_components.js | 178 ++-
ambari-web/app/models/configs/config_group.js | 2 +
.../models/configs/objects/service_config.js | 62 +-
.../models/configs/service_config_version.js | 2 +-
ambari-web/app/models/host_component.js | 2 +-
.../app/models/stack_service_component.js | 4 +-
ambari-web/app/routes/stack_upgrade_routes.js | 4 +-
ambari-web/app/styles/application.less | 1111 +++---------------
ambari-web/app/styles/common.less | 160 ++-
ambari-web/app/styles/config_history_flow.less | 36 +-
ambari-web/app/styles/stack_versions.less | 18 +-
.../app/styles/theme/bootstrap-ambari.css | 81 +-
ambari-web/app/templates/application.hbs | 65 +-
ambari-web/app/templates/common/about.hbs | 6 +-
.../common/assign_master_components.hbs | 10 +-
ambari-web/app/templates/login.hbs | 2 +-
.../stack_upgrade/stack_upgrade_wizard.hbs | 16 +-
.../admin/stack_upgrade/upgrade_version_box.hbs | 5 +-
.../stack_upgrade/upgrade_version_column.hbs | 5 +-
.../main/admin/stack_upgrade/versions.hbs | 4 +-
.../app/templates/main/alerts/configs.hbs | 50 +-
.../main/alerts/definition_details.hbs | 66 +-
.../app/templates/main/charts/heatmap.hbs | 10 +-
.../templates/main/charts/heatmap_dropdown.hbs | 7 +-
.../templates/main/dashboard/config_history.hbs | 2 +-
ambari-web/app/templates/main/host/configs.hbs | 6 +-
.../templates/main/host/delete_hosts_popup.hbs | 2 +-
.../main/host/details/deleteComponentPopup.hbs | 3 +
.../main/host/details/doDeleteHostPopup.hbs | 2 +-
.../main/host/details/host_component.hbs | 61 +-
ambari-web/app/templates/main/host/metrics.hbs | 52 +-
ambari-web/app/templates/main/host/summary.hbs | 118 +-
.../main/service/all_services_actions.hbs | 2 -
.../main/service/info/heatmap_dropdown.hbs | 7 +-
.../app/templates/main/service/info/summary.hbs | 16 +-
.../main/service/info/summary/base.hbs | 8 +-
.../service/info/summary/client_components.hbs | 14 +-
.../service/info/summary/master_components.hbs | 25 +-
.../service/info/summary/slave_components.hbs | 22 +-
.../templates/main/service/reassign/step1.hbs | 21 +-
.../templates/main/service/reassign/step3.hbs | 52 +-
.../templates/main/service/reassign/step5.hbs | 22 +-
.../app/templates/main/service/service.hbs | 11 +-
.../templates/main/service/services/flume.hbs | 222 ++--
.../templates/main/service/services/hbase.hbs | 142 ++-
.../templates/main/service/services/hdfs.hbs | 274 ++---
.../templates/main/service/services/hive.hbs | 54 +-
.../templates/main/service/services/ranger.hbs | 60 +-
.../templates/main/service/services/storm.hbs | 117 +-
.../templates/main/service/services/yarn.hbs | 146 +--
.../wizard/step1_addLocalRepository.hbs | 2 +-
ambari-web/app/templates/wizard/step2.hbs | 105 +-
ambari-web/app/templates/wizard/step3.hbs | 21 +-
ambari-web/app/utils/blueprint.js | 40 +-
ambari-web/app/utils/config.js | 8 +-
ambari-web/app/utils/ember_reopen.js | 2 +-
ambari-web/app/utils/helper.js | 2 +
.../configs/config_category_container_view.js | 4 +-
.../views/common/configs/config_history_flow.js | 2 +-
.../configs/service_configs_by_category_view.js | 3 +-
.../admin/stack_upgrade/upgrade_history_view.js | 21 +-
.../stack_upgrade/upgrade_version_box_view.js | 4 +
.../main/host/details/host_component_view.js | 6 +-
ambari-web/app/views/main/menu.js | 2 +-
.../app/views/main/service/info/summary.js | 58 +-
ambari-web/app/views/main/service/service.js | 14 +-
.../app/views/main/service/services/flume.js | 11 +-
.../app/views/main/service/services/hive.js | 6 +-
.../admin/kerberos/step4_controller_test.js | 21 +-
.../admin/stack_and_upgrade_controller_test.js | 31 +
.../test/controllers/wizard/step5_test.js | 55 -
.../test/controllers/wizard/step6_test.js | 6 +-
.../test/controllers/wizard/step7_test.js | 13 +
.../test/controllers/wizard/step8_test.js | 8 +-
.../host_component_recommendation_mixin_test.js | 189 +++
.../host_component_validation_mixin_test.js | 188 +++
.../configs/objects/service_config_test.js | 5 +-
ambari-web/test/utils/config_test.js | 22 +
.../upgrade_version_box_view_test.js | 22 +
.../views/main/service/info/summary_test.js | 48 -
.../HDF/2.0/hooks/before-ANY/scripts/params.py | 4 +-
contrib/views/hawq/README.md | 92 +-
contrib/views/hawq/pom.xml | 381 +++---
.../apache/ambari/view/hawq/HAWQDataSource.java | 94 ++
.../ambari/view/hawq/HAWQViewServlet.java | 109 --
.../ambari/view/hawq/JsonApiResource.java | 98 ++
.../apache/ambari/view/hawq/QueryResource.java | 36 +
.../ambari/view/hawq/QueryResourceProvider.java | 225 ++++
.../apache/ambari/view/hawq/QueryService.java | 70 ++
.../hawq/src/main/resources/WEB-INF/web.xml | 37 -
.../src/main/resources/ui/app/adapters/query.js | 14 +-
.../views/hawq/src/main/resources/ui/app/app.js | 2 +-
.../resources/ui/app/components/query-table.js | 6 +-
.../src/main/resources/ui/app/models/query.js | 32 +-
.../hawq/src/main/resources/ui/app/resolver.js | 2 +-
.../hawq/src/main/resources/ui/app/router.js | 6 +-
.../main/resources/ui/app/routes/application.js | 5 +-
.../src/main/resources/ui/app/routes/main.js | 31 +-
.../main/resources/ui/app/serializers/query.js | 51 +-
.../src/main/resources/ui/app/styles/app.scss | 10 +-
.../resources/ui/app/templates/application.hbs | 2 +-
.../ui/app/templates/components/query-table.hbs | 12 +-
.../main/resources/ui/app/templates/main.hbs | 2 +-
.../src/main/resources/ui/app/utils/utils.js | 72 +-
.../views/hawq/src/main/resources/ui/bower.json | 5 +-
.../src/main/resources/ui/config/environment.js | 4 +-
.../hawq/src/main/resources/ui/package.json | 4 +-
.../ui/tests/acceptance/application-test.js | 23 +-
.../ui/tests/helpers/module-for-acceptance.js | 4 +-
.../resources/ui/tests/helpers/test-helper.js | 103 +-
.../integration/components/query-table-test.js | 77 +-
.../src/main/resources/ui/tests/test-helper.js | 6 +-
.../ui/tests/unit/adapters/query-test.js | 13 +-
.../ui/tests/unit/models/query-test.js | 13 +-
.../resources/ui/tests/unit/routes/main-test.js | 11 +-
.../ui/tests/unit/serializers/query-test.js | 71 +-
.../resources/ui/tests/unit/utils/utils-test.js | 80 +-
.../src/main/resources/view.log4j.properties | 27 +
contrib/views/hawq/src/main/resources/view.xml | 45 +
.../ambari/view/hawq/HAWQDataSourceTest.java | 170 +++
.../view/hawq/QueryResourceProviderTest.java | 200 ++++
.../ambari/view/hive2/actor/LogAggregator.java | 5 +-
.../view/hive2/internal/SafeViewContext.java | 4 +-
.../resources/browser/ConnectionService.java | 8 +-
.../view/hive2/resources/jobs/JobService.java | 10 +-
.../ui/hive-web/app/controllers/splash.js | 18 +-
.../resources/ui/hive-web/app/routes/splash.js | 7 +-
contrib/views/pom.xml | 1 +
docs/pom.xml | 12 +
319 files changed, 9185 insertions(+), 3782 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/863d995c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/863d995c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 89d2da4,1806c64..b8a98b8
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@@ -222,15 -219,13 +223,13 @@@ public class UpgradeResourceProvider ex
Arrays.asList(UPGRADE_REQUEST_ID, UPGRADE_CLUSTER_NAME));
private static final Set<String> PROPERTY_IDS = new HashSet<>();
- private static final String COMMAND_PARAM_VERSION = VERSION;
- private static final String COMMAND_PARAM_CLUSTER_NAME = "clusterName";
- private static final String COMMAND_PARAM_DIRECTION = "upgrade_direction";
+ public static final String COMMAND_PARAM_VERSION = VERSION;
+ public static final String COMMAND_PARAM_CLUSTER_NAME = "clusterName";
+ public static final String COMMAND_PARAM_DIRECTION = "upgrade_direction";
private static final String COMMAND_PARAM_UPGRADE_PACK = "upgrade_pack";
- private static final String COMMAND_PARAM_REQUEST_ID = "request_id";
+ public static final String COMMAND_PARAM_REQUEST_ID = "request_id";
- // TODO AMBARI-12698, change this variable name since it is no longer always a restart. Possible values are rolling_upgrade or nonrolling_upgrade
- // This will involve changing Script.py
- private static final String COMMAND_PARAM_RESTART_TYPE = "restart_type";
+ private static final String COMMAND_PARAM_UPGRADE_TYPE = "upgrade_type";
private static final String COMMAND_PARAM_TASKS = "tasks";
private static final String COMMAND_PARAM_STRUCT_OUT = "structured_out";
private static final String COMMAND_DOWNGRADE_FROM_VERSION = "downgrade_from_version";
http://git-wip-us.apache.org/repos/asf/ambari/blob/863d995c/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/863d995c/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------