Merge remote-tracking branch 'origin/trunk' into branch-feature-AMBARI-14714
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/67cacc8a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/67cacc8a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/67cacc8a Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 67cacc8ab5c232bf0c6786ebd4263cde7e1f4c66 Parents: 89bb02c c9ced87 Author: Jayush Luniya <jlun...@hortonworks.com> Authored: Wed Aug 9 08:54:59 2017 -0700 Committer: Jayush Luniya <jlun...@hortonworks.com> Committed: Wed Aug 9 08:54:59 2017 -0700 ---------------------------------------------------------------------- .../resource_management/core/files/killtree.sh | 2 +- .../resource_management/core/resources/klist.py | 45 + .../libraries/functions/check_process_status.py | 20 + .../libraries/functions/conf_select.py | 213 +--- .../libraries/functions/constants.py | 2 + .../libraries/functions/stack_select.py | 169 ++- .../libraries/functions/stack_tools.py | 15 +- .../libraries/functions/version.py | 17 +- .../libraries/script/script.py | 25 +- .../upgrades/upgrade_nonrolling_new_stack.xml | 6 +- .../2.1.1/upgrades/upgrade_test_nonrolling.xml | 4 +- .../logsearch/config/api/LogSearchConfig.java | 94 -- .../config/api/LogSearchConfigFactory.java | 61 +- .../config/api/LogSearchConfigLogFeeder.java | 77 ++ .../config/api/LogSearchConfigServer.java | 111 ++ .../config/api/OutputConfigMonitor.java | 44 + .../model/outputconfig/OutputProperties.java | 23 + .../outputconfig/OutputSolrProperties.java | 26 + .../config/api/LogSearchConfigClass1.java | 78 -- .../config/api/LogSearchConfigClass2.java | 78 -- .../config/api/LogSearchConfigFactoryTest.java | 51 +- .../api/LogSearchConfigLogFeederClass1.java | 58 + .../api/LogSearchConfigLogFeederClass2.java | 58 + .../config/api/LogSearchConfigServerClass1.java | 76 ++ .../config/api/LogSearchConfigServerClass2.java | 76 ++ .../zookeeper/LogSearchConfigLogFeederZK.java | 228 ++++ .../zookeeper/LogSearchConfigServerZK.java | 138 +++ .../config/zookeeper/LogSearchConfigZK.java | 236 +--- .../impl/OutputSolrPropertiesImpl.java | 46 + .../ambari-logsearch-logfeeder/build.properties | 2 +- .../org/apache/ambari/logfeeder/LogFeeder.java | 22 +- .../ambari/logfeeder/common/ConfigHandler.java | 38 +- .../logfeeder/common/LogEntryParseTester.java | 2 +- .../logfeeder/input/AbstractInputFile.java | 4 +- .../apache/ambari/logfeeder/input/Input.java | 70 +- .../logfeeder/input/InputConfigUploader.java | 27 +- .../ambari/logfeeder/input/InputManager.java | 28 +- .../ambari/logfeeder/input/InputSimulate.java | 78 +- .../loglevelfilter/LogLevelFilterHandler.java | 29 +- .../logfeeder/metrics/LogFeederAMSClient.java | 45 +- .../apache/ambari/logfeeder/output/Output.java | 36 +- .../ambari/logfeeder/output/OutputHDFSFile.java | 3 +- .../ambari/logfeeder/output/OutputManager.java | 11 + .../ambari/logfeeder/output/OutputS3File.java | 3 +- .../ambari/logfeeder/output/OutputSolr.java | 223 ++-- .../logfeeder/util/LogFeederPropertiesUtil.java | 498 ++++++++ .../ambari/logfeeder/util/LogFeederUtil.java | 165 +-- .../apache/ambari/logfeeder/util/SSLUtil.java | 14 +- .../logconfig/LogConfigHandlerTest.java | 4 +- .../logfeeder/metrics/MetricsManagerTest.java | 4 +- .../ambari/logfeeder/output/OutputSolrTest.java | 29 +- .../ambari-logsearch-server/build.properties | 2 +- .../ambari-logsearch-server/pom.xml | 455 ++----- ambari-logsearch/ambari-logsearch-server/run.sh | 6 +- .../org/apache/ambari/logsearch/LogSearch.java | 181 +-- .../logsearch/common/ExternalServerClient.java | 24 +- .../logsearch/common/LogSearchConstants.java | 2 +- .../logsearch/common/PropertiesHelper.java | 124 -- .../logsearch/common/XMLPropertiesHelper.java | 79 -- .../ambari/logsearch/conf/ApiDocConfig.java | 4 +- .../logsearch/conf/ApplicationConfig.java | 2 - .../conf/LogSearchConfigMapHolder.java | 61 + .../logsearch/conf/LogSearchHttpConfig.java | 83 ++ .../conf/LogSearchJerseyResourceConfig.java | 37 + .../logsearch/conf/LogSearchServletConfig.java | 95 ++ .../logsearch/conf/LogSearchSpnegoConfig.java | 173 +++ .../logsearch/conf/LogSearchSslConfig.java | 86 ++ .../ambari/logsearch/conf/SecurityConfig.java | 3 + .../logsearch/conf/SolrAuditLogPropsConfig.java | 5 + .../conf/SolrEventHistoryPropsConfig.java | 5 + .../ambari/logsearch/conf/SolrPropsConfig.java | 2 + .../conf/SolrServiceLogPropsConfig.java | 5 + .../conf/StaticResourceConfiguration.java | 49 + .../configurer/LogSearchConfigConfigurer.java | 24 +- .../configurer/SolrAuditAliasConfigurer.java | 4 +- .../configurer/SolrCollectionConfigurer.java | 13 +- .../logsearch/configurer/SslConfigurer.java | 363 ++++++ .../ambari/logsearch/dao/SolrDaoBase.java | 22 +- .../logsearch/dao/SolrSchemaFieldDao.java | 3 +- .../handler/AbstractSolrConfigHandler.java | 2 + .../handler/CreateCollectionHandler.java | 44 +- .../handler/ReloadCollectionHandler.java | 5 +- .../logsearch/manager/ShipperConfigManager.java | 24 +- .../logsearch/model/common/LSServerFilter.java | 10 +- .../logsearch/solr/ResponseDataGenerator.java | 3 +- .../apache/ambari/logsearch/util/SSLUtil.java | 388 ------ .../apache/ambari/logsearch/util/WebUtil.java | 65 - .../LogsearchKRBAuthenticationFilter.java | 107 +- .../web/listener/LogSearchSessionListener.java | 4 +- .../logsearch/web/security/LdapProperties.java | 365 ------ .../web/security/LdapPropertyName.java | 58 - .../ambari/logsearch/web/security/LdapUtil.java | 115 -- ...LogsearchAbstractAuthenticationProvider.java | 2 +- .../LogsearchAuthenticationProvider.java | 4 - .../LogsearchLdapAuthenticationProvider.java | 187 --- .../LogsearchLdapBindAuthenticator.java | 46 - .../src/main/resources/default.properties | 1 - .../src/main/resources/log4j.xml | 118 +- .../src/main/resources/logsearch-admin-site.xml | 116 -- .../src/main/resources/logsearch.properties | 6 +- .../src/main/resources/swagger/swagger.html | 36 +- .../src/main/scripts/run.sh | 3 +- .../LogsearchAuthenticationProviderTest.java | 68 +- ...LogsearchLdapAuthenticationProviderTest.java | 61 - .../ambari-logsearch-web/build.properties | 2 +- ambari-logsearch/ambari-logsearch-web/pom.xml | 4 +- ambari-logsearch/docker/logsearch-docker.sh | 4 +- .../logfeeder/shipper-conf/output.config.json | 10 +- .../docker/test-config/logsearch/log4j.xml | 35 +- .../test-config/logsearch/logsearch-env.sh | 5 +- .../logsearch/logsearch-https.properties | 1 + .../ambari-metrics/datasource.js | 35 +- .../MetricCollectorHAController.java | 42 +- ambari-server/pom.xml | 2 +- .../ambari/server/agent/HeartBeatHandler.java | 10 +- .../ambari/server/agent/HeartbeatProcessor.java | 34 +- .../api/services/WidgetLayoutService.java | 1 - .../checks/DatabaseConsistencyCheckHelper.java | 2 - .../checks/HostsRepositoryVersionCheck.java | 13 +- .../AmbariCustomCommandExecutionHelper.java | 18 + .../AmbariManagementControllerImpl.java | 91 +- .../server/controller/AuthToLocalBuilder.java | 328 +++-- .../server/controller/ClusterRequest.java | 16 - .../server/controller/KerberosHelperImpl.java | 205 +--- .../server/controller/PrereqCheckRequest.java | 27 +- .../server/controller/ServiceRequest.java | 24 +- .../server/controller/ServiceResponse.java | 18 +- .../BlueprintConfigurationProcessor.java | 23 +- .../internal/ClusterResourceProvider.java | 6 - .../ClusterStackVersionResourceProvider.java | 22 +- .../internal/HostResourceProvider.java | 82 +- .../PreUpgradeCheckResourceProvider.java | 9 + .../internal/RequestResourceProvider.java | 4 +- .../internal/ServiceResourceProvider.java | 79 +- .../internal/UpgradeResourceProvider.java | 33 +- .../VersionDefinitionResourceProvider.java | 4 +- .../LoggingRequestHelperFactoryImpl.java | 19 +- .../apache/ambari/server/orm/DBAccessor.java | 10 + .../ambari/server/orm/DBAccessorImpl.java | 7 + .../HostComponentDesiredStateEntity.java | 14 - .../orm/entities/HostComponentStateEntity.java | 13 - .../orm/entities/ServiceDesiredStateEntity.java | 13 - .../server/orm/entities/UpgradeEntity.java | 22 + .../pam/PamAuthenticationFactory.java | 35 + .../AmbariPamAuthenticationProvider.java | 5 +- .../kerberos/FinalizeKerberosServerAction.java | 39 - .../PrepareDisableKerberosServerAction.java | 8 +- .../upgrades/FinalizeUpgradeAction.java | 59 +- .../upgrades/UpdateDesiredRepositoryAction.java | 189 +++ .../upgrades/UpdateDesiredStackAction.java | 189 --- .../apache/ambari/server/stack/StackModule.java | 3 + .../ambari/server/state/ConfigHelper.java | 16 +- .../ambari/server/state/RepositoryType.java | 32 +- .../ambari/server/state/SecurityState.java | 83 -- .../org/apache/ambari/server/state/Service.java | 20 +- .../server/state/ServiceComponentHost.java | 39 - .../apache/ambari/server/state/ServiceImpl.java | 33 +- .../ambari/server/state/UpgradeContext.java | 295 +++-- .../ambari/server/state/UpgradeHelper.java | 43 +- .../ambari/server/state/quicklinks/Port.java | 15 + .../state/repository/AvailableVersion.java | 21 +- .../state/repository/ClusterVersionSummary.java | 56 + .../state/repository/ManifestService.java | 10 +- .../ambari/server/state/repository/Release.java | 2 +- .../state/repository/ServiceVersionSummary.java | 79 ++ .../state/repository/VersionDefinitionXml.java | 148 ++- .../state/stack/upgrade/ClusterGrouping.java | 2 +- .../svccomphost/ServiceComponentHostImpl.java | 60 - .../ambari/server/topology/AmbariContext.java | 28 +- .../ambari/server/topology/TopologyManager.java | 6 +- .../server/upgrade/FinalUpgradeCatalog.java | 4 +- .../server/upgrade/UpgradeCatalog300.java | 81 +- .../src/main/python/azuredb_create_generator.py | 2 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 4 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 4 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 4 +- .../resources/Ambari-DDL-Postgres-CREATE.sql | 4 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 4 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 4 +- .../package/scripts/accumulo_client.py | 7 +- .../package/scripts/accumulo_script.py | 36 +- .../HDF/grafana-nifi-hosts.json | 17 +- .../0.1.0/package/scripts/params_linux.py | 6 + .../0.1.0.2.3/package/scripts/atlas_client.py | 8 +- .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 22 + .../package/scripts/metadata_server.py | 9 +- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 3 +- .../0.7.0.3.0/package/scripts/atlas_client.py | 8 +- .../package/scripts/metadata_server.py | 8 +- .../DRUID/0.9.2/package/scripts/druid.py | 6 + .../DRUID/0.9.2/package/scripts/druid_node.py | 9 +- .../DRUID/0.9.2/package/scripts/params.py | 13 + .../DRUID/0.9.2/package/scripts/superset.py | 8 +- .../0.5.0.2.1/package/scripts/falcon_client.py | 8 +- .../0.5.0.2.1/package/scripts/falcon_server.py | 7 +- .../1.4.0.2.0/package/scripts/flume_handler.py | 8 +- .../0.96.0.2.0/configuration/hbase-env.xml | 4 +- .../0.96.0.2.0/package/scripts/hbase_client.py | 18 +- .../0.96.0.2.0/package/scripts/hbase_master.py | 5 +- .../package/scripts/hbase_regionserver.py | 5 +- .../0.96.0.2.0/package/scripts/params_linux.py | 3 + .../package/scripts/phoenix_queryserver.py | 11 +- .../HBASE/0.96.0.2.0/package/scripts/upgrade.py | 7 +- .../HBASE/2.0.0.3.0/configuration/hbase-env.xml | 4 +- .../2.0.0.3.0/package/scripts/hbase_client.py | 16 +- .../2.0.0.3.0/package/scripts/hbase_master.py | 5 +- .../package/scripts/hbase_regionserver.py | 5 +- .../package/scripts/phoenix_queryserver.py | 8 +- .../HBASE/2.0.0.3.0/package/scripts/upgrade.py | 7 +- .../HDFS/2.1.0.2.0/package/scripts/datanode.py | 11 +- .../2.1.0.2.0/package/scripts/hdfs_client.py | 8 +- .../2.1.0.2.0/package/scripts/journalnode.py | 8 +- .../HDFS/2.1.0.2.0/package/scripts/namenode.py | 14 +- .../2.1.0.2.0/package/scripts/nfsgateway.py | 8 +- .../2.1.0.2.0/package/scripts/params_linux.py | 5 +- .../2.1.0.2.0/package/scripts/params_windows.py | 2 +- .../HDFS/2.1.0.2.0/package/scripts/snamenode.py | 8 +- .../HDFS/2.1.0.2.0/package/scripts/utils.py | 17 + .../2.1.0.2.0/package/scripts/zkfc_slave.py | 12 +- .../HDFS/3.0.0.3.0/package/scripts/datanode.py | 11 +- .../3.0.0.3.0/package/scripts/hdfs_client.py | 8 +- .../3.0.0.3.0/package/scripts/journalnode.py | 8 +- .../HDFS/3.0.0.3.0/package/scripts/namenode.py | 11 +- .../3.0.0.3.0/package/scripts/nfsgateway.py | 7 +- .../3.0.0.3.0/package/scripts/params_linux.py | 2 +- .../3.0.0.3.0/package/scripts/params_windows.py | 2 +- .../HDFS/3.0.0.3.0/package/scripts/snamenode.py | 8 +- .../HDFS/3.0.0.3.0/package/scripts/utils.py | 16 + .../3.0.0.3.0/package/scripts/zkfc_slave.py | 12 +- .../0.12.0.2.0/package/scripts/hcat_client.py | 8 +- .../0.12.0.2.0/package/scripts/hive_client.py | 9 +- .../package/scripts/hive_metastore.py | 8 +- .../0.12.0.2.0/package/scripts/hive_server.py | 7 +- .../package/scripts/hive_server_interactive.py | 8 +- .../0.12.0.2.0/package/scripts/params_linux.py | 4 +- .../package/scripts/webhcat_server.py | 10 +- .../2.1.0.3.0/package/scripts/hcat_client.py | 9 +- .../2.1.0.3.0/package/scripts/hive_client.py | 9 +- .../2.1.0.3.0/package/scripts/hive_metastore.py | 8 +- .../2.1.0.3.0/package/scripts/hive_server.py | 7 +- .../package/scripts/hive_server_interactive.py | 7 +- .../2.1.0.3.0/package/scripts/webhcat_server.py | 9 +- .../ranger-kafka-plugin-properties.xml | 6 + .../0.10.0.3.0/package/scripts/kafka_broker.py | 9 +- .../KAFKA/0.10.0.3.0/service_advisor.py | 5 + .../KAFKA/0.8.1/package/scripts/kafka_broker.py | 11 +- .../ranger-kafka-plugin-properties.xml | 6 + .../KERBEROS/1.10.3-10/metainfo.xml | 8 + .../package/scripts/kerberos_client.py | 3 + .../package/scripts/kerberos_common.py | 50 +- .../0.5.0.2.2/package/scripts/knox_gateway.py | 9 +- .../0.5.0.3.0/package/scripts/knox_gateway.py | 9 +- .../common-services/LOGSEARCH/0.5.0/alerts.json | 6 +- .../0.5.0/configuration/logsearch-env.xml | 14 - .../configuration/logsearch-properties.xml | 21 + .../LOGSEARCH/0.5.0/package/scripts/params.py | 13 +- .../0.5.0/properties/logsearch-env.sh.j2 | 2 - .../0.5.0/properties/output.config.json.j2 | 8 +- .../LOGSEARCH/0.5.0/quicklinks/quicklinks.json | 10 +- .../LOGSEARCH/0.5.0/service_advisor.py | 33 +- .../1.0.0.2.3/package/scripts/mahout_client.py | 9 +- .../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 8 +- .../4.0.0.2.0/package/scripts/oozie_client.py | 8 +- .../4.0.0.2.0/package/scripts/oozie_server.py | 13 +- .../package/scripts/oozie_server_upgrade.py | 2 +- .../4.0.0.2.0/package/scripts/params_linux.py | 2 + .../OOZIE/4.2.0.2.3/quicklinks/quicklinks.json | 9 +- .../4.2.0.3.0/package/scripts/oozie_client.py | 8 +- .../4.2.0.3.0/package/scripts/oozie_server.py | 12 +- .../OOZIE/4.2.0.3.0/quicklinks/quicklinks.json | 9 +- .../0.12.0.2.0/package/scripts/pig_client.py | 9 +- .../0.16.1.3.0/package/scripts/pig_client.py | 9 +- .../RANGER/0.4.0/package/scripts/params.py | 5 +- .../0.4.0/package/scripts/ranger_admin.py | 13 +- .../0.4.0/package/scripts/ranger_tagsync.py | 13 +- .../0.4.0/package/scripts/ranger_usersync.py | 7 +- .../0.4.0/package/scripts/setup_ranger_xml.py | 6 + .../RANGER/0.4.0/package/scripts/upgrade.py | 31 - .../1.0.0.3.0/package/scripts/ranger_admin.py | 9 +- .../1.0.0.3.0/package/scripts/ranger_tagsync.py | 11 +- .../package/scripts/ranger_usersync.py | 5 +- .../RANGER/1.0.0.3.0/package/scripts/upgrade.py | 6 +- .../0.5.0.2.3/package/scripts/kms_server.py | 6 +- .../0.5.0.2.3/package/scripts/params.py | 5 +- .../0.5.0.2.3/package/scripts/upgrade.py | 30 - .../1.0.0.3.0/package/scripts/kms_server.py | 5 +- .../1.0.0.3.0/package/scripts/upgrade.py | 5 +- .../0.60.0.2.2/package/scripts/slider_client.py | 14 +- .../0.91.0.3.0/package/scripts/slider_client.py | 14 +- .../1.2.1/package/scripts/job_history_server.py | 8 +- .../SPARK/1.2.1/package/scripts/livy_server.py | 8 +- .../SPARK/1.2.1/package/scripts/params.py | 6 +- .../SPARK/1.2.1/package/scripts/spark_client.py | 9 +- .../package/scripts/spark_thrift_server.py | 8 +- .../2.2.0/package/scripts/job_history_server.py | 9 +- .../SPARK/2.2.0/package/scripts/livy_server.py | 9 +- .../SPARK/2.2.0/package/scripts/spark_client.py | 9 +- .../package/scripts/spark_thrift_server.py | 9 +- .../2.0.0/package/scripts/job_history_server.py | 8 +- .../2.0.0/package/scripts/livy2_server.py | 10 +- .../SPARK2/2.0.0/package/scripts/params.py | 3 +- .../2.0.0/package/scripts/spark_client.py | 8 +- .../package/scripts/spark_thrift_server.py | 8 +- .../1.4.4.2.0/package/scripts/service_check.py | 3 - .../1.4.4.2.0/package/scripts/sqoop_client.py | 9 +- .../1.4.4.3.0/package/scripts/service_check.py | 3 - .../1.4.4.3.0/package/scripts/sqoop_client.py | 9 +- .../STORM/0.9.1/package/scripts/drpc_server.py | 7 +- .../STORM/0.9.1/package/scripts/nimbus.py | 9 +- .../STORM/0.9.1/package/scripts/nimbus_prod.py | 8 +- .../STORM/0.9.1/package/scripts/pacemaker.py | 7 +- .../STORM/0.9.1/package/scripts/rest_api.py | 3 - .../STORM/0.9.1/package/scripts/supervisor.py | 8 +- .../0.9.1/package/scripts/supervisor_prod.py | 8 +- .../STORM/0.9.1/package/scripts/ui_server.py | 7 +- .../1.0.1.3.0/package/scripts/drpc_server.py | 7 +- .../STORM/1.0.1.3.0/package/scripts/nimbus.py | 8 +- .../1.0.1.3.0/package/scripts/nimbus_prod.py | 8 +- .../1.0.1.3.0/package/scripts/pacemaker.py | 7 +- .../STORM/1.0.1.3.0/package/scripts/rest_api.py | 3 - .../1.0.1.3.0/package/scripts/supervisor.py | 8 +- .../package/scripts/supervisor_prod.py | 8 +- .../1.0.1.3.0/package/scripts/ui_server.py | 7 +- .../TEZ/0.4.0.2.1/package/scripts/tez_client.py | 11 +- .../TEZ/0.9.0.3.0/package/scripts/tez_client.py | 9 +- .../scripts/application_timeline_server.py | 8 +- .../2.1.0.2.0/package/scripts/historyserver.py | 8 +- .../package/scripts/mapreduce2_client.py | 11 +- .../2.1.0.2.0/package/scripts/nodemanager.py | 8 +- .../2.1.0.2.0/package/scripts/params_linux.py | 4 +- .../package/scripts/resourcemanager.py | 7 +- .../2.1.0.2.0/package/scripts/yarn_client.py | 8 +- .../scripts/application_timeline_server.py | 8 +- .../3.0.0.3.0/package/scripts/historyserver.py | 8 +- .../package/scripts/mapreduce2_client.py | 9 +- .../3.0.0.3.0/package/scripts/nodemanager.py | 8 +- .../package/scripts/resourcemanager.py | 7 +- .../3.0.0.3.0/package/scripts/yarn_client.py | 8 +- .../0.6.0.2.5/package/scripts/master.py | 7 +- .../0.6.0.2.5/package/scripts/params.py | 3 +- .../0.6.0.3.0/package/scripts/master.py | 7 +- .../3.4.5/package/scripts/zookeeper_client.py | 7 +- .../3.4.5/package/scripts/zookeeper_server.py | 7 +- .../custom_actions/scripts/install_packages.py | 4 - .../custom_actions/scripts/ru_set_all.py | 32 - .../0.8/services/HDFS/package/scripts/params.py | 2 +- .../0.8/services/HDFS/package/scripts/utils.py | 3 + .../HDP/2.0.6/configuration/cluster-env.xml | 15 + .../2.0.6/hooks/after-INSTALL/scripts/hook.py | 2 +- .../2.0.6/hooks/after-INSTALL/scripts/params.py | 6 +- .../scripts/shared_initialization.py | 43 +- .../2.0.6/hooks/before-ANY/scripts/params.py | 4 + .../before-START/scripts/custom_extensions.py | 174 +++ .../2.0.6/hooks/before-START/scripts/hook.py | 3 + .../2.0.6/hooks/before-START/scripts/params.py | 23 +- .../HDP/2.0.6/properties/stack_features.json | 10 + .../HDP/2.0.6/properties/stack_packages.json | 1146 ++++++++++++++++++ .../services/OOZIE/quicklinks/quicklinks.json | 9 +- .../services/OOZIE/quicklinks/quicklinks.json | 9 +- .../stacks/HDP/2.3/services/stack_advisor.py | 5 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 6 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 7 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 7 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 7 +- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 1 + .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 1 + .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 6 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 6 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 +- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 1 + .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 + .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 6 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 +- .../stacks/HDP/2.6/services/ATLAS/metainfo.xml | 1 + .../services/HBASE/configuration/hbase-env.xml | 87 ++ .../services/HBASE/configuration/hbase-site.xml | 8 + .../services/HDFS/configuration/core-site.xml | 29 + .../services/HDFS/configuration/hadoop-env.xml | 5 + .../services/HIVE/configuration/hive-env.xml | 3 +- .../services/HIVE/configuration/hive-site.xml | 9 + .../HDP/2.6/services/SPARK2/kerberos.json | 8 +- .../YARN/configuration-mapred/mapred-site.xml | 9 + .../services/YARN/configuration/yarn-site.xml | 2 +- .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 6 +- .../HDP/3.0/configuration/cluster-env.xml | 27 + .../HDP/3.0/hooks/after-INSTALL/scripts/hook.py | 2 +- .../scripts/shared_initialization.py | 38 +- .../3.0/hooks/before-START/scripts/params.py | 12 +- .../HDP/3.0/properties/stack_packages.json | 1042 ++++++++++++++++ .../PERF/1.0/services/KERBEROS/metainfo.xml | 8 + .../KERBEROS/package/scripts/kerberos_client.py | 2 + .../KERBEROS/package/scripts/kerberos_common.py | 48 + .../1.0/upgrades/nonrolling-upgrade-2.0.xml | 6 +- .../src/main/resources/version_definition.xsd | 2 + .../ExecutionCommandWrapperTest.java | 70 +- .../server/agent/HeartbeatProcessorTest.java | 5 - .../server/agent/TestHeartbeatHandler.java | 14 +- .../server/api/services/AmbariMetaInfoTest.java | 2 + .../AmbariCustomCommandExecutionHelperTest.java | 4 +- .../AmbariManagementControllerImplTest.java | 5 +- .../AmbariManagementControllerTest.java | 304 +++-- .../controller/AuthToLocalBuilderTest.java | 45 + .../BackgroundCustomCommandExecutionTest.java | 2 +- .../server/controller/KerberosHelperTest.java | 75 +- ...hYarnCapacitySchedulerReleaseConfigTest.java | 2 +- .../BlueprintConfigurationProcessorTest.java | 38 +- .../internal/ClusterResourceProviderTest.java | 2 - .../internal/HostResourceProviderTest.java | 27 +- .../internal/JMXHostProviderTest.java | 3 +- .../internal/RequestResourceProviderTest.java | 9 +- .../internal/ServiceResourceProviderTest.java | 236 +++- .../StackUpgradeConfigurationMergeTest.java | 2 +- .../internal/UpgradeResourceProviderTest.java | 105 +- .../LoggingRequestHelperFactoryImplTest.java | 10 +- .../AmbariPamAuthenticationProviderTest.java | 145 ++- .../FinalizeKerberosServerActionTest.java | 6 - .../upgrades/UpgradeActionTest.java | 6 +- .../QuickLinksConfigurationModuleTest.java | 14 + .../apache/ambari/server/state/ServiceTest.java | 41 - .../ambari/server/state/UpgradeContextTest.java | 363 ++++++ .../ambari/server/state/UpgradeHelperTest.java | 85 +- .../state/repository/VersionDefinitionTest.java | 148 +++ .../server/state/stack/UpgradePackTest.java | 4 +- .../svccomphost/ServiceComponentHostTest.java | 52 - .../server/topology/AmbariContextTest.java | 16 +- .../ClusterConfigurationRequestTest.java | 7 + .../server/upgrade/UpgradeCatalog300Test.java | 81 +- .../LOGSEARCH/test_service_advisor.py | 30 +- .../python/custom_actions/test_ru_set_all.py | 35 +- .../python/stacks/2.0.6/FLUME/test_flume.py | 5 +- .../stacks/2.0.6/HBASE/test_hbase_client.py | 20 +- .../stacks/2.0.6/HBASE/test_hbase_master.py | 15 +- .../2.0.6/HBASE/test_hbase_regionserver.py | 14 +- .../2.0.6/HBASE/test_phoenix_queryserver.py | 8 +- .../python/stacks/2.0.6/HDFS/test_datanode.py | 15 +- .../stacks/2.0.6/HDFS/test_hdfs_client.py | 15 +- .../stacks/2.0.6/HDFS/test_journalnode.py | 13 +- .../python/stacks/2.0.6/HDFS/test_namenode.py | 13 +- .../python/stacks/2.0.6/HDFS/test_nfsgateway.py | 7 +- .../stacks/2.0.6/HIVE/test_hcat_client.py | 3 + .../stacks/2.0.6/HIVE/test_hive_client.py | 23 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 11 - .../stacks/2.0.6/HIVE/test_webhcat_server.py | 19 +- .../stacks/2.0.6/OOZIE/test_oozie_client.py | 15 +- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 40 +- .../python/stacks/2.0.6/PIG/test_pig_client.py | 20 +- .../python/stacks/2.0.6/SQOOP/test_sqoop.py | 14 +- .../stacks/2.0.6/YARN/test_historyserver.py | 8 +- .../stacks/2.0.6/YARN/test_mapreduce2_client.py | 15 +- .../stacks/2.0.6/YARN/test_nodemanager.py | 16 +- .../stacks/2.0.6/YARN/test_resourcemanager.py | 13 +- .../stacks/2.0.6/YARN/test_yarn_client.py | 14 +- .../2.0.6/ZOOKEEPER/test_zookeeper_client.py | 14 +- .../2.0.6/ZOOKEEPER/test_zookeeper_server.py | 17 +- .../hooks/after-INSTALL/test_after_install.py | 56 +- .../stacks/2.1/FALCON/test_falcon_client.py | 14 +- .../stacks/2.1/FALCON/test_falcon_server.py | 15 +- .../stacks/2.1/HIVE/test_hive_metastore.py | 58 +- .../stacks/2.1/STORM/test_storm_drpc_server.py | 14 +- .../stacks/2.1/STORM/test_storm_nimbus.py | 14 +- .../stacks/2.1/STORM/test_storm_nimbus_prod.py | 14 +- .../stacks/2.1/STORM/test_storm_supervisor.py | 14 +- .../2.1/STORM/test_storm_supervisor_prod.py | 15 +- .../stacks/2.1/STORM/test_storm_ui_server.py | 15 +- .../python/stacks/2.1/TEZ/test_tez_client.py | 19 +- .../stacks/2.1/YARN/test_apptimelineserver.py | 13 +- .../stacks/2.2/ACCUMULO/test_accumulo_client.py | 15 +- .../stacks/2.2/KAFKA/test_kafka_broker.py | 15 +- .../stacks/2.2/KERBEROS/test_kerberos_client.py | 23 + .../python/stacks/2.2/KNOX/test_knox_gateway.py | 26 - .../stacks/2.2/RANGER/test_ranger_admin.py | 10 - .../stacks/2.2/RANGER/test_ranger_usersync.py | 9 - .../stacks/2.2/SLIDER/test_slider_client.py | 21 +- .../stacks/2.2/SPARK/test_job_history_server.py | 13 +- .../stacks/2.2/SPARK/test_spark_client.py | 13 +- .../stacks/2.2/common/test_conf_select.py | 30 +- .../stacks/2.3/ATLAS/test_metadata_server.py | 6 +- .../stacks/2.3/MAHOUT/test_mahout_client.py | 18 +- .../2.3/SPARK/test_spark_thrift_server.py | 13 +- .../stacks/2.3/common/test_stack_advisor.py | 22 +- .../stacks/2.4/LOGSEARCH/test_logsearch.py | 2 + .../test/python/stacks/2.4/configs/default.json | 5 +- .../stacks/2.5/ATLAS/test_atlas_server.py | 2 +- .../src/test/python/stacks/utils/RMFTestCase.py | 12 + .../src/test/resources/hbase_version_test.xml | 2 + .../src/test/resources/parent_quicklinks.json | 1 + .../upgrades/upgrade_nonrolling_new_stack.xml | 6 +- .../HDP/2.1.1/upgrades/upgrade_test_HDP-250.xml | 267 ++++ .../2.1.1/upgrades/upgrade_test_nonrolling.xml | 4 +- .../HDP/2.2.0/upgrades/upgrade_test_checks.xml | 2 +- .../resources/version_definition_test_maint.xml | 62 + .../version_definition_test_maint_partial.xml | 54 + .../controllers/global/cluster_controller.js | 1 + .../main/admin/stack_and_upgrade_controller.js | 9 +- .../main/host/bulk_operations_controller.js | 2 +- ambari-web/app/controllers/main/host/details.js | 69 ++ .../app/controllers/wizard/step1_controller.js | 2 + .../app/controllers/wizard/step8_controller.js | 19 +- .../configs/services/logsearch_properties.js | 97 +- ambari-web/app/mappers/hosts_mapper.js | 12 +- .../app/mixins/common/configs/configs_saver.js | 12 +- .../mixins/common/configs/enhanced_configs.js | 36 +- .../mixins/common/table_server_view_mixin.js | 2 +- ambari-web/app/models/stack.js | 4 +- ambari-web/app/routes/installer.js | 4 +- ambari-web/app/templates/wizard/step1.hbs | 326 ++--- ambari-web/app/utils/ajax/ajax.js | 2 +- ambari-web/app/utils/helper.js | 11 +- .../views/common/configs/config_history_flow.js | 2 +- .../app/views/common/quick_view_link_view.js | 6 + .../main/admin/stack_upgrade/versions_view.js | 5 +- .../app/views/main/alert_definitions_view.js | 5 +- ambari-web/app/views/wizard/step1_view.js | 6 +- .../admin/stack_and_upgrade_controller_test.js | 8 +- .../test/controllers/wizard/step1_test.js | 2 + .../test/controllers/wizard/step8_test.js | 4 +- .../mixins/common/configs/configs_saver_test.js | 21 + .../common/configs/enhanced_configs_test.js | 61 +- ambari-web/test/utils/helper_test.js | 5 + .../test/views/common/quick_link_view_test.js | 50 + .../admin/stack_upgrade/version_view_test.js | 101 +- .../views/main/alert_definitions_view_test.js | 69 ++ ambari-web/test/views/wizard/step1_view_test.js | 50 +- .../HDF/2.0/hooks/after-INSTALL/scripts/hook.py | 2 +- .../scripts/shared_initialization.py | 35 +- .../2.0/hooks/after-INSTALL/scripts/hook.py | 2 +- .../scripts/shared_initialization.py | 31 +- contrib/version-builder/example.py | 1 + contrib/version-builder/example.sh | 3 +- contrib/version-builder/version_builder.py | 13 +- 531 files changed, 11321 insertions(+), 7494 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/67cacc8a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java ----------------------------------------------------------------------
