You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/11/30 15:35:48 UTC
[4/8] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-18456
Merge branch 'trunk' into branch-feature-AMBARI-18456
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a0e9a50
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a0e9a50
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a0e9a50
Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 0a0e9a5005ef1c410938f6059c0d8f9cb0a16ba5
Parents: a6639a7 2c884ab
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu Nov 17 11:26:54 2016 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Thu Nov 17 11:26:54 2016 -0500
----------------------------------------------------------------------
.../main/resources/ui/admin-web/app/index.html | 1 +
.../controllers/groups/GroupsEditCtrl.js | 5 +-
.../controllers/groups/GroupsListCtrl.js | 18 +-
.../scripts/controllers/users/UsersShowCtrl.js | 8 +-
.../ui/admin-web/app/scripts/i18n.config.js | 1 +
.../ui/admin-web/app/scripts/services/Group.js | 33 +-
.../app/scripts/services/GroupConstants.js | 38 +
.../app/scripts/services/UserConstants.js | 4 +
.../ui/admin-web/app/views/groups/edit.html | 8 +-
.../ui/admin-web/app/views/groups/list.html | 2 +-
.../ui/admin-web/app/views/users/show.html | 8 +-
ambari-agent/conf/unix/ambari-agent.ini | 3 +
ambari-agent/conf/windows/ambari-agent.ini | 2 +
.../src/main/python/ambari_agent/Controller.py | 8 +-
.../ambari_agent/CustomServiceOrchestrator.py | 3 +-
.../src/main/python/ambari_agent/FileCache.py | 10 +
.../src/main/python/ambari_agent/HostCleanup.py | 87 +-
.../src/main/python/ambari_agent/NetUtil.py | 10 +-
.../TestCustomServiceOrchestrator.py | 11 +-
.../test/python/ambari_agent/TestFileCache.py | 12 +
.../test/python/ambari_agent/TestHostCleanup.py | 18 +-
.../libraries/functions/constants.py | 1 +
.../ambari-logsearch-assembly/pom.xml | 2 +
.../src/main/resources/solr | 1464 +++++++++++++++++
.../ambari-logsearch-portal/pom.xml | 6 +
.../org/apache/ambari/logsearch/LogSearch.java | 14 +-
.../ambari/logsearch/conf/AuthPropsConfig.java | 62 +
.../ambari/logsearch/conf/SecurityConfig.java | 56 +-
.../web/filters/LogsearchJWTFilter.java | 181 +++
...LogsearchSecurityContextFormationFilter.java | 3 +-
...rchUsernamePasswordAuthenticationFilter.java | 1 -
.../web/model/JWTAuthenticationToken.java | 53 +
.../src/main/resources/swagger/swagger.html | 119 ++
ambari-metrics/ambari-metrics-assembly/pom.xml | 1 -
ambari-metrics/ambari-metrics-common/pom.xml | 11 +-
.../timeline/AbstractTimelineMetricsSink.java | 20 +-
.../AbstractTimelineMetricSinkTest.java | 98 ++
.../conf/unix/metric_monitor.ini | 2 -
.../src/main/python/core/config_reader.py | 10 +-
.../src/main/python/core/emitter.py | 57 +-
.../src/main/python/core/krberr.py | 42 -
.../main/python/core/spnego_kerberos_auth.py | 163 --
.../src/test/python/core/TestEmitter.py | 26 -
.../metrics/timeline/TimelineMetricStore.java | 2 +-
ambari-server/docs/configuration/index.md | 35 +-
ambari-server/pom.xml | 10 +
ambari-server/sbin/ambari-server | 4 +
ambari-server/src/main/assemblies/server.xml | 8 +
.../server/agent/RecoveryConfigHelper.java | 71 +-
.../stackadvisor/StackAdvisorHelper.java | 18 +-
.../server/configuration/Configuration.java | 179 +-
.../AmbariManagementControllerImpl.java | 49 +-
.../ambari/server/controller/AmbariServer.java | 219 +--
.../server/controller/ControllerModule.java | 73 +-
.../ambari/server/controller/GroupResponse.java | 14 +
.../server/controller/KerberosHelperImpl.java | 6 -
.../internal/GroupResourceProvider.java | 4 +
.../internal/UpgradeResourceProvider.java | 6 +
.../internal/UserPrivilegeResourceProvider.java | 3 +
.../metrics/MetricsCollectorHAClusterState.java | 10 +
.../ambari/server/events/AmbariEvent.java | 7 +-
.../server/events/MaintenanceModeEvent.java | 30 +-
.../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 ++++
.../apache/ambari/server/orm/dao/GroupDAO.java | 19 +-
.../ambari/server/orm/dao/ResourceDAO.java | 21 +
.../ambari/server/orm/entities/GroupEntity.java | 18 +
.../server/security/ClientSecurityType.java | 3 +-
.../AmbariPamAuthenticationProvider.java | 252 +++
.../server/security/authorization/Group.java | 6 +
.../security/authorization/GroupType.java | 25 +
.../PamAuthenticationException.java | 36 +
.../server/security/authorization/UserType.java | 3 +-
.../server/security/authorization/Users.java | 173 +-
.../security/unsecured/rest/ConnectionInfo.java | 2 +-
.../serveraction/AbstractServerAction.java | 2 +-
.../server/serveraction/ServerAction.java | 4 +-
.../kerberos/MITKerberosOperationHandler.java | 19 +-
.../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 +
.../ambari/server/state/ConfigHelper.java | 85 -
.../server/state/DependencyConditionInfo.java | 104 ++
.../ambari/server/state/DependencyInfo.java | 37 +-
.../ambari/server/state/host/HostImpl.java | 2 +-
.../state/stack/upgrade/HostOrderGrouping.java | 2 +-
.../ambari/server/topology/AmbariContext.java | 20 -
.../server/topology/AsyncCallableService.java | 25 +-
.../server/topology/BlueprintValidatorImpl.java | 18 +-
.../server/upgrade/AbstractUpgradeCatalog.java | 3 -
.../server/upgrade/SchemaUpgradeHelper.java | 5 -
.../server/upgrade/UpgradeCatalog150.java | 910 -----------
.../server/upgrade/UpgradeCatalog151.java | 152 --
.../server/upgrade/UpgradeCatalog160.java | 205 ---
.../server/upgrade/UpgradeCatalog161.java | 343 ----
.../server/upgrade/UpgradeCatalog170.java | 1530 ------------------
.../server/upgrade/UpgradeCatalog200.java | 8 -
.../server/upgrade/UpgradeCatalog250.java | 11 +
.../ambari/server/utils/ShellCommandUtil.java | 2 +-
ambari-server/src/main/python/ambari-server.py | 7 +-
.../python/ambari_server/resourceFilesKeeper.py | 12 +-
.../python/ambari_server/serverConfiguration.py | 11 +
.../main/python/ambari_server/serverUtils.py | 2 +-
.../main/python/ambari_server/setupActions.py | 1 +
.../main/python/ambari_server/setupMpacks.py | 10 +-
.../main/python/ambari_server/setupSecurity.py | 53 +-
.../src/main/python/ambari_server/utils.py | 12 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 +
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 +
.../resources/Ambari-DDL-Postgres-CREATE.sql | 1 +
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 1 +
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 1 +
.../0.1.0/package/scripts/params.py | 2 +-
.../0.1.0/properties/infra-solr-env.sh.j2 | 4 +-
.../AMBARI_METRICS/0.1.0/kerberos.json | 26 -
.../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 13 +-
.../package/scripts/metrics_grafana_util.py | 8 +-
.../0.1.0/package/scripts/params.py | 10 +-
.../0.1.0/package/scripts/split_points.py | 29 +-
.../package/templates/metric_monitor.ini.j2 | 2 -
.../configuration/application-properties.xml | 11 +
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 46 +-
.../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 2 +-
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 43 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 2 -
.../0.12.0.2.0/package/scripts/service_check.py | 10 +-
.../configuration/kafka_client_jaas_conf.xml | 41 +
.../0.8.1/configuration/kafka_jaas_conf.xml | 59 +
.../common-services/KAFKA/0.8.1/metainfo.xml | 2 +
.../KAFKA/0.8.1/package/scripts/kafka.py | 12 +
.../KAFKA/0.8.1/package/scripts/params.py | 2 +
.../logfeeder-custom-logsearch-conf.xml | 46 +
.../configuration/logsearch-properties.xml | 63 +
.../scripts/logsearch_config_aggregator.py | 14 +-
.../LOGSEARCH/0.5.0/package/scripts/params.py | 1 +
.../0.5.0/package/scripts/setup_logfeeder.py | 1 +
.../templates/HadoopServiceConfig.json.j2 | 14 +-
.../LOGSEARCH/0.5.0/themes/theme.json | 87 +-
.../MAHOUT/1.0.0.2.3/metainfo.xml | 2 +-
.../OOZIE/4.0.0.2.0/metainfo.xml | 5 +-
.../OOZIE/4.2.0.2.3/metainfo.xml | 4 +-
.../common-services/PIG/0.12.0.2.0/metainfo.xml | 2 +-
.../0.4.0/package/scripts/setup_ranger_xml.py | 24 +
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 8 +
.../common-services/TEZ/0.4.0.2.1/metainfo.xml | 2 +-
.../common-services/YARN/2.1.0.2.0/metainfo.xml | 2 +-
.../0.6.0.2.5/package/scripts/master.py | 11 +-
.../src/main/resources/properties.json | 1 +
.../main/resources/scripts/Ambaripreupload.py | 2 +-
.../scripts/post-user-creation-hook.sh | 133 ++
.../HDP/2.0.6/properties/stack_features.json | 5 +
.../stacks/HDP/2.0.6/services/stack_advisor.py | 32 +-
.../services/HDFS/configuration/core-site.xml | 2 +-
.../services/HDFS/configuration/hdfs-site.xml | 2 +-
.../HDP/2.5/upgrades/host-ordered-upgrade.xml | 17 +-
.../configuration/application-properties.xml | 95 ++
.../ATLAS/configuration/atlas-log4j.xml | 118 ++
.../stacks/HDP/2.6/services/ATLAS/metainfo.xml | 10 +-
.../services/ATLAS/themes/theme_version_2.json | 845 ++++++++++
.../HDP/2.6/services/ZEPPELIN/metainfo.xml | 2 +-
.../stacks/HDP/2.6/services/stack_advisor.py | 381 ++---
.../services/HDFS/configuration/core-site.xml | 2 +-
.../services/HDFS/configuration/hdfs-site.xml | 2 +-
.../webapp/WEB-INF/spring-security.xml | 1 +
.../stackadvisor/StackAdvisorHelperTest.java | 10 +-
.../server/configuration/ConfigurationTest.java | 6 +-
.../ActiveWidgetLayoutResourceProviderTest.java | 4 +
.../StackUpgradeConfigurationMergeTest.java | 5 +
.../UserAuthorizationResourceProviderTest.java | 4 +
.../internal/UserResourceProviderTest.java | 4 +
.../AlertMaintenanceModeListenerTest.java | 2 +-
.../server/hooks/users/UserHookServiceTest.java | 224 +++
.../AmbariAuthorizationFilterTest.java | 4 +
...uthenticationProviderForDNWithSpaceTest.java | 28 +-
.../AmbariPamAuthenticationProviderTest.java | 97 ++
.../security/authorization/TestUsers.java | 10 +-
.../security/authorization/UsersTest.java | 10 +
.../PostUserCreationHookServerActionTest.java | 182 +++
.../cluster/ClusterEffectiveVersionTest.java | 5 +-
.../server/topology/AmbariContextTest.java | 2 -
.../topology/AsyncCallableServiceTest.java | 59 +-
.../server/topology/BlueprintImplTest.java | 41 -
.../topology/BlueprintValidatorImplTest.java | 75 +-
.../server/upgrade/UpgradeCatalog150Test.java | 258 ---
.../server/upgrade/UpgradeCatalog151Test.java | 120 --
.../server/upgrade/UpgradeCatalog160Test.java | 264 ---
.../server/upgrade/UpgradeCatalog161Test.java | 418 -----
.../server/upgrade/UpgradeCatalog170Test.java | 791 ---------
.../server/upgrade/UpgradeCatalog200Test.java | 2 +-
.../server/upgrade/UpgradeCatalog240Test.java | 35 +
.../server/upgrade/UpgradeCatalog250Test.java | 13 +
.../server/upgrade/UpgradeCatalogTest.java | 85 +-
ambari-server/src/test/python/TestMpacks.py | 13 +-
.../src/test/python/TestResourceFilesKeeper.py | 61 +-
.../stacks/2.0.6/HBASE/test_hbase_client.py | 14 -
.../stacks/2.0.6/HBASE/test_hbase_master.py | 21 -
.../2.0.6/HBASE/test_hbase_regionserver.py | 28 -
.../2.0.6/HBASE/test_phoenix_queryserver.py | 16 -
.../2.0.6/HIVE/test_hive_service_check.py | 43 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 4 +-
.../stacks/2.4/LOGSEARCH/test_logfeeder.py | 3 +
.../stacks/2.5/RANGER/test_ranger_admin.py | 14 +
.../stacks/2.5/RANGER/test_ranger_tagsync.py | 7 +
.../stacks/2.5/RANGER/test_ranger_usersync.py | 7 +
.../stacks/2.5/RANGER_KMS/test_kms_server.py | 14 +
.../stacks/2.6/common/test_stack_advisor.py | 97 ++
ambari-web/app/config.js | 2 +-
.../main/admin/kerberos/step4_controller.js | 27 +-
.../main/admin/kerberos/wizard_controller.js | 15 +
.../alert_definitions_actions_controller.js | 4 +-
.../controllers/main/service/info/configs.js | 2 +-
ambari-web/app/data/HDP2/site_properties.js | 21 +
.../app/mappers/configs/config_groups_mapper.js | 2 +-
ambari-web/app/messages.js | 12 +-
.../main/service/configs/config_overridable.js | 1 +
ambari-web/app/models/configs/config_group.js | 2 +
.../models/configs/service_config_version.js | 2 +-
ambari-web/app/styles/alerts.less | 55 -
ambari-web/app/styles/application.less | 997 +++++-------
ambari-web/app/styles/bootstrap_overrides.less | 14 +
ambari-web/app/styles/common.less | 298 +---
ambari-web/app/styles/config_history_flow.less | 6 -
ambari-web/app/styles/modal_popups.less | 3 -
ambari-web/app/styles/stack_versions.less | 24 +-
.../app/styles/theme/bootstrap-ambari.css | 12 +-
ambari-web/app/styles/widgets.less | 4 +-
.../common/configs/selectCreateConfigGroup.hbs | 4 +-
.../templates/common/host_progress_popup.hbs | 4 +-
.../common/modal_popups/log_tail_popup.hbs | 2 +-
ambari-web/app/templates/login.hbs | 2 +-
.../highAvailability/journalNode/step2.hbs | 2 +-
.../main/alerts/definition_details.hbs | 8 +-
.../main/dashboard/plus_button_filter.hbs | 8 +-
.../main/dashboard/widgets/yarn_links.hbs | 2 +-
ambari-web/app/templates/main/host/summary.hbs | 2 +-
.../manage_configuration_groups_popup.hbs | 8 +-
.../templates/main/service/services/flume.hbs | 4 +-
ambari-web/app/templates/main/views.hbs | 5 +-
ambari-web/app/templates/wizard/step3.hbs | 4 +-
ambari-web/app/views/main/dashboard/widgets.js | 2 +
.../admin/kerberos/step4_controller_test.js | 4 +
.../host_component_recommendation_mixin_test.js | 24 +-
.../host_component_validation_mixin_test.js | 24 +-
contrib/utils/perf/deploy-gce-perf-cluster.py | 360 +++++
docs/pom.xml | 12 +
255 files changed, 8523 insertions(+), 7443 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a0e9a50/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a0e9a50/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a0e9a50/ambari-server/src/test/java/org/apache/ambari/server/topology/AmbariContextTest.java
----------------------------------------------------------------------
diff --cc ambari-server/src/test/java/org/apache/ambari/server/topology/AmbariContextTest.java
index dadeb03,82526e7..68a8d4c
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/AmbariContextTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/AmbariContextTest.java
@@@ -358,8 -330,6 +358,7 @@@ public class AmbariContextTest
expect(clusterController.ensureResourceProvider(Resource.Type.ConfigGroup)).andReturn(configGroupResourceProvider).once();
//todo: for now not using return value so just returning null
expect(configGroupResourceProvider.createResources(capture(configGroupRequestCapture))).andReturn(null).once();
- configHelper.moveDeprecatedGlobals(stackId, group1Configuration.getFullProperties(1), CLUSTER_NAME);
+
// replay all mocks
replayAll();