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/f5ca1145 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f5ca1145 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f5ca1145 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: f5ca1145153a936501ba887d743ce3639a7b8a1a Parents: f76c87a df21f9c Author: Robert Levas <[email protected]> Authored: Mon Jun 19 16:16:05 2017 -0400 Committer: Robert Levas <[email protected]> Committed: Mon Jun 19 16:16:05 2017 -0400 ---------------------------------------------------------------------- ambari-agent/pom.xml | 4 +- ambari-infra/pom.xml | 4 +- .../inputconfig/MapAnonymizeDescriptor.java | 26 ++ .../model/inputconfig/MapDateDescriptor.java | 2 +- .../model/inputconfig/MapFieldDescriptor.java | 2 +- .../inputconfig/MapFieldValueDescriptor.java | 2 +- .../impl/MapAnonymizeDescriptorImpl.java | 57 +++ .../inputconfig/impl/PostMapValuesAdapter.java | 3 + .../docs/postMapValues.md | 9 + .../logfeeder/input/AbstractInputFile.java | 116 +++--- .../apache/ambari/logfeeder/input/Input.java | 5 +- .../ambari/logfeeder/input/InputManager.java | 5 + .../ambari/logfeeder/input/InputS3File.java | 6 + .../logfeeder/mapper/MapperAnonymize.java | 120 ++++++ .../apache/ambari/logfeeder/util/FileUtil.java | 7 + .../src/main/resources/alias_config.json | 3 + .../logfeeder/mapper/MapperAnonymizeTest.java | 79 ++++ .../src/test/resources/log4j.xml | 2 +- .../logsearch/model/common/LSServerMapDate.java | 3 - .../model/common/LSServerMapField.java | 3 + .../model/common/LSServerMapFieldAnonymize.java | 65 ++++ .../LSServerPostMapValuesListDeserializer.java | 4 + .../shipper-conf/input.config-hst.json | 4 +- .../shipper-conf/input.config-zookeeper.json | 4 +- ambari-logsearch/pom.xml | 4 +- .../timeline/AbstractTimelineMetricsSink.java | 54 ++- .../ambari-metrics-timelineservice/pom.xml | 4 +- ambari-metrics/pom.xml | 10 +- ambari-project/pom.xml | 4 +- ambari-server/pom.xml | 71 ++-- ambari-server/sbin/ambari-server | 6 +- .../server/api/services/AmbariMetaInfo.java | 114 ------ .../checks/DatabaseConsistencyCheckHelper.java | 4 +- .../ambari/server/cleanup/CleanupDriver.java | 15 +- .../ambari/server/cleanup/CleanupService.java | 19 +- .../server/cleanup/CleanupServiceImpl.java | 33 +- .../AmbariCustomCommandExecutionHelper.java | 26 +- .../controller/AmbariManagementController.java | 9 - .../AmbariManagementControllerImpl.java | 40 +- .../server/controller/RepositoryResponse.java | 12 +- .../internal/ProvisionClusterRequest.java | 5 +- .../internal/RepositoryResourceProvider.java | 11 - .../RepositoryVersionResourceProvider.java | 14 - .../internal/RequestResourceProvider.java | 12 +- .../internal/UpgradeResourceProvider.java | 8 +- .../server/orm/dao/HostRoleCommandDAO.java | 7 +- .../ambari/server/orm/dao/RequestDAO.java | 21 +- .../server/orm/dao/TopologyHostTaskDAO.java | 8 +- .../orm/dao/TopologyLogicalRequestDAO.java | 8 +- .../server/orm/dao/TopologyLogicalTaskDAO.java | 8 +- .../orm/entities/TopologyHostTaskEntity.java | 2 +- .../entities/TopologyLogicalRequestEntity.java | 2 +- .../orm/entities/TopologyLogicalTaskEntity.java | 2 +- .../ambari/server/stack/ComponentModule.java | 4 + .../ambari/server/stack/StackContext.java | 28 -- .../apache/ambari/server/stack/StackModule.java | 32 -- .../ambari/server/state/RepositoryInfo.java | 20 +- .../server/state/cluster/ClustersImpl.java | 25 +- .../services/AlertNoticeDispatchService.java | 86 ++--- .../server/state/stack/LatestRepoCallable.java | 47 --- .../server/state/stack/RepositoryXml.java | 6 - .../ambari/server/topology/HostRequest.java | 12 +- .../ambari/server/topology/LogicalRequest.java | 35 +- .../ambari/server/topology/PersistedState.java | 7 +- .../server/topology/PersistedStateImpl.java | 18 +- .../ambari/server/topology/TopologyManager.java | 70 ++-- .../apache/ambari/server/utils/StageUtils.java | 8 +- ambari-server/src/main/python/ambari-server.py | 18 +- .../src/main/python/ambari_server/dbCleanup.py | 34 +- .../main/python/ambari_server/setupActions.py | 2 +- .../1.6.1.2.2.0/configuration/accumulo-env.xml | 5 + .../package/scripts/accumulo_configuration.py | 3 + .../1.6.1.2.2.0/package/scripts/params.py | 5 +- .../package/templates/accumulo_jaas.conf.j2 | 29 ++ .../1.4.0.2.0/configuration/flume-log4j.xml | 96 +++++ .../FLUME/1.4.0.2.0/package/scripts/flume.py | 4 +- .../common-services/HDFS/2.1.0.2.0/metainfo.xml | 4 - .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 10 +- .../HDFS/2.1.0.2.0/package/scripts/namenode.py | 2 +- .../2.1.0.2.0/package/scripts/params_linux.py | 4 +- .../common-services/HDFS/3.0.0.3.0/metainfo.xml | 4 - .../3.0.0.3.0/package/scripts/hdfs_namenode.py | 10 +- .../HDFS/3.0.0.3.0/package/scripts/namenode.py | 2 +- .../3.0.0.3.0/package/scripts/params_linux.py | 2 + .../HIVE/0.12.0.2.0/metainfo.xml | 19 +- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 8 +- .../0.12.0.2.0/package/scripts/params_linux.py | 5 + .../2.1.0.3.0/configuration/parquet-logging.xml | 106 ++++++ .../HIVE/2.1.0.3.0/package/scripts/hive.py | 40 +- .../2.1.0.3.0/package/scripts/params_linux.py | 5 + .../LOGSEARCH/0.5.0/metainfo.xml | 24 -- .../LOGSEARCH/0.5.0/package/scripts/params.py | 1 - .../package/templates/input.config-nifi.json.j2 | 79 ---- .../common-services/YARN/2.1.0.2.0/metainfo.xml | 1 + .../common-services/YARN/3.0.0.3.0/metainfo.xml | 1 + .../scripts/interpreter_json_template.py | 361 +++++++++++++++++++ .../0.6.0.2.5/package/scripts/master.py | 17 +- .../HDP/2.0.6/configuration/cluster-env.xml | 12 + .../HIVE/configuration/parquet-logging.xml | 106 ++++++ .../services/YARN/configuration/yarn-env.xml | 15 +- .../HDP/2.6/services/ZEPPELIN/metainfo.xml | 2 +- .../HDP/3.0/configuration/cluster-env.xml | 12 + .../HDP/3.0/services/ZEPPELIN/metainfo.xml | 2 +- .../src/main/resources/stacks/stack_advisor.py | 116 +++++- .../server/api/services/AmbariMetaInfoTest.java | 242 +------------ .../server/cleanup/CleanupServiceImplTest.java | 43 ++- .../AmbariManagementControllerTest.java | 205 ----------- .../internal/ProvisionClusterRequestTest.java | 13 +- .../RepositoryResourceProviderTest.java | 5 +- .../internal/RequestResourceProviderTest.java | 11 +- .../ComponentVersionCheckActionTest.java | 2 +- .../server/stack/ComponentModuleTest.java | 25 ++ .../server/state/cluster/ClustersTest.java | 13 +- .../AlertNoticeDispatchServiceTest.java | 23 ++ .../server/topology/LogicalRequestTest.java | 82 ++++- .../stacks/2.0.6/common/test_stack_advisor.py | 153 ++++++++ ambari-serviceadvisor/pom.xml | 124 +++++++ .../ambari/serviceadvisor/ServiceAdvisor.java | 147 ++++++++ .../ServiceAdvisorCommandType.java | 63 ++++ ambari-utility/checkstyle.xml | 38 ++ ambari-utility/pom.xml | 145 ++++++++ .../src/main/java/category/AlertTest.java | 27 ++ .../main/java/category/AmbariUpgradeTest.java | 27 ++ .../src/main/java/category/BlueprintTest.java | 27 ++ .../src/main/java/category/FastTest.java | 27 ++ .../src/main/java/category/KerberosTest.java | 27 ++ .../src/main/java/category/MetricsTest.java | 27 ++ .../src/main/java/category/SlowTest.java | 27 ++ .../main/java/category/StackUpgradeTest.java | 27 ++ .../apache/ambari/annotations/ApiIgnore.java | 29 ++ ...AvoidTransactionalOnPrivateMethodsCheck.java | 55 +++ .../UndocumentedRestApiOperationCheck.java | 76 ++++ .../ambari/swagger/AmbariSwaggerReader.java | 222 ++++++++++++ .../src/main/resources/checkstyle_packages.xml | 15 + ...dTransactionalOnPrivateMethodsCheckTest.java | 49 +++ .../UndocumentedRestApiOperationCheckTest.java | 53 +++ .../ambari/swagger/AmbariSwaggerReaderTest.java | 182 ++++++++++ .../src/test/resources/log4j.properties | 19 + .../checkstyle/InputRestApiOperation.java | 138 +++++++ .../InputTransactionalOnPrivateMethods.java | 46 +++ pom.xml | 16 +- serviceadvisor/pom.xml | 103 ------ .../ambari/serviceadvisor/ServiceAdvisor.java | 147 -------- .../ServiceAdvisorCommandType.java | 63 ---- utility/checkstyle.xml | 38 -- utility/pom.xml | 145 -------- utility/src/main/java/category/AlertTest.java | 27 -- .../main/java/category/AmbariUpgradeTest.java | 27 -- .../src/main/java/category/BlueprintTest.java | 27 -- utility/src/main/java/category/FastTest.java | 27 -- .../src/main/java/category/KerberosTest.java | 27 -- utility/src/main/java/category/MetricsTest.java | 27 -- utility/src/main/java/category/SlowTest.java | 27 -- .../main/java/category/StackUpgradeTest.java | 27 -- .../apache/ambari/annotations/ApiIgnore.java | 29 -- ...AvoidTransactionalOnPrivateMethodsCheck.java | 55 --- .../UndocumentedRestApiOperationCheck.java | 76 ---- .../ambari/swagger/AmbariSwaggerReader.java | 222 ------------ .../src/main/resources/checkstyle_packages.xml | 15 - ...dTransactionalOnPrivateMethodsCheckTest.java | 49 --- .../UndocumentedRestApiOperationCheckTest.java | 53 --- .../ambari/swagger/AmbariSwaggerReaderTest.java | 182 ---------- utility/src/test/resources/log4j.properties | 19 - .../checkstyle/InputRestApiOperation.java | 138 ------- .../InputTransactionalOnPrivateMethods.java | 46 --- 165 files changed, 3765 insertions(+), 2913 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f5ca1145/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f5ca1145/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f5ca1145/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ----------------------------------------------------------------------
