Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cc090d5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cc090d5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cc090d5 Branch: refs/heads/branch-dev-patch-upgrade Commit: 1cc090d56d2666ec4d96c90509debc65156bce8e Parents: b31c6c2 2131466 Author: Nate Cole <[email protected]> Authored: Thu Oct 13 08:43:02 2016 -0400 Committer: Nate Cole <[email protected]> Committed: Thu Oct 13 08:43:02 2016 -0400 ---------------------------------------------------------------------- .../ambari_agent/apscheduler/scheduler.py | 1 + .../ambari_agent/apscheduler/threadpool.py | 1 + ambari-server/conf/unix/ambari.properties | 6 + ambari-server/conf/unix/install-helper.sh | 1 + ambari-server/conf/windows/ambari.properties | 7 + ambari-server/pom.xml | 3 + ambari-server/sbin/ambari-server | 4 +- .../server/actionmanager/ActionDBAccessor.java | 13 ++ .../actionmanager/ActionDBAccessorImpl.java | 14 ++ .../server/actionmanager/ActionScheduler.java | 4 +- .../server/configuration/Configuration.java | 158 +++++++++++++++++++ .../ambari/server/controller/AmbariServer.java | 50 ++++++ .../server/controller/KerberosHelper.java | 40 ++++- .../server/controller/KerberosHelperImpl.java | 137 ++++++++-------- .../apache/ambari/server/orm/dao/StageDAO.java | 10 ++ .../ambari/server/orm/entities/StageEntity.java | 5 +- .../security/AbstractSecurityHeaderFilter.java | 43 +++++ .../AmbariServerSecurityHeaderFilter.java | 3 + .../AmbariViewsSecurityHeaderFilter.java | 3 + .../server/serveraction/ServerAction.java | 6 + .../AbstractPrepareKerberosServerAction.java | 38 +++-- .../ConfigureAmbariIdentitiesServerAction.java | 2 +- .../0.1.0/package/scripts/metrics_grafana.py | 6 +- .../0.1.0/package/scripts/params_linux.py | 6 + .../resources/stacks/HDP/2.0.6/kerberos.json | 40 +++-- .../stacks/HDP/2.3/services/HDFS/widgets.json | 12 +- .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 2 +- .../actionmanager/TestActionScheduler.java | 12 +- ...nTimelineServerStatePreservingCheckTest.java | 3 + .../server/controller/KerberosHelperTest.java | 84 ++++++---- .../scheduler/ExecutionScheduleManagerTest.java | 90 ++++++----- .../AbstractSecurityHeaderFilterTest.java | 38 ++++- .../AmbariServerSecurityHeaderFilterTest.java | 7 + .../AmbariViewsSecurityHeaderFilterTest.java | 6 + .../server/security/SecurityFilterTest.java | 19 ++- .../state/cluster/ClusterDeadlockTest.java | 15 +- .../server/testing/DeadlockWarningThread.java | 13 +- .../server/upgrade/UpgradeCatalog150Test.java | 7 +- .../server/upgrade/UpgradeCatalog151Test.java | 3 + .../server/upgrade/UpgradeCatalog160Test.java | 3 + .../server/upgrade/UpgradeCatalog161Test.java | 3 + .../server/upgrade/UpgradeCatalog170Test.java | 3 + .../server/upgrade/UpgradeCatalog221Test.java | 42 +++-- .../AMBARI_METRICS/test_metrics_grafana.py | 5 +- .../2.0.6/configs/default_ams_embedded.json | 9 +- ambari-web/app/controllers/installer.js | 3 + .../main/admin/stack_and_upgrade_controller.js | 56 ++++--- ambari-web/app/messages.js | 1 + ambari-web/app/routes/add_service_routes.js | 24 +++ .../configs/service_configs_by_category_view.js | 12 +- ambari-web/app/views/wizard/step1_view.js | 8 +- .../admin/stack_and_upgrade_controller_test.js | 45 ++++-- .../8.0.5/package/scripts/microsoft_r.py | 11 +- .../MICROSOFT_R/8.0.5/metainfo.xml | 19 +++ .../MICROSOFT_R/8.0.5/repos/repoinfo.xml | 7 + 55 files changed, 871 insertions(+), 292 deletions(-) ----------------------------------------------------------------------
