Merge branch 'trunk' into branch-feature-AMBARI-21674
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7a3ba0fa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7a3ba0fa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7a3ba0fa Branch: refs/heads/branch-feature-AMBARI-21674 Commit: 7a3ba0fa5385ebb3c4ec6f80ecc2ad2d0d3b0bb5 Parents: 1374bde 217620b Author: Nate Cole <[email protected]> Authored: Thu Jan 4 10:34:34 2018 -0500 Committer: Nate Cole <[email protected]> Committed: Thu Jan 4 10:34:34 2018 -0500 ---------------------------------------------------------------------- .../ambari/infra/OffsetDateTimeConverter.java | 2 +- .../ambari/infra/steps/AbstractInfraSteps.java | 4 +- .../ambari/infra/steps/ExportJobsSteps.java | 48 +- .../resources/stories/infra_api_tests.story | 31 +- .../docker/infra-manager-docker-compose.sh | 2 + ambari-infra/ambari-infra-manager/pom.xml | 5 + .../apache/ambari/infra/job/JobProperties.java | 47 ++ .../apache/ambari/infra/job/JobPropertyMap.java | 57 ++ .../apache/ambari/infra/job/PropertyMap.java | 25 + .../apache/ambari/infra/job/SolrDAOBase.java | 65 ++ .../infra/job/archive/AbstractFileAction.java | 15 +- .../infra/job/archive/CompositeFileAction.java | 4 +- .../ambari/infra/job/archive/Document.java | 2 +- .../archive/DocumentArchivingConfiguration.java | 142 +++++ .../archive/DocumentExportConfiguration.java | 140 ---- .../job/archive/DocumentExportJobListener.java | 58 -- .../job/archive/DocumentExportProperties.java | 117 ++-- .../job/archive/DocumentExportPropertyMap.java | 8 +- .../ambari/infra/job/archive/DocumentWiper.java | 23 + .../ambari/infra/job/archive/FileAction.java | 2 +- .../job/archive/FileNameSuffixFormatter.java | 56 ++ .../infra/job/archive/ItemWriterListener.java | 4 +- .../job/archive/LocalDocumentItemWriter.java | 17 +- .../job/archive/LocalItemWriterListener.java | 36 ++ .../ambari/infra/job/archive/S3Properties.java | 23 +- .../ambari/infra/job/archive/S3Uploader.java | 4 +- .../ambari/infra/job/archive/SolrDAO.java | 68 ++ .../infra/job/archive/SolrDocumentIterator.java | 3 +- .../infra/job/archive/SolrDocumentSource.java | 41 +- .../job/archive/SolrParametrizedString.java | 77 +++ .../infra/job/archive/SolrProperties.java | 117 ++++ .../infra/job/archive/SolrQueryBuilder.java | 69 +- .../infra/job/archive/TarGzCompressor.java | 2 +- .../infra/job/archive/WriteCompletedEvent.java | 45 ++ .../deleting/DocumentDeletingConfiguration.java | 90 +++ .../deleting/DocumentDeletingProperties.java | 77 +++ .../deleting/DocumentDeletingPropertyMap.java | 44 ++ .../job/deleting/DocumentWiperTasklet.java | 49 ++ .../src/main/resources/infra-manager.properties | 48 +- .../ambari/infra/job/JobPropertiesTest.java | 56 ++ .../archive/DocumentExportPropertiesTest.java | 54 -- .../archive/FileNameSuffixFormatterTest.java | 58 ++ .../archive/LocalDocumentItemWriterTest.java | 21 +- .../job/archive/SolrParametrizedStringTest.java | 57 ++ .../infra/job/archive/SolrPropertiesTest.java | 54 ++ .../infra/job/archive/SolrQueryBuilderTest.java | 39 +- .../server/api/services/AmbariMetaInfo.java | 34 +- .../ambari/server/controller/AmbariServer.java | 2 +- .../state/alert/AlertDefinitionFactory.java | 31 +- .../ambari/server/state/alert/ScriptSource.java | 4 + .../upgrade/AbstractFinalUpgradeCatalog.java | 58 ++ .../server/upgrade/FinalUpgradeCatalog.java | 28 +- .../server/upgrade/SchemaUpgradeHelper.java | 1 + .../server/upgrade/UpdateAlertScriptPaths.java | 48 ++ .../KAFKA/0.8.1/package/scripts/params.py | 6 +- .../stacks/HDP/2.3/services/stack_advisor.py | 9 +- .../server/api/services/AmbariMetaInfoTest.java | 6 +- .../stacks/2.3/common/test_stack_advisor.py | 17 + .../2.6/KAFKA/test_kafka_broker_other_sasl.py | 16 + .../2.6/configs/secure_kafka_sasl_ssl.json | 632 +++++++++++++++++++ 60 files changed, 2376 insertions(+), 522 deletions(-) ----------------------------------------------------------------------
