You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/06/14 21:19:57 UTC
[26/26] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5b9454ef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5b9454ef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5b9454ef
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 5b9454ef4cd7483872938b01872ad0646c242571
Parents: f09670d 192162e
Author: Robert Levas <rl...@hortonworks.com>
Authored: Wed Jun 14 17:19:17 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Wed Jun 14 17:19:17 2017 -0400
----------------------------------------------------------------------
.../test/python/ambari_agent/TestHostInfo.py | 107 +++++++++
ambari-client/groovy-client/pom.xml | 2 +
.../libraries/functions/conf_select.py | 1 -
.../libraries/functions/hive_check.py | 5 +-
.../libraries/functions/packages_analyzer.py | 53 ++++-
.../providers/modify_properties_file.py | 9 +-
.../libraries/script/script.py | 25 ++-
ambari-funtest/pom.xml | 2 +
ambari-infra/ambari-infra-solr-client/pom.xml | 2 +
.../ambari-logsearch-config-api/pom.xml | 2 +-
.../ambari-logsearch-config-zookeeper/pom.xml | 2 +-
ambari-logsearch/ambari-logsearch-it/pom.xml | 4 +-
.../ambari-logsearch-logfeeder/pom.xml | 4 +-
.../logfeeder/common/LogFeederConstants.java | 2 +-
.../ambari/logsearch/conf/SecurityConfig.java | 18 +-
.../ambari/logsearch/conf/SolrConfig.java | 12 +-
.../conf/SolrEventHistoryPropsConfig.java | 116 ++++++++++
.../logsearch/conf/SolrUserPropsConfig.java | 116 ----------
.../conf/global/SolrEventHistoryState.java | 60 +++++
.../conf/global/SolrUserConfigState.java | 60 -----
.../EventHistoryRequestQueryConverter.java | 67 ++++++
.../UserConfigRequestQueryConverter.java | 67 ------
.../logsearch/dao/EventHistorySolrDao.java | 117 ++++++++++
.../logsearch/dao/SolrSchemaFieldDao.java | 8 +-
.../ambari/logsearch/dao/UserConfigSolrDao.java | 117 ----------
.../ambari/logsearch/doc/DocConstants.java | 12 +-
.../logsearch/manager/EventHistoryManager.java | 199 +++++++++++++++++
.../logsearch/manager/UserConfigManager.java | 199 -----------------
.../request/EventHistoryParamDefinition.java | 38 ++++
.../request/UserConfigParamDefinition.java | 38 ----
.../model/request/impl/EventHistoryRequest.java | 53 +++++
.../model/request/impl/UserConfigRequest.java | 53 -----
.../model/response/EventHistoryData.java | 97 ++++++++
.../response/EventHistoryDataListResponse.java | 55 +++++
.../model/response/UserConfigData.java | 97 --------
.../response/UserConfigDataListResponse.java | 55 -----
.../logsearch/rest/EventHistoryResource.java | 82 +++++++
.../ambari/logsearch/rest/StatusResource.java | 16 +-
.../logsearch/rest/UserConfigResource.java | 82 -------
.../ambari/logsearch/solr/SolrConstants.java | 4 +-
.../LogsearchEventHistoryStateFilter.java | 52 +++++
.../filters/LogsearchUserConfigStateFilter.java | 52 -----
.../EventHistoryRequestQueryConverterTest.java | 50 +++++
.../UserConfigRequestQueryConverterTest.java | 50 -----
.../collection_bases/VEventHistoryListBase.js | 8 +-
.../scripts/model_bases/VUserFilterBase.js | 2 +-
.../main/webapp/scripts/views/common/Header.js | 2 +-
.../ambari-metrics-timelineservice/pom.xml | 4 +-
ambari-project/pom.xml | 47 +++-
ambari-server/checkstyle.xml | 4 +
ambari-server/pom.xml | 37 +++-
.../actionmanager/ExecutionCommandWrapper.java | 65 +++---
.../ambari/server/agent/ExecutionCommand.java | 57 +++--
.../server/api/services/ClusterService.java | 2 +-
.../server/api/services/ServiceService.java | 3 +-
.../stackadvisor/StackAdvisorHelper.java | 74 +++++--
.../stackadvisor/StackAdvisorRunner.java | 207 +++++++++++------
.../ComponentLayoutRecommendationCommand.java | 5 +-
.../ComponentLayoutValidationCommand.java | 11 +-
...rationDependenciesRecommendationCommand.java | 11 +-
.../ConfigurationRecommendationCommand.java | 11 +-
.../ConfigurationValidationCommand.java | 11 +-
.../commands/StackAdvisorCommand.java | 15 +-
.../AmbariCustomCommandExecutionHelper.java | 4 +-
.../AmbariManagementControllerImpl.java | 2 -
.../server/controller/AuthToLocalBuilder.java | 10 +-
.../ambari/server/orm/dao/HostVersionDAO.java | 16 ++
.../server/orm/entities/HostVersionEntity.java | 5 +
.../ServiceComponentDesiredStateEntity.java | 2 +-
.../upgrades/FinalizeUpgradeAction.java | 57 ++++-
.../ambari/server/stack/ServiceModule.java | 4 +
.../server/state/RepositoryVersionState.java | 31 ++-
.../apache/ambari/server/state/ServiceImpl.java | 2 +-
.../apache/ambari/server/state/ServiceInfo.java | 26 ++-
.../server/upgrade/UpgradeCatalog300.java | 13 +-
.../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 +-
.../KAFKA/0.10.0.3.0/kerberos.json | 3 +
.../common-services/KAFKA/0.10.0/kerberos.json | 3 +
.../common-services/KAFKA/0.9.0/kerberos.json | 3 +
.../0.4.0/package/scripts/ranger_admin.py | 11 +-
.../0.4.0/package/scripts/setup_ranger_xml.py | 13 ++
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 8 +
.../0.5.0.2.3/package/scripts/kms_server.py | 10 +-
.../STORM/0.9.1/package/scripts/params_linux.py | 2 -
.../1.0.1.3.0/package/scripts/params_linux.py | 2 -
.../custom_actions/scripts/install_packages.py | 25 +--
.../configuration/spark-thrift-sparkconf.xml | 40 ++++
.../configuration/spark2-thrift-sparkconf.xml | 40 ++++
.../YARN/configuration-mapred/mapred-site.xml | 2 +-
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 24 ++
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 26 ++-
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 32 ++-
.../src/main/resources/stacks/stack_advisor.py | 115 +---------
.../stackadvisor/StackAdvisorHelperTest.java | 63 ++++--
.../stackadvisor/StackAdvisorRunnerTest.java | 10 +-
.../ConfigurationRecommendationCommandTest.java | 3 +-
.../commands/StackAdvisorCommandTest.java | 47 ++--
.../AmbariCustomCommandExecutionHelperTest.java | 11 +-
.../upgrades/UpgradeActionTest.java | 109 ++++++++-
.../ambari/server/stack/ServiceModuleTest.java | 31 +++
.../custom_actions/TestInstallPackages.py | 202 +++++++----------
.../configs/install_packages_config.json | 19 +-
.../stacks/2.0.6/HBASE/test_hbase_master.py | 11 +-
.../2.0.6/HIVE/test_hive_service_check.py | 14 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 153 -------------
.../stacks/2.0.6/configs/hbase_with_phx.json | 12 +
.../stacks/2.2/RANGER/test_ranger_admin.py | 8 +
.../stacks/2.5/RANGER/test_ranger_admin.py | 10 +
.../stacks/2.5/RANGER_KMS/test_kms_server.py | 10 +
.../stacks/2.6/RANGER/test_ranger_admin.py | 10 +
ambari-views/examples/weather-view/pom.xml | 2 +-
ambari-web/app/app.js | 8 +-
.../controllers/global/cluster_controller.js | 2 +-
.../global/user_settings_controller.js | 3 +
.../main/admin/stack_and_upgrade_controller.js | 6 +-
ambari-web/app/data/controller_route.js | 2 +-
.../app/mappers/repository_version_mapper.js | 2 +-
ambari-web/app/messages.js | 4 +-
.../models/stack_version/repository_version.js | 2 +-
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../stack_upgrade/upgrade_version_box_view.js | 8 +-
.../upgrade_version_column_view.js | 2 +-
.../admin/stack_upgrade/upgrade_wizard_view.js | 2 +-
.../main/admin/stack_upgrade/versions_view.js | 2 +-
ambari-web/app/views/main/dashboard/widgets.js | 2 +-
ambari-web/test/app_test.js | 10 +-
.../admin/stack_and_upgrade_controller_test.js | 18 +-
.../test/controllers/wizard/step8_test.js | 4 +-
.../upgrade_version_box_view_test.js | 28 +--
.../stack_upgrade/upgrade_wizard_view_test.js | 2 +-
.../admin/stack_upgrade/version_view_test.js | 6 +-
.../test/views/main/dashboard/widgets_test.js | 4 +-
.../stacks/HDF/2.0/services/KAFKA/kerberos.json | 3 +
contrib/views/hawq/pom.xml | 2 +-
contrib/views/hive-next/pom.xml | 4 +-
contrib/views/hive20/pom.xml | 4 +-
contrib/views/pig/pom.xml | 2 +-
contrib/views/tez/pom.xml | 3 +-
contrib/views/wfmanager/pom.xml | 1 +
docs/pom.xml | 12 +
pom.xml | 17 +-
serviceadvisor/pom.xml | 103 +++++++++
.../ambari/serviceadvisor/ServiceAdvisor.java | 147 ++++++++++++
.../ServiceAdvisorCommandType.java | 63 ++++++
utility/pom.xml | 41 ++++
.../ambari/swagger/AmbariSwaggerReader.java | 222 +++++++++++++++++++
.../ambari/swagger/AmbariSwaggerReaderTest.java | 182 +++++++++++++++
utility/src/test/resources/log4j.properties | 19 ++
153 files changed, 3214 insertions(+), 1836 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b9454ef/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b9454ef/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b9454ef/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b9454ef/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b9454ef/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5b9454ef/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------