You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2018/06/22 17:56:37 UTC
[ambari] branch branch-feature-AMBARI-14714-mpack-advisor updated
(da5c87e -> 6e9e872)
This is an automated email from the ASF dual-hosted git repository.
jluniya pushed a change to branch branch-feature-AMBARI-14714-mpack-advisor
in repository https://gitbox.apache.org/repos/asf/ambari.git.
from da5c87e [AMBARI-24095] Fixed usages of App.StackService.find(serviceName) since serviceName is no longer used as the value of the StackService model id. (#1581)
add dedc8c4 Remove references to deleted unit test files and fix broken tests.
add 4b4ee31 [AMBARI-23969] UI should load stack services from multiple mpacks. (#1403)
add 646ee8b AMBARI-23972. Update code for : (1). 'mpack-recommendations' directory creation and (2). putting 'mpack_advisor_wrapper.py' in '/var/lib/ambari-server/resources/scripts/' folder.
add 4bef993 AMBARI-23972. Update code for : (1). 'mpack-recommendations' directory creation and (2). putting 'mpack_advisor_wrapper.py' in '/var/lib/ambari-server/resources/scripts/' folder.
add 3490029 AMBARI-14714. Fix some unit tests
add 938be76 AMBARI-14714. Fix ServiceResourceProviderTest
add 0e9317e AMBARI-23746. Cannot create same named service in different service groups in same request
add 096dff5 AMBARI-23746. Cannot create same named component in different service groups in same request
add 85c6c6e AMBARI-22875. Service group name mismatch
add 9120330 AMBARI-23746. Cannot query services with same name
add f8293cf AMBARI-23746. Use List for componentID duplicate check
add 3dcef6e AMBARI-23987. Set 'skip.service.checks' = true during deploy.
add 3d92d03 AMBARI-23987. Set 'skip.service.checks' = true during deploy.
add 6a531ca Clear clusterData when user is not logged in.
add 7548975 [AMBARI-23993] Mpack Instance Manager should create pid dir and log dir for each instance (#1424)
add 023b47d AMBARI-23993-2: Mpack Instance Manager should create pid dir and log dir for each instance: add get_log_dir and get_run_dir to import
add e3921ea [AMBARI-23993-2] Add get_log_dir and get_run_dir to import in mpack_manager_helper.py
add c00af74 AMBARI-23999 Remove hardcoded logic in UI to create HDPCORE service group and create multiple service groups
add f48f11f AMBARI-24011: Add workaround to hide client modules in the dashboard (jluniya) (#1443)
add e42ed7a BUG-104321: Python Mpack Advisor should return MpackInstance block during Host Component Layout Recommendation
add b13f5a0 [AMBARI-24014] Python Mpack Advisor should return MpackInstance block during Host Component Layout Recommendation
add 44d303c AMBARI-24025 Display Mpack Info on Service Summary Page
add 198be80 AMBARI-23986. Host components API call doesn't return all host components (#1450)
add f66ff00 AMBARI-24030. Fixes the following : 1. Reading the Node Manager Host (nmHost) correctly. 2. Comments the incorrectly implemented fn : isServiceDeployed().
add eab9bae AMBARI-24030. Fixes the following : 1. Reading the Node Manager Host (nmHost) correctly. 2. Comments the incorrectly implemented fn : isServiceDeployed().
add 93895e9 AMBARI-24025 Display Mpack Info on Service Summary Page
add 422628f [AMBARI-24039] Quicklinks for HBASE are not displayed.
add 4e4cbb2 [AMBARI-24033] Use servicegroup api instead of service to show installed services in the UI.
add a0fdfc1 AMBARI-14714. Fix some unit tests (#1464)
add e38b715 AMBARI-24046. Fix the incorrect string from config_name to config-name in mpack_advisor.py (#1480)
add 59dff1a [AMBARI-24096] Add Upgrade Pack to Upgrade Plan (#1537)
add 49be653 AMBARI-24104: Host component creation fails when hadoop client from multiple mpacks is installed (jluniya)
add 8ed1b0a AMBARI-24104: Host component creation fails when hadoop client from multiple mpacks is installed
add a5f2ea4 [AMBARI-24106] - Upgrade History Model Changes (#1542)
add e50a72c [AMBARI-24119]. TaskWrapper should only wrap a single task (#1554)
add c9a804d [AMBARI 24101] detailed error reporting for blueprint mpack download (benyoka) (#1543)
add 0a7a6f7 [Ambari 23959] Save service Id with cluster configuration during blueprint cluster creation (benyoka) (#1519)
add da884ac AMBARI-24091. Blueprint should add dependencies from specific mpack (#1556)
add 71dc770 [AMBARI-24140] Send name, version, and registry ID when registering mpacks.
add 4957146 [AMBARI-24156] - Remove RepositoryVersionEntity and Begin Switching Checks To Use UpgradePlan (#1589)
add 0dd9fee AMBARI-24158. Provide a way to disable topology validation in cluster creation request (#1593)
new 6e9e872 Merge remote-tracking branch 'origin/branch-feature-AMBARI-14714' into branch-feature-AMBARI-14714-mpack-advisor
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/ambari/annotations/Experimental.java | 2 +-
.../ambari/annotations/ExperimentalFeature.java | 15 +-
.../server/agent/stomp/HostLevelParamsHolder.java | 5 +-
.../ambari/server/agent/stomp/MetadataHolder.java | 4 +-
.../ambari/server/agent/stomp/TopologyHolder.java | 4 +-
.../api/query/render/ClusterBlueprintRenderer.java | 2 +-
.../api/resources/BlueprintResourceDefinition.java | 4 +-
.../api/resources/ClusterResourceDefinition.java | 8 +
.../event/request/AddUpgradeRequestAuditEvent.java | 12 +-
.../request/eventcreator/UpgradeEventCreator.java | 2 +-
.../server/checks/AutoStartDisabledCheck.java | 19 +-
.../ambari/server/checks/CheckDescription.java | 128 +++-
...tractCheckDescriptor.java => ClusterCheck.java} | 216 +++---
.../server/checks/ComponentsExistInRepoCheck.java | 140 ++--
.../server/checks/ComponentsInstallationCheck.java | 73 +-
.../server/checks/ConfigurationMergeCheck.java | 81 ++-
.../HardcodedStackVersionPropertiesCheck.java | 19 +-
.../apache/ambari/server/checks/HealthCheck.java | 20 +-
.../server/checks/HostMaintenanceModeCheck.java | 30 +-
.../ambari/server/checks/HostsHeartbeatCheck.java | 21 +-
.../server/checks/HostsMasterMaintenanceCheck.java | 74 +-
.../ambari/server/checks/PreUpgradeCheck.java | 98 +++
.../server/checks/PreviousUpgradeCompleted.java | 23 +-
.../checks/RequiredServicesInRepositoryCheck.java | 60 --
.../server/checks/ServiceCheckValidityCheck.java | 20 +-
.../ambari/server/checks/ServicePresenceCheck.java | 26 +-
.../checks/ServicesMaintenanceModeCheck.java | 31 +-
.../ambari/server/checks/ServicesUpCheck.java | 178 ++---
.../apache/ambari/server/checks/UpgradeCheck.java | 13 +-
.../ambari/server/checks/UpgradeCheckRegistry.java | 37 +-
.../ambari/server/checks/VersionMismatchCheck.java | 29 +-
.../server/controller/ActionExecutionContext.java | 34 -
.../controller/AmbariManagementControllerImpl.java | 241 +++----
.../ambari/server/controller/ControllerModule.java | 29 +-
.../server/controller/PrereqCheckRequest.java | 110 +--
.../PrereqCheckRequestFactory.java} | 19 +-
.../ambari/server/controller/ServiceResponse.java | 23 +
.../internal/BlueprintConfigurationProcessor.java | 2 +-
.../internal/BlueprintResourceProvider.java | 4 +-
.../internal/ClusterResourceProvider.java | 13 +-
.../internal/CompatibleRepositoryVersion.java | 62 --
.../server/controller/internal/CompositeStack.java | 17 +-
.../internal/PreUpgradeCheckResourceProvider.java | 98 +--
.../internal/ProvisionClusterRequest.java | 14 +-
.../internal/ServiceGroupResourceProvider.java | 2 +-
.../internal/ServiceResourceProvider.java | 2 +-
.../ambari/server/controller/internal/Stack.java | 20 +-
.../controller/internal/StackDefinition.java | 8 +-
.../internal/UpgradePlanResourceProvider.java | 22 +-
.../internal/UpgradeResourceProvider.java | 313 +++-----
.../apache/ambari/server/events/AmbariEvent.java | 4 +-
.../HostComponentVersionAdvertisedEvent.java | 2 +-
...ent.java => ServiceGroupMpackChangedEvent.java} | 6 +-
.../ambari/server/events/UpgradeUpdateEvent.java | 12 -
.../ambari/server/orm/entities/MpackEntity.java | 18 +-
.../orm/entities/RepositoryVersionEntity.java | 93 ---
.../server/orm/entities/ServiceGroupEntity.java | 13 +
.../ambari/server/orm/entities/UpgradeEntity.java | 164 +++--
.../server/orm/entities/UpgradeHistoryEntity.java | 132 ++--
.../orm/entities/UpgradePlanConfigEntity.java | 2 +-
.../orm/entities/UpgradePlanDetailEntity.java | 17 +
.../server/serveraction/ServerActionExecutor.java | 28 +-
.../serveraction/upgrades/ConfigureAction.java | 19 +-
.../upgrades/CreateAndConfigureAction.java | 19 +-
.../upgrades/FinalizeUpgradeAction.java | 197 +++--
.../serveraction/upgrades/FixNotebookStorage.java | 96 ---
.../upgrades/PreconfigureKerberosAction.java | 15 +-
...geAction.java => UpdateDesiredMpackAction.java} | 31 +-
.../upgrades/UpdateDesiredRepositoryAction.java | 156 ----
.../upgrades/UpgradeUserKerberosDescriptor.java | 7 +-
.../ambari/server/stack/MasterHostResolver.java | 23 +-
.../apache/ambari/server/state/CheckHelper.java | 78 +-
.../org/apache/ambari/server/state/Cluster.java | 10 -
.../apache/ambari/server/state/DependencyInfo.java | 19 +-
.../org/apache/ambari/server/state/Module.java | 35 +-
.../ambari/server/state/ModuleComponent.java | 71 +-
.../java/org/apache/ambari/server/state/Mpack.java | 307 +++++++-
.../apache/ambari/server/state/RepositoryType.java | 93 ---
.../ambari/server/state/ServiceComponent.java | 8 +-
.../ambari/server/state/ServiceComponentImpl.java | 12 +-
.../ambari/server/state/ServiceGroupImpl.java | 43 ++
.../apache/ambari/server/state/UpgradeContext.java | 800 +++++++++------------
.../apache/ambari/server/state/UpgradeHelper.java | 483 ++++++-------
.../ambari/server/state/cluster/ClusterImpl.java | 25 +-
.../ambari/server/state/repository/Release.java | 7 -
.../state/services/RetryUpgradeActionService.java | 10 +-
...requisiteCheck.java => UpgradeCheckResult.java} | 29 +-
.../state/stack/upgrade/ClusterGrouping.java | 16 +-
.../state/stack/upgrade/ColocatedGrouping.java | 17 +-
.../server/state/stack/upgrade/Grouping.java | 48 +-
.../state/stack/upgrade/HostOrderGrouping.java | 41 +-
.../stack/upgrade/RepositoryVersionHelper.java | 70 --
.../state/stack/upgrade/ServiceCheckGrouping.java | 5 +-
.../server/state/stack/upgrade/StageWrapper.java | 6 +-
.../state/stack/upgrade/StageWrapperBuilder.java | 12 +-
.../ambari/server/state/stack/upgrade/Task.java | 7 -
.../server/state/stack/upgrade/TaskWrapper.java | 49 +-
.../server/state/stack/upgrade/UpgradeScope.java | 51 --
.../svccomphost/ServiceComponentHostSummary.java | 91 ---
.../ambari/server/topology/AmbariContext.java | 18 +-
...quest.java => AmbiguousComponentException.java} | 27 +-
.../server/topology/AsyncCallableService.java | 2 +-
.../BlueprintBasedClusterProvisionRequest.java | 35 +-
.../apache/ambari/server/topology/Cardinality.java | 45 +-
.../topology/ClusterConfigurationRequest.java | 257 +++----
.../ambari/server/topology/ClusterTopology.java | 28 +-
.../server/topology/ClusterTopologyImpl.java | 78 +-
.../apache/ambari/server/topology/Component.java | 6 +-
.../topology/ConfigRecommendationStrategy.java | 24 +-
.../ambari/server/topology/DownloadMpacksTask.java | 10 +-
.../ambari/server/topology/HostGroupInfo.java | 5 +-
.../ambari/server/topology/ProvisionRequest.java | 2 +
.../ambari/server/topology/ResolvedComponent.java | 21 +-
.../server/topology/ResolvedComponent_Builder.java | 274 ++++---
.../server/topology/StackComponentResolver.java | 52 +-
.../ambari/server/topology/TopologyManager.java | 24 +-
.../server/topology/TopologyRequestFactory.java | 5 +-
.../topology/TopologyRequestFactoryImpl.java | 8 +-
.../topology/tasks/ConfigureClusterTask.java | 10 +-
.../validators/ChainedTopologyValidator.java | 5 +-
.../validators/ClusterConfigTypeValidator.java | 5 +-
.../DependencyAndCardinalityValidator.java | 190 +++--
.../validators/GplPropertiesValidator.java | 5 +-
.../topology/validators/HiveServiceValidator.java | 5 +-
.../NameNodeHighAvailabilityValidator.java | 6 +-
.../validators/RejectUnknownComponents.java | 3 +-
.../topology/validators/RejectUnknownStacks.java | 3 +-
.../RequiredConfigPropertiesValidator.java | 3 +-
.../validators/RequiredPasswordValidator.java | 3 +-
.../validators/SecretReferenceValidator.java | 3 +-
.../validators/StackConfigTypeValidator.java | 8 +-
.../topology/validators/TopologyValidator.java | 11 +-
.../validators/TopologyValidatorService.java | 10 +-
.../server/topology/validators/UnitValidator.java | 4 +-
.../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 10 +-
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 10 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 10 +-
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 10 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 10 +-
.../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 10 +-
ambari-server/src/main/resources/upgrade-pack.xsd | 11 -
.../query/render/ClusterBlueprintRendererTest.java | 2 +-
.../request/creator/UpgradeEventCreatorTest.java | 4 +-
.../server/checks/AutoStartDisabledCheckTest.java | 39 +-
...ckDescriptorTest.java => ClusterCheckTest.java} | 34 +-
.../checks/ComponentExistsInRepoCheckTest.java | 93 +--
.../checks/ComponentsInstallationCheckTest.java | 47 +-
.../server/checks/ConfigurationMergeCheckTest.java | 44 +-
.../ambari/server/checks/HealthCheckTest.java | 24 +-
.../checks/HostMaintenanceModeCheckTest.java | 40 +-
.../server/checks/HostsHeartbeatCheckTest.java | 30 +-
.../checks/HostsMasterMaintenanceCheckTest.java | 39 +-
.../checks/PreviousUpgradeCompletedTest.java | 20 +-
.../RequiredServicesInRepositoryCheckTest.java | 106 ---
.../checks/ServiceCheckValidityCheckTest.java | 47 +-
.../server/checks/ServicePresenceCheckTest.java | 74 +-
.../checks/ServicesMaintenanceModeCheckTest.java | 21 +-
.../ambari/server/checks/ServicesUpCheckTest.java | 46 +-
.../server/checks/UpgradeCheckOrderTest.java | 10 +-
.../server/checks/VersionMismatchCheckTest.java | 22 +-
.../BlueprintConfigurationProcessorTest.java | 85 +--
.../internal/ClusterResourceProviderTest.java | 66 +-
.../PreUpgradeCheckResourceProviderTest.java | 7 +-
.../internal/ProvisionClusterRequestTest.java | 43 +-
.../internal/UpgradePlanResourceProviderTest.java | 2 +
.../UpgradeSummaryResourceProviderTest.java | 3 -
.../ambari/server/orm/dao/UpgradeDAOTest.java | 5 -
.../server/sample/checks/SampleServiceCheck.java | 16 +-
.../upgrades/ComponentVersionCheckActionTest.java | 22 +-
.../upgrades/CreateAndConfigureActionTest.java | 19 +-
.../ambari/server/state/CheckHelperTest.java | 77 +-
.../server/state/cluster/ClusterImplTest.java | 46 ++
.../services/RetryUpgradeActionServiceTest.java | 1 -
.../stack/upgrade/StageWrapperBuilderTest.java | 2 +-
.../ambari/server/topology/AmbariContextTest.java | 14 +-
.../topology/ClusterConfigurationRequestTest.java | 145 +++-
.../topology/ClusterDeployWithStartOnlyTest.java | 34 +-
...terInstallWithoutStartOnComponentLevelTest.java | 34 +-
.../topology/ClusterInstallWithoutStartTest.java | 35 +-
.../server/topology/ClusterTopologyImplTest.java | 149 ++--
.../server/topology/ConfigureClusterTaskTest.java | 7 +
.../server/topology/DownloadMpacksTaskTest.java | 26 +
.../ambari/server/topology/StackBuilder.java | 190 +++++
.../topology/StackComponentResolverTest.java | 91 +--
.../server/topology/TopologyManagerTest.java | 55 +-
.../DependencyAndCardinalityValidatorTest.java | 502 +++++--------
.../validators/HiveServiceValidatorTest.java | 7 +-
.../validators/RequiredPasswordValidatorTest.java | 22 +-
.../topology/validators/TopologyValidatorTest.java | 256 +++++++
.../wizard/downloadMpacks_controller.js | 6 +-
.../controllers/wizard/selectMpacks_controller.js | 5 +-
ambari-web/app/mappers/service_mapper.js | 2 +-
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../test/controllers/wizard/selectMpacks_test.js | 12 +-
.../host_component_recommendation_mixin_test.js | 3 +-
195 files changed, 4984 insertions(+), 4939 deletions(-)
rename ambari-server/src/main/java/org/apache/ambari/server/checks/{AbstractCheckDescriptor.java => ClusterCheck.java} (73%)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/PreUpgradeCheck.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheck.java
copy ambari-server/src/main/java/org/apache/ambari/server/{orm/dao/UpgradePlanDAO.java => controller/PrereqCheckRequestFactory.java} (66%)
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersion.java
rename ambari-server/src/main/java/org/apache/ambari/server/events/{ClusterComponentsRepoChangedEvent.java => ServiceGroupMpackChangedEvent.java} (81%)
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FixNotebookStorage.java
copy ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/{ManualStageAction.java => UpdateDesiredMpackAction.java} (58%)
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredRepositoryAction.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/RepositoryType.java
rename ambari-server/src/main/java/org/apache/ambari/server/state/stack/{PrerequisiteCheck.java => UpgradeCheckResult.java} (77%)
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/UpgradeScope.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java
copy ambari-server/src/main/java/org/apache/ambari/server/topology/{ProvisionRequest.java => AmbiguousComponentException.java} (61%)
rename ambari-server/src/test/java/org/apache/ambari/server/checks/{AbstractCheckDescriptorTest.java => ClusterCheckTest.java} (86%)
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/topology/StackBuilder.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/topology/validators/TopologyValidatorTest.java
[ambari] 01/01: Merge remote-tracking branch
'origin/branch-feature-AMBARI-14714' into
branch-feature-AMBARI-14714-mpack-advisor
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jluniya pushed a commit to branch branch-feature-AMBARI-14714-mpack-advisor
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 6e9e872175db266f5754c99ffa146e14c22725c8
Merge: da5c87e 0dd9fee
Author: Jayush Luniya <jl...@HW11039.local>
AuthorDate: Fri Jun 22 10:56:22 2018 -0700
Merge remote-tracking branch 'origin/branch-feature-AMBARI-14714' into branch-feature-AMBARI-14714-mpack-advisor
.../apache/ambari/annotations/Experimental.java | 2 +-
.../ambari/annotations/ExperimentalFeature.java | 15 +-
.../server/agent/stomp/HostLevelParamsHolder.java | 5 +-
.../ambari/server/agent/stomp/MetadataHolder.java | 4 +-
.../ambari/server/agent/stomp/TopologyHolder.java | 4 +-
.../api/query/render/ClusterBlueprintRenderer.java | 2 +-
.../api/resources/BlueprintResourceDefinition.java | 4 +-
.../api/resources/ClusterResourceDefinition.java | 8 +
.../event/request/AddUpgradeRequestAuditEvent.java | 12 +-
.../request/eventcreator/UpgradeEventCreator.java | 2 +-
.../server/checks/AutoStartDisabledCheck.java | 19 +-
.../ambari/server/checks/CheckDescription.java | 128 +++-
...tractCheckDescriptor.java => ClusterCheck.java} | 216 +++---
.../server/checks/ComponentsExistInRepoCheck.java | 140 ++--
.../server/checks/ComponentsInstallationCheck.java | 73 +-
.../server/checks/ConfigurationMergeCheck.java | 81 ++-
.../HardcodedStackVersionPropertiesCheck.java | 19 +-
.../apache/ambari/server/checks/HealthCheck.java | 20 +-
.../server/checks/HostMaintenanceModeCheck.java | 30 +-
.../ambari/server/checks/HostsHeartbeatCheck.java | 21 +-
.../server/checks/HostsMasterMaintenanceCheck.java | 74 +-
.../ambari/server/checks/PreUpgradeCheck.java | 98 +++
.../server/checks/PreviousUpgradeCompleted.java | 23 +-
.../checks/RequiredServicesInRepositoryCheck.java | 60 --
.../server/checks/ServiceCheckValidityCheck.java | 20 +-
.../ambari/server/checks/ServicePresenceCheck.java | 26 +-
.../checks/ServicesMaintenanceModeCheck.java | 31 +-
.../ambari/server/checks/ServicesUpCheck.java | 178 ++---
.../apache/ambari/server/checks/UpgradeCheck.java | 13 +-
.../ambari/server/checks/UpgradeCheckRegistry.java | 37 +-
.../ambari/server/checks/VersionMismatchCheck.java | 29 +-
.../server/controller/ActionExecutionContext.java | 34 -
.../controller/AmbariManagementControllerImpl.java | 241 +++----
.../ambari/server/controller/ControllerModule.java | 29 +-
.../server/controller/PrereqCheckRequest.java | 110 +--
.../PrereqCheckRequestFactory.java} | 37 +-
.../ambari/server/controller/ServiceResponse.java | 23 +
.../internal/BlueprintConfigurationProcessor.java | 2 +-
.../internal/BlueprintResourceProvider.java | 4 +-
.../internal/ClusterResourceProvider.java | 13 +-
.../internal/CompatibleRepositoryVersion.java | 62 --
.../server/controller/internal/CompositeStack.java | 17 +-
.../internal/PreUpgradeCheckResourceProvider.java | 98 +--
.../internal/ProvisionClusterRequest.java | 14 +-
.../internal/ServiceGroupResourceProvider.java | 2 +-
.../internal/ServiceResourceProvider.java | 2 +-
.../ambari/server/controller/internal/Stack.java | 20 +-
.../controller/internal/StackDefinition.java | 8 +-
.../internal/UpgradePlanResourceProvider.java | 22 +-
.../internal/UpgradeResourceProvider.java | 313 +++-----
.../apache/ambari/server/events/AmbariEvent.java | 4 +-
.../HostComponentVersionAdvertisedEvent.java | 2 +-
...ent.java => ServiceGroupMpackChangedEvent.java} | 6 +-
.../ambari/server/events/UpgradeUpdateEvent.java | 12 -
.../ambari/server/orm/entities/MpackEntity.java | 18 +-
.../orm/entities/RepositoryVersionEntity.java | 93 ---
.../server/orm/entities/ServiceGroupEntity.java | 13 +
.../ambari/server/orm/entities/UpgradeEntity.java | 164 +++--
.../server/orm/entities/UpgradeHistoryEntity.java | 132 ++--
.../orm/entities/UpgradePlanConfigEntity.java | 2 +-
.../orm/entities/UpgradePlanDetailEntity.java | 17 +
.../server/serveraction/ServerActionExecutor.java | 28 +-
.../serveraction/upgrades/ConfigureAction.java | 19 +-
.../upgrades/CreateAndConfigureAction.java | 19 +-
.../upgrades/FinalizeUpgradeAction.java | 197 +++--
.../serveraction/upgrades/FixNotebookStorage.java | 96 ---
.../upgrades/PreconfigureKerberosAction.java | 15 +-
.../upgrades/UpdateDesiredMpackAction.java | 51 ++
.../upgrades/UpdateDesiredRepositoryAction.java | 156 ----
.../upgrades/UpgradeUserKerberosDescriptor.java | 7 +-
.../ambari/server/stack/MasterHostResolver.java | 23 +-
.../apache/ambari/server/state/CheckHelper.java | 78 +-
.../org/apache/ambari/server/state/Cluster.java | 10 -
.../apache/ambari/server/state/DependencyInfo.java | 19 +-
.../org/apache/ambari/server/state/Module.java | 35 +-
.../ambari/server/state/ModuleComponent.java | 71 +-
.../java/org/apache/ambari/server/state/Mpack.java | 307 +++++++-
.../apache/ambari/server/state/RepositoryType.java | 93 ---
.../ambari/server/state/ServiceComponent.java | 8 +-
.../ambari/server/state/ServiceComponentImpl.java | 12 +-
.../ambari/server/state/ServiceGroupImpl.java | 43 ++
.../apache/ambari/server/state/UpgradeContext.java | 800 +++++++++------------
.../apache/ambari/server/state/UpgradeHelper.java | 483 ++++++-------
.../ambari/server/state/cluster/ClusterImpl.java | 25 +-
.../ambari/server/state/repository/Release.java | 7 -
.../state/services/RetryUpgradeActionService.java | 10 +-
...requisiteCheck.java => UpgradeCheckResult.java} | 29 +-
.../state/stack/upgrade/ClusterGrouping.java | 16 +-
.../state/stack/upgrade/ColocatedGrouping.java | 17 +-
.../server/state/stack/upgrade/Grouping.java | 48 +-
.../state/stack/upgrade/HostOrderGrouping.java | 41 +-
.../stack/upgrade/RepositoryVersionHelper.java | 70 --
.../state/stack/upgrade/ServiceCheckGrouping.java | 5 +-
.../server/state/stack/upgrade/StageWrapper.java | 6 +-
.../state/stack/upgrade/StageWrapperBuilder.java | 12 +-
.../ambari/server/state/stack/upgrade/Task.java | 7 -
.../server/state/stack/upgrade/TaskWrapper.java | 49 +-
.../svccomphost/ServiceComponentHostSummary.java | 91 ---
.../ambari/server/topology/AmbariContext.java | 18 +-
...quest.java => AmbiguousComponentException.java} | 27 +-
.../server/topology/AsyncCallableService.java | 2 +-
.../BlueprintBasedClusterProvisionRequest.java | 35 +-
.../apache/ambari/server/topology/Cardinality.java | 45 +-
.../topology/ClusterConfigurationRequest.java | 257 +++----
.../ambari/server/topology/ClusterTopology.java | 28 +-
.../server/topology/ClusterTopologyImpl.java | 78 +-
.../apache/ambari/server/topology/Component.java | 6 +-
.../topology/ConfigRecommendationStrategy.java | 24 +-
.../ambari/server/topology/DownloadMpacksTask.java | 10 +-
.../ambari/server/topology/HostGroupInfo.java | 5 +-
.../ambari/server/topology/ProvisionRequest.java | 2 +
.../ambari/server/topology/ResolvedComponent.java | 21 +-
.../server/topology/ResolvedComponent_Builder.java | 274 ++++---
.../server/topology/StackComponentResolver.java | 52 +-
.../ambari/server/topology/TopologyManager.java | 24 +-
.../server/topology/TopologyRequestFactory.java | 5 +-
.../topology/TopologyRequestFactoryImpl.java | 8 +-
.../topology/tasks/ConfigureClusterTask.java | 10 +-
.../validators/ChainedTopologyValidator.java | 5 +-
.../validators/ClusterConfigTypeValidator.java | 5 +-
.../DependencyAndCardinalityValidator.java | 190 +++--
.../validators/GplPropertiesValidator.java | 5 +-
.../topology/validators/HiveServiceValidator.java | 5 +-
.../NameNodeHighAvailabilityValidator.java | 6 +-
.../validators/RejectUnknownComponents.java | 3 +-
.../topology/validators/RejectUnknownStacks.java | 3 +-
.../RequiredConfigPropertiesValidator.java | 3 +-
.../validators/RequiredPasswordValidator.java | 3 +-
.../validators/SecretReferenceValidator.java | 3 +-
.../validators/StackConfigTypeValidator.java | 8 +-
.../topology/validators/TopologyValidator.java | 11 +-
.../validators/TopologyValidatorService.java | 10 +-
.../server/topology/validators/UnitValidator.java | 4 +-
.../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 10 +-
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 10 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 10 +-
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 10 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 10 +-
.../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 10 +-
ambari-server/src/main/resources/upgrade-pack.xsd | 11 -
.../query/render/ClusterBlueprintRendererTest.java | 2 +-
.../request/creator/UpgradeEventCreatorTest.java | 4 +-
.../server/checks/AutoStartDisabledCheckTest.java | 39 +-
...ckDescriptorTest.java => ClusterCheckTest.java} | 34 +-
.../checks/ComponentExistsInRepoCheckTest.java | 93 +--
.../checks/ComponentsInstallationCheckTest.java | 47 +-
.../server/checks/ConfigurationMergeCheckTest.java | 44 +-
.../ambari/server/checks/HealthCheckTest.java | 24 +-
.../checks/HostMaintenanceModeCheckTest.java | 40 +-
.../server/checks/HostsHeartbeatCheckTest.java | 30 +-
.../checks/HostsMasterMaintenanceCheckTest.java | 39 +-
.../checks/PreviousUpgradeCompletedTest.java | 20 +-
.../RequiredServicesInRepositoryCheckTest.java | 106 ---
.../checks/ServiceCheckValidityCheckTest.java | 47 +-
.../server/checks/ServicePresenceCheckTest.java | 74 +-
.../checks/ServicesMaintenanceModeCheckTest.java | 21 +-
.../ambari/server/checks/ServicesUpCheckTest.java | 46 +-
.../server/checks/UpgradeCheckOrderTest.java | 10 +-
.../server/checks/VersionMismatchCheckTest.java | 22 +-
.../BlueprintConfigurationProcessorTest.java | 85 +--
.../internal/ClusterResourceProviderTest.java | 66 +-
.../PreUpgradeCheckResourceProviderTest.java | 7 +-
.../internal/ProvisionClusterRequestTest.java | 43 +-
.../internal/UpgradePlanResourceProviderTest.java | 2 +
.../UpgradeSummaryResourceProviderTest.java | 3 -
.../ambari/server/orm/dao/UpgradeDAOTest.java | 5 -
.../server/sample/checks/SampleServiceCheck.java | 16 +-
.../upgrades/ComponentVersionCheckActionTest.java | 22 +-
.../upgrades/CreateAndConfigureActionTest.java | 19 +-
.../ambari/server/state/CheckHelperTest.java | 77 +-
.../server/state/cluster/ClusterImplTest.java | 46 ++
.../services/RetryUpgradeActionServiceTest.java | 1 -
.../stack/upgrade/StageWrapperBuilderTest.java | 2 +-
.../ambari/server/topology/AmbariContextTest.java | 14 +-
.../topology/ClusterConfigurationRequestTest.java | 145 +++-
.../topology/ClusterDeployWithStartOnlyTest.java | 34 +-
...terInstallWithoutStartOnComponentLevelTest.java | 34 +-
.../topology/ClusterInstallWithoutStartTest.java | 35 +-
.../server/topology/ClusterTopologyImplTest.java | 149 ++--
.../server/topology/ConfigureClusterTaskTest.java | 7 +
.../server/topology/DownloadMpacksTaskTest.java | 26 +
.../ambari/server/topology/StackBuilder.java | 190 +++++
.../topology/StackComponentResolverTest.java | 91 +--
.../server/topology/TopologyManagerTest.java | 55 +-
.../DependencyAndCardinalityValidatorTest.java | 502 +++++--------
.../validators/HiveServiceValidatorTest.java | 7 +-
.../validators/RequiredPasswordValidatorTest.java | 22 +-
.../topology/validators/TopologyValidatorTest.java | 256 +++++++
.../wizard/downloadMpacks_controller.js | 6 +-
.../controllers/wizard/selectMpacks_controller.js | 5 +-
ambari-web/app/mappers/service_mapper.js | 2 +-
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../test/controllers/wizard/selectMpacks_test.js | 12 +-
.../host_component_recommendation_mixin_test.js | 3 +-
194 files changed, 5015 insertions(+), 4895 deletions(-)
diff --cc ambari-web/app/mappers/service_mapper.js
index 5cb2b9e,99d8adb..6176505
--- a/ambari-web/app/mappers/service_mapper.js
+++ b/ambari-web/app/mappers/service_mapper.js
@@@ -36,15 -33,8 +36,15 @@@ App.serviceMapper = App.QuickDataMapper
var self = this;
var passiveStateMap = this.get('passiveStateMap');
var services = [];
-
++
json.items.forEach(function (item) {
- services = services.concat(item.services);
+ const itemServices = item.services.map(service => {
+ service.ServiceInfo.mpack_name = item.ServiceGroupInfo.mpack_name;
+ service.ServiceInfo.mpack_version = item.ServiceGroupInfo.mpack_version;
+ return service;
+ });
+
+ services = services.concat(itemServices);
});
services.forEach(function (service) {