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/14f60af1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14f60af1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14f60af1 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 14f60af1b6f1971f026bcfa209ac75859eb17457 Parents: ea3dc9a ae40bed Author: Jayush Luniya <[email protected]> Authored: Fri May 19 13:47:24 2017 -0700 Committer: Jayush Luniya <[email protected]> Committed: Fri May 19 13:47:24 2017 -0700 ---------------------------------------------------------------------- .../server/actionmanager/ActionManager.java | 4 +- .../server/actionmanager/ActionScheduler.java | 25 +++-- .../ambari/server/actionmanager/Request.java | 18 +++- .../server/actionmanager/RequestFactory.java | 4 +- .../ambari/server/actionmanager/Stage.java | 14 --- .../server/actionmanager/StageFactory.java | 1 - .../server/actionmanager/StageFactoryImpl.java | 4 +- .../AmbariCustomCommandExecutionHelper.java | 12 ++- .../AmbariManagementControllerImpl.java | 15 ++- .../server/controller/KerberosHelperImpl.java | 51 +++++---- .../ClusterStackVersionResourceProvider.java | 3 +- .../HostStackVersionResourceProvider.java | 4 +- .../internal/RequestResourceProvider.java | 9 +- .../internal/RequestStageContainer.java | 11 +- .../internal/StageResourceProvider.java | 9 +- .../internal/UpgradeResourceProvider.java | 13 +-- .../server/hooks/users/UserHookService.java | 3 +- .../apache/ambari/server/orm/DBAccessor.java | 24 +++++ .../ambari/server/orm/DBAccessorImpl.java | 44 ++++++++ .../server/orm/entities/RequestEntity.java | 19 ++++ .../ambari/server/orm/entities/StageEntity.java | 18 ---- .../server/orm/entities/StageEntity_.java | 4 - .../server/orm/helpers/dbms/DbmsHelper.java | 21 ++++ .../orm/helpers/dbms/GenericDbmsHelper.java | 8 ++ .../server/orm/helpers/dbms/MySqlHelper.java | 12 +++ .../server/orm/helpers/dbms/OracleHelper.java | 12 +++ .../server/orm/helpers/dbms/PostgresHelper.java | 12 +++ .../ambari/server/stageplanner/RoleGraph.java | 2 +- .../server/upgrade/UpgradeCatalog251.java | 29 +++++ .../apache/ambari/server/utils/StageUtils.java | 8 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 2 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +- .../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 | 2 +- .../STORM/0.9.1/configuration/storm-env.xml | 4 +- .../src/main/resources/properties.json | 1 + .../services/YARN/configuration/yarn-site.xml | 10 ++ .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 5 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 7 ++ .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 + .../ExecutionCommandWrapperTest.java | 4 +- .../ambari/server/actionmanager/StageTest.java | 2 +- .../actionmanager/TestActionDBAccessorImpl.java | 34 +++--- .../server/actionmanager/TestActionManager.java | 8 +- .../actionmanager/TestActionScheduler.java | 43 +++++--- .../ambari/server/actionmanager/TestStage.java | 5 +- .../server/agent/HeartbeatProcessorTest.java | 4 +- .../server/agent/HeartbeatTestHelper.java | 4 +- .../server/agent/TestHeartbeatHandler.java | 4 +- .../AmbariManagementControllerTest.java | 18 ++-- .../server/controller/KerberosHelperTest.java | 105 +++++++++++++++++-- .../internal/CalculatedStatusTest.java | 2 +- ...ClusterStackVersionResourceProviderTest.java | 10 +- .../internal/RequestStageContainerTest.java | 3 +- .../server/hooks/users/UserHookServiceTest.java | 4 +- .../serveraction/ServerActionExecutorTest.java | 9 +- .../server/stageplanner/TestStagePlanner.java | 2 +- .../ambari/server/utils/StageUtilsTest.java | 2 +- ambari-web/app/messages.js | 6 +- .../wizard/step3/step3_host_warnings_popup.hbs | 4 +- 62 files changed, 520 insertions(+), 206 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/14f60af1/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ----------------------------------------------------------------------
