You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2018/03/27 03:13:08 UTC
[ambari] 01/01: Merging Trunk to branch :
'branch-feature-AMBARI-14714'.
This is an automated email from the ASF dual-hosted git repository.
swapan pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 46a28971137cf572b1ca633d2d38a31eba35e6d9
Merge: 8e5b0de 65f010c
Author: swapanshridhar <sh...@gmail.com>
AuthorDate: Mon Mar 26 20:13:01 2018 -0700
Merging Trunk to branch : 'branch-feature-AMBARI-14714'.
ambari-agent/pom.xml | 7 +-
.../python/ambari_agent/ClusterTopologyCache.py | 12 +-
.../ambari_agent/CustomServiceOrchestrator.py | 2 +-
.../src/main/python/ambari_agent/FileCache.py | 28 +-
.../python/ambari_agent/TestAgentStompResponses.py | 2 +-
.../ambari_agent/TestAlertSchedulerHandler.py | 10 +-
.../src/test/python/ambari_agent/TestFileCache.py | 2 +-
.../resource_management/TestPackageResource.py | 172 +-
.../test/python/resource_management/TestScript.py | 63 -
.../main/python/ambari_commons/buffered_queue.py | 100 ++
.../python/ambari_commons/repo_manager/__init__.py | 71 +
.../ambari_commons/repo_manager/apt_manager.py | 305 ++++
.../ambari_commons/repo_manager/apt_parser.py | 144 ++
.../repo_manager/choco_manager.py} | 66 +-
.../ambari_commons/repo_manager/generic_manager.py | 245 +++
.../ambari_commons/repo_manager/generic_parser.py | 63 +
.../repo_manager/yum_manager.py} | 324 ++--
.../ambari_commons/repo_manager/yum_parser.py | 147 ++
.../ambari_commons/repo_manager/zypper_manager.py | 285 +++
.../ambari_commons/repo_manager/zypper_parser.py | 149 ++
.../src/main/python/ambari_commons/shell.py | 695 +++++--
.../src/main/python/ambari_ws4py/__init__.py | 4 +-
.../main/python/ambari_ws4py/client/__init__.py | 25 +-
.../python/ambari_ws4py/client/geventclient.py | 14 +-
.../python/ambari_ws4py/client/threadedclient.py | 4 +-
.../python/ambari_ws4py/client/tornadoclient.py | 4 +-
.../src/main/python/ambari_ws4py/compat.py | 2 +-
.../src/main/python/ambari_ws4py/manager.py | 10 +-
.../src/main/python/ambari_ws4py/messaging.py | 2 +-
.../main/python/ambari_ws4py/server/__init__.py | 0
.../python/ambari_ws4py/server/cherrypyserver.py | 382 ++++
.../python/ambari_ws4py/server/geventserver.py | 121 ++
.../python/ambari_ws4py/server/wsgirefserver.py | 157 ++
.../main/python/ambari_ws4py/server/wsgiutils.py | 162 ++
.../src/main/python/ambari_ws4py/streaming.py | 22 +-
.../src/main/python/ambari_ws4py/websocket.py | 18 +-
.../resource_management/core/providers/__init__.py | 58 +-
.../core/providers/package/__init__.py | 384 ----
.../core/providers/package/apt.py | 430 -----
.../core/providers/package/zypper.py | 276 ---
.../core/providers/packaging.py | 60 +
.../main/python/resource_management/core/shell.py | 36 +-
.../libraries/functions/namenode_ha_utils.py | 25 +-
.../libraries/providers/hdfs_resource.py | 16 +-
.../resource_management/libraries/script/script.py | 32 +-
ambari-funtest/pom.xml | 335 ----
.../src/main/python/migrationHelper.py | 2 +-
.../src/main/package/deb/logfeeder/postinst | 2 +-
.../src/main/package/deb/portal/postinst | 2 +-
.../src/main/package/rpm/logfeeder/postinstall.sh | 2 +-
.../main/package/rpm/logfeeder/postremove.sh~HEAD | 21 -
.../main/package/rpm/logfeeder/postremove.sh~trunk | 21 -
.../src/main/package/rpm/portal/postinstall.sh | 2 +-
.../src/main/package/rpm/portal/postremove.sh~HEAD | 21 -
.../main/package/rpm/portal/postremove.sh~trunk | 21 -
.../ambari/logfeeder/conf/LogFeederProps.java | 12 +-
.../logfeeder/conf/LogFeederSecurityConfig.java | 4 +-
.../logsearch/auth/filter/AbstractJWTFilter.java | 30 +-
.../ambari/logsearch/conf/SecurityConfig.java | 2 +-
.../logsearch/conf/SolrAuditLogPropsConfig.java | 6 +-
.../logsearch/conf/SolrConnectionPropsConfig.java | 6 +-
.../filters/LogsearchAuthenticationEntryPoint.java | 11 +-
.../security/LogsearchAuthenticationProvider.java | 2 +-
.../docker/knox/logsearch/1.0.0/rewrite.xml | 47 +-
.../docker/knox/logsearch/1.0.0/service.xml | 41 +-
ambari-project/pom.xml | 10 +-
ambari-server/pom.xml | 11 +-
ambari-server/src/main/assemblies/server.xml | 9 +-
.../server/agent/stomp/AgentHostDataHolder.java | 7 +
.../server/agent/stomp/HostLevelParamsHolder.java | 25 +
.../ambari/server/agent/stomp/MetadataHolder.java | 14 +
.../ambari/server/agent/stomp/TopologyHolder.java | 53 +-
.../server/agent/stomp/dto/TopologyComponent.java | 10 +-
.../server/api/services/AlertTargetService.java | 148 +-
.../services/stackadvisor/StackAdvisorHelper.java | 19 +-
.../services/stackadvisor/StackAdvisorRequest.java | 1 +
.../ComponentLayoutRecommendationCommand.java | 6 +-
.../commands/ComponentLayoutValidationCommand.java | 6 +-
...igurationDependenciesRecommendationCommand.java | 6 +-
.../ConfigurationRecommendationCommand.java | 6 +-
.../commands/ConfigurationValidationCommand.java | 6 +-
...eSignOnConfigurationRecommendationCommand.java} | 29 +-
.../stackadvisor/commands/StackAdvisorCommand.java | 76 +-
.../commands/StackAdvisorCommandType.java | 2 +
.../AmbariServerConfigurationCategory.java | 5 +-
.../AmbariServerConfigurationKey.java | 128 ++
.../server/controller/AlertTargetSwagger.java | 84 +
.../controller/AmbariManagementControllerImpl.java | 203 ++-
.../server/controller/KerberosHelperImpl.java | 19 +
.../ambari/server/controller/ServiceResponse.java | 37 +-
.../server/controller/StackServiceResponse.java | 11 +
.../internal/AlertGroupResourceProvider.java | 21 +-
.../internal/AlertTargetResourceProvider.java | 31 +-
.../internal/AmbariServerConfigurationHandler.java | 38 +-
.../internal/AmbariServerConfigurationUtils.java | 55 +-
.../AmbariServerLDAPConfigurationHandler.java | 1 +
.../controller/internal/HostResourceProvider.java | 5 +-
...erviceComponentConfigurationHandlerFactory.java | 1 +
...viceComponentConfigurationResourceProvider.java | 2 +-
.../internal/ServiceResourceProvider.java | 14 +
.../internal/StackServiceResourceProvider.java | 8 +-
.../internal/UpgradeResourceProvider.java | 1 +
.../apache/ambari/server/events/AmbariEvent.java | 7 +-
.../events/ClusterComponentsRepoChangedEvent.java | 15 +-
.../ldap/domain/AmbariLdapConfiguration.java | 147 +-
.../ldap/domain/AmbariLdapConfigurationKeys.java | 114 --
.../service/AmbariLdapConfigurationProvider.java | 2 +-
.../ads/DefaultLdapAttributeDetectionService.java | 5 +-
.../ads/detectors/GroupMemberAttrDetector.java | 4 +-
.../ads/detectors/GroupNameAttrDetector.java | 4 +-
.../ads/detectors/GroupObjectClassDetector.java | 4 +-
.../ads/detectors/UserGroupMemberAttrDetector.java | 4 +-
.../ads/detectors/UserNameAttrDetector.java | 4 +-
.../ads/detectors/UserObjectClassDetector.java | 4 +-
.../apache/ambari/server/orm/dao/ClusterDAO.java | 18 +
.../server/orm/entities/ClusterConfigEntity.java | 5 +-
.../kerberos/CreatePrincipalsServerAction.java | 19 +-
.../kerberos/IPAKerberosOperationHandler.java | 4 +-
.../upgrades/UpdateDesiredRepositoryAction.java | 4 +-
.../apache/ambari/server/stack/ServiceModule.java | 8 +
.../org/apache/ambari/server/state/Cluster.java | 10 +
.../apache/ambari/server/state/ConfigHelper.java | 8 +-
.../org/apache/ambari/server/state/ConfigImpl.java | 4 +-
.../apache/ambari/server/state/ServiceImpl.java | 34 +-
.../apache/ambari/server/state/ServiceInfo.java | 196 +-
.../ambari/server/state/SingleSignOnInfo.java | 133 ++
.../apache/ambari/server/state/UpgradeHelper.java | 10 +
.../ambari/server/state/alert/AlertTarget.java | 2 +-
.../ambari/server/state/cluster/ClusterImpl.java | 23 +-
.../ambari/server/upgrade/UpgradeCatalog270.java | 388 ++--
ambari-server/src/main/python/ambari-server.py | 10 +-
.../main/python/ambari_server/dbConfiguration.py | 10 +
.../python/ambari_server/dbConfiguration_linux.py | 3 +
.../python/ambari_server/resourceFilesKeeper.py | 2 +-
.../python/ambari_server/serverConfiguration.py | 4 +-
.../src/main/python/ambari_server/serverUpgrade.py | 2 +-
.../src/main/python/ambari_server/setupSso.py | 152 +-
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +-
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 2 +-
.../0.1.0/package/scripts/command_commons.py | 11 +-
.../0.1.0/package/scripts/infra_solr.py | 3 +-
.../0.1.0/package/scripts/setup_infra_solr.py | 101 +-
.../AMBARI_METRICS/0.1.0/package/scripts/params.py | 2 +-
.../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 2 +-
.../HDFS/2.1.0.2.0/package/scripts/namenode.py | 6 -
.../4.0.0.2.0/package/scripts/oozie_service.py | 6 +-
.../2.1.0.2.0/configuration/container-executor.xml | 2 +-
.../2.1.0.2.0/package/scripts/resourcemanager.py | 6 +-
.../resources/custom_actions/scripts/check_host.py | 39 +-
.../custom_actions/scripts/install_packages.py | 38 +-
.../scripts/remove_previous_stacks.py | 4 +-
.../custom_actions/scripts/ru_execute_tasks.py | 4 +-
.../src/main/resources/scripts/stack_advisor.py | 19 +-
.../stack-hooks/after-INSTALL/scripts/params.py | 2 +-
.../2.2/services/YARN/configuration/yarn-site.xml | 6 +-
.../services/YARN/configuration/yarn-site.xml | 6 +-
.../stacks/HDP/2.6/services/stack_advisor.py | 59 +-
.../2.2/services/YARN/configuration/yarn-site.xml | 6 +-
.../main/resources/stacks/ambari_configuration.py | 286 +++
.../src/main/resources/stacks/service_advisor.py | 6 +
.../src/main/resources/stacks/stack_advisor.py | 125 ++
.../ambari/server/agent/TestHeartbeatMonitor.java | 2 -
.../stackadvisor/StackAdvisorHelperTest.java | 20 +-
.../ConfigurationRecommendationCommandTest.java | 2 +-
.../commands/StackAdvisorCommandTest.java | 194 +-
.../AmbariServerConfigurationHandlerTest.java | 67 +
...ComponentConfigurationResourceProviderTest.java | 98 +-
.../server/ldap/AmbariLdapConfigurationTest.java | 52 +-
.../server/ldap/LdapModuleFunctionalTest.java | 22 +-
.../server/ldap/service/AmbariLdapFacadeTest.java | 6 +-
.../DefaultLdapAttributeDetectionServiceTest.java | 10 +-
.../ads/DefaultLdapConfigurationServiceTest.java | 18 +-
...apAuthenticationProviderForDNWithSpaceTest.java | 10 +-
...AuthenticationProviderForDuplicateUserTest.java | 12 +-
.../AmbariLdapAuthenticationProviderTest.java | 16 +-
.../AmbariLdapBindAuthenticatorTest.java | 52 +-
.../authorization/AuthorizationTestModule.java | 4 +-
.../AuthorizationTestModuleForLdapDNWithSpace.java | 6 +-
.../server/security/ldap/LdapPerformanceTest.java | 24 +-
.../ambari/server/stack/ServiceModuleTest.java | 45 +
.../ambari/server/state/ServiceInfoTest.java | 692 +++----
.../server/upgrade/UpgradeCatalog270Test.java | 78 +-
ambari-server/src/test/python/TestSetupSso.py | 283 +++
ambari-server/src/test/python/TestStackAdvisor.py | 10 +-
.../AMBARI_METRICS/test_service_advisor.py | 13 +-
.../common-services/HAWQ/test_service_advisor.py | 15 +-
.../LOGSEARCH/test_service_advisor.py | 13 +-
.../common-services/PXF/test_service_advisor.py | 15 +-
.../python/custom_actions/TestInstallPackages.py | 449 +++--
.../custom_actions/TestRemoveStackVersion.py | 6 +-
.../python/stacks/2.0.6/HBASE/test_hbase_master.py | 19 +-
.../test/python/stacks/2.0.6/HDFS/test_namenode.py | 4 -
.../python/stacks/2.0.6/HIVE/test_mysql_server.py | 5 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 13 +-
.../python/stacks/2.1/common/test_stack_advisor.py | 13 +-
.../python/stacks/2.2/common/test_stack_advisor.py | 15 +-
.../stacks/2.2/common/test_stack_advisor_perf.py | 5 +
.../stacks/2.3/ATLAS/test_metadata_server.py | 4 +-
.../python/stacks/2.3/common/test_stack_advisor.py | 17 +-
.../python/stacks/2.5/ATLAS/test_atlas_server.py | 2 +-
.../python/stacks/2.5/common/test_stack_advisor.py | 20 +-
.../python/stacks/2.6/common/test_stack_advisor.py | 29 +-
.../python/stacks/test_ambari_configuration.py | 308 ++++
.../src/test/python/stacks/test_stack_adviser.py | 8 +-
.../dummy_stack/HIVE/package/.hash | 0
.../ambari/server/upgrade/solrconfig-v500.xml.j2 | 1888 ++++++++++++++++++++
ambari-serviceadvisor/pom.xml | 6 -
.../serviceadvisor/ServiceAdvisorCommandType.java | 2 +
ambari-utility/pom.xml | 2 -
ambari-web/app/app.js | 2 +-
.../app/controllers/global/cluster_controller.js | 1 +
.../app/controllers/global/update_controller.js | 76 +-
ambari-web/app/controllers/main/service/item.js | 2 +-
.../data/configs/wizards/kerberos_identities.js | 28 +
ambari-web/app/data/dashboard_widgets.js | 18 +-
ambari-web/app/mappers/service_metrics_mapper.js | 93 +-
ambari-web/app/messages.js | 1 +
ambari-web/app/mixins.js | 1 +
.../main/dashboard/widgets/namenode_widget.js} | 13 +-
ambari-web/app/models/host_component.js | 4 +-
ambari-web/app/models/service/hdfs.js | 81 +-
ambari-web/app/routes/add_service_routes.js | 2 +-
ambari-web/app/styles/application.less | 2 +-
ambari-web/app/styles/dashboard.less | 9 +
ambari-web/app/styles/service_configurations.less | 14 +
.../common/configs/overriddenProperty.hbs | 2 +-
.../common/modal_popups/select_groups_popup.hbs | 8 +-
.../app/templates/main/dashboard/widgets.hbs | 43 +-
.../main/dashboard/widgets/hdfs_links.hbs | 9 +-
.../main/service/info/summary/hdfs/widgets.hbs | 116 ++
.../service/info/summary/master_components.hbs | 3 +
.../app/templates/main/service/services/hdfs.hbs | 104 +-
ambari-web/app/utils/stomp_client.js | 32 +-
ambari-web/app/views.js | 1 +
ambari-web/app/views/common/chart/linear_time.js | 7 -
.../app/views/common/quick_view_link_view.js | 19 +-
ambari-web/app/views/main/dashboard/widgets.js | 232 ++-
.../main/dashboard/widgets/hbase_master_heap.js | 9 +-
.../main/dashboard/widgets/hbase_master_uptime.js | 2 +-
.../views/main/dashboard/widgets/hdfs_capacity.js | 22 +-
.../app/views/main/dashboard/widgets/hdfs_links.js | 21 +-
.../views/main/dashboard/widgets/namenode_cpu.js | 27 +-
.../views/main/dashboard/widgets/namenode_heap.js | 12 +-
.../views/main/dashboard/widgets/namenode_rpc.js | 14 +-
.../main/dashboard/widgets/namenode_uptime.js | 4 +-
.../main/dashboard/widgets/pie_chart_widget.js | 14 +-
.../dashboard/widgets/resource_manager_heap.js | 8 +-
.../dashboard/widgets/resource_manager_uptime.js | 2 +-
.../main/dashboard/widgets/uptime_text_widget.js | 9 +-
.../views/main/dashboard/widgets/yarn_memory.js | 4 +-
ambari-web/app/views/main/service/info/summary.js | 5 +-
.../main/service/info/summary/hdfs/widgets.js | 164 ++
ambari-web/app/views/main/service/services/hdfs.js | 119 --
ambari-web/test/utils/stomp_client_test.js | 6 +
.../test/views/common/chart/linear_time_test.js | 4 -
.../test/views/common/quick_link_view_test.js | 22 +
.../test/views/main/dashboard/widget_test.js | 3 +-
.../main/dashboard/widgets/namenode_rpc_test.js | 21 +-
.../dashboard/widgets/pie_chart_widget_test.js | 4 +-
.../dashboard/widgets/uptime_text_widget_test.js | 2 +-
.../test/views/main/dashboard/widgets_test.js | 18 +-
.../test/views/main/service/services/hdfs_test.js | 171 --
.../ONEFS/1.0.0/configuration/hdfs-site.xml | 21 +
.../addon-services/ONEFS/1.0.0/kerberos.json | 3 +-
.../addon-services/ONEFS/1.0.0/metainfo.xml | 1 +
.../addon-services/ONEFS/1.0.0/service_advisor.py | 18 +
.../resources/ui/app/components/dataset-config.js | 8 +
.../coordinator/coordinator-xml-generator.js | 2 +-
.../domain/coordinator/coordinator-xml-importer.js | 5 +-
.../ui/app/templates/components/dataset-config.hbs | 20 +
dev-support/docker/centos7/Dockerfile | 1 +
pom.xml | 1 +
272 files changed, 10470 insertions(+), 4754 deletions(-)
--
To stop receiving notification emails like this one, please contact
swapan@apache.org.