Merge branch 'branch-feature-AMBARI-12556' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/57a9af32 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/57a9af32 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/57a9af32 Branch: refs/heads/trunk Commit: 57a9af3248d194e589e1c3db7e6c71c31f331119 Parents: 36fd8c7 13d806b Author: Nate Cole <nc...@hortonworks.com> Authored: Thu Apr 27 15:42:06 2017 -0400 Committer: Nate Cole <nc...@hortonworks.com> Committed: Thu Apr 27 15:42:06 2017 -0400 ---------------------------------------------------------------------- .../server/checks/AbstractCheckDescriptor.java | 25 ++ .../controller/ServiceComponentResponse.java | 37 ++- .../ClusterStackVersionResourceProvider.java | 147 +++++----- .../internal/ComponentResourceProvider.java | 11 +- .../internal/UpgradeResourceProvider.java | 46 +++- .../listeners/upgrade/StackVersionListener.java | 20 +- .../server/orm/dao/HostComponentStateDAO.java | 20 ++ .../dao/ServiceComponentDesiredStateDAO.java | 24 ++ .../orm/entities/HostComponentStateEntity.java | 7 +- .../orm/entities/RepositoryVersionEntity.java | 2 +- .../ServiceComponentDesiredStateEntity.java | 19 ++ .../entities/ServiceComponentVersionEntity.java | 26 +- .../upgrades/AbstractUpgradeServerAction.java | 74 +++++ .../upgrades/ComponentVersionCheckAction.java | 2 +- .../upgrades/FinalizeUpgradeAction.java | 41 +-- .../org/apache/ambari/server/state/Cluster.java | 36 ++- .../ambari/server/state/ServiceComponent.java | 15 + .../server/state/ServiceComponentImpl.java | 166 ++++++++++- .../ambari/server/state/UpgradeContext.java | 9 + .../server/state/cluster/ClusterImpl.java | 169 +++++++----- .../state/repository/VersionDefinitionXml.java | 23 +- .../state/stack/upgrade/ClusterGrouping.java | 31 +-- .../server/upgrade/UpgradeCatalog300.java | 19 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 1 + .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 + .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 + .../resources/Ambari-DDL-Postgres-CREATE.sql | 1 + .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 1 + .../resources/Ambari-DDL-SQLServer-CREATE.sql | 1 + .../src/main/resources/properties.json | 6 +- .../checks/AbstractCheckDescriptorTest.java | 87 ++++-- ...duce2JobHistoryStatePreservingCheckTest.java | 15 + .../ServicesNamenodeTruncateCheckTest.java | 17 ++ .../AmbariManagementControllerImplTest.java | 6 +- ...ClusterStackVersionResourceProviderTest.java | 274 +++++++++++-------- .../internal/ComponentResourceProviderTest.java | 28 +- .../controller/internal/RequestImplTest.java | 4 +- .../HostVersionOutOfSyncListenerTest.java | 42 ++- .../ComponentVersionCheckActionTest.java | 69 ++++- .../server/state/ServiceComponentTest.java | 72 +++++ .../ambari/server/state/UpgradeHelperTest.java | 3 + .../server/state/cluster/ClusterTest.java | 62 +++-- .../server/upgrade/UpgradeCatalog300Test.java | 10 + 43 files changed, 1215 insertions(+), 455 deletions(-) ----------------------------------------------------------------------