Merge branch 'trunk' into branch-feature-logsearch-ui
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0e5bf390 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e5bf390 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e5bf390 Branch: refs/heads/trunk Commit: 0e5bf39010f5cb6258d91526e6cf5bc58295110a Parents: 01a3bc7 dee7317 Author: ababiichuk <ababiic...@hortonworks.com> Authored: Tue Aug 22 20:49:15 2017 +0300 Committer: ababiichuk <ababiic...@hortonworks.com> Committed: Tue Aug 22 20:49:15 2017 +0300 ---------------------------------------------------------------------- .../core/providers/package/__init__.py | 17 +- .../core/providers/package/yumrpm.py | 32 +- .../ambari-logsearch-assembly/pom.xml | 3 +- ambari-metrics/ambari-metrics-assembly/pom.xml | 2 + .../conf/unix/metric_monitor.ini | 2 + .../src/main/python/core/config_reader.py | 8 + .../src/main/python/core/emitter.py | 58 +- .../src/main/python/core/krberr.py | 42 ++ .../main/python/core/spnego_kerberos_auth.py | 164 ++++++ .../src/test/python/core/TestEmitter.py | 24 + ambari-project/pom.xml | 1 + ambari-server/pom.xml | 2 +- .../server/api/services/AmbariMetaInfo.java | 9 +- .../checks/DatabaseConsistencyCheckHelper.java | 62 --- .../AmbariManagementControllerImpl.java | 15 +- .../internal/ServiceResourceProvider.java | 10 + .../VersionDefinitionResourceProvider.java | 10 +- .../apache/ambari/server/orm/DBAccessor.java | 55 ++ .../ambari/server/orm/DBAccessorImpl.java | 119 +++++ .../server/orm/dao/RepositoryVersionDAO.java | 20 + .../orm/entities/RepositoryVersionEntity.java | 11 +- .../server/orm/helpers/dbms/DbmsHelper.java | 27 + .../orm/helpers/dbms/GenericDbmsHelper.java | 14 + .../server/orm/helpers/dbms/H2Helper.java | 16 + .../server/orm/helpers/dbms/MySqlHelper.java | 16 + .../server/orm/helpers/dbms/OracleHelper.java | 16 + .../server/orm/helpers/dbms/PostgresHelper.java | 15 + .../kerberos/DeconstructedPrincipal.java | 2 +- .../apache/ambari/server/state/StackInfo.java | 17 + .../server/state/cluster/ClusterImpl.java | 19 +- .../state/repository/VersionDefinitionXml.java | 7 + .../server/state/stack/LatestRepoCallable.java | 80 ++- .../ambari/server/topology/AmbariContext.java | 58 +- .../server/topology/PersistedStateImpl.java | 23 +- .../server/upgrade/SchemaUpgradeHelper.java | 1 + .../server/upgrade/UpgradeCatalog252.java | 225 ++++++++ .../server/upgrade/UpgradeCatalog260.java | 325 ++++++++++++ .../server/upgrade/UpgradeCatalog300.java | 97 +--- .../python/ambari_server/serverConfiguration.py | 4 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 5 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 4 +- .../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 | 9 +- .../AMBARI_METRICS/0.1.0/kerberos.json | 26 + .../AMBARI_METRICS/0.1.0/metainfo.xml | 8 + .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 33 +- .../0.1.0/package/scripts/params.py | 7 +- .../package/templates/metric_monitor.ini.j2 | 2 + .../DRUID/0.9.2/package/scripts/druid.py | 38 +- .../DRUID/0.9.2/package/scripts/params.py | 13 + .../0.5.0.2.1/configuration/oozie-site.xml | 208 -------- .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 218 ++++++++ .../HIVE/0.12.0.2.0/metainfo.xml | 1 + .../0.12.0.2.0/package/scripts/params_linux.py | 11 + .../0.5.0.2.2/package/scripts/params_linux.py | 27 + .../0.5.0.3.0/package/scripts/params_linux.py | 26 + .../SPARK/2.2.0/service_advisor.py | 48 +- .../0.6.0.2.5/configuration/zeppelin-env.xml | 5 +- .../configuration/zeppelin-shiro-ini.xml | 6 + .../0.6.0.3.0/configuration/zeppelin-env.xml | 13 +- .../ZEPPELIN/0.6.0.3.0/service_advisor.py | 46 +- .../FALCON/configuration/oozie-site.xml | 198 ------- .../FALCON/configuration/oozie-site.xml | 197 ------- .../stacks/HDP/2.3/services/stack_advisor.py | 113 ++++ .../FALCON/configuration/oozie-site.xml | 47 -- .../stacks/HDP/2.5/services/SPARK/kerberos.json | 3 +- .../stacks/HDP/2.5/services/stack_advisor.py | 76 ++- .../stacks/HDP/2.6/services/SPARK/kerberos.json | 3 +- .../HDP/2.6/services/SPARK2/kerberos.json | 3 +- .../stacks/HDP/2.6/services/stack_advisor.py | 109 +++- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 14 + .../src/main/resources/stacks/stack_advisor.py | 6 +- .../src/main/resources/version_definition.xsd | 2 + .../server/api/services/AmbariMetaInfoTest.java | 30 ++ .../DatabaseConsistencyCheckHelperTest.java | 63 --- .../AmbariManagementControllerTest.java | 2 +- .../VersionDefinitionResourceProviderTest.java | 14 +- .../ambari/server/orm/DBAccessorImplTest.java | 88 +++ .../orm/dao/RepositoryVersionDAOTest.java | 12 + .../apache/ambari/server/orm/db/DDLTests.java | 22 +- .../ambari/server/stack/StackManagerTest.java | 5 +- .../server/testing/DBInconsistencyTests.java | 2 + .../server/topology/AmbariContextTest.java | 42 +- .../server/upgrade/UpgradeCatalog252Test.java | 203 +++++++ .../server/upgrade/UpgradeCatalog260Test.java | 468 ++++++++++++++++ .../server/upgrade/UpgradeCatalog300Test.java | 74 --- .../SPARK/2.2.0/test_service_advisor.py | 289 ++++++++++ .../custom_actions/TestInstallPackages.py | 10 + .../stacks/2.5/common/test_stack_advisor.py | 304 ++++++++++- .../test/python/stacks/2.6/DRUID/test_druid.py | 32 +- .../stacks/2.6/common/test_stack_advisor.py | 531 ++++++++++++++++++- .../resources/stacks/HDP/2.2.0/repos/hdp.json | 4 + .../stacks/HDP/2.2.0/repos/repoinfo.xml | 8 + .../stacks/HDP/2.2.0/repos/version-2.2.0.5.xml | 51 ++ .../resources/stacks/HDP/2.2.1/metainfo.xml | 24 + .../resources/stacks/HDP/2.2.1/repos/hdp.json | 7 + .../stacks/HDP/2.2.1/repos/repoinfo.xml | 36 ++ .../HDP/2.2.1/services/RANGER/alerts.json | 74 +++ ambari-web/app/controllers/installer.js | 3 - ambari-web/app/controllers/main/host/details.js | 44 +- ambari-web/app/controllers/main/service/item.js | 8 +- ambari-web/app/messages.js | 4 +- ambari-web/app/views/common/sort_view.js | 26 +- .../app/views/main/alert_definitions_view.js | 7 +- .../test/controllers/main/host/details_test.js | 59 ++- ambari-web/test/views/common/sort_view_test.js | 49 +- .../views/main/alert_definitions_view_test.js | 2 +- pom.xml | 2 +- 110 files changed, 4562 insertions(+), 1196 deletions(-) ----------------------------------------------------------------------
