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/26 16:45:50 UTC
[ambari] branch branch-feature-AMBARI-14714-stable updated (58381cf
-> 2d0cac0)
This is an automated email from the ASF dual-hosted git repository.
jluniya pushed a change to branch branch-feature-AMBARI-14714-stable
in repository https://gitbox.apache.org/repos/asf/ambari.git.
from 58381cf [AMBARI-23629] Review calls GET, PUT, DELETE for Host components and … (#1055)
add 0e3c8bb [AMBARI-23697] Replace Cluster install_packages with an Upgrade Plan Installation (#1101)
add 0b704ad [AMBARI-23611] Add service groups to start/stop/restart functions (#1109)
add d4f2533 AMBARI-23441. Escape column name `key` (reserved word) (#977)
add b553615 [AMBARI-23725] - Removal of Deprecated OperatingSystem/Repository/RepositoryVersion Logic (#1133)
add fadd582 AMBARI-23735 - Expose Mpack Information As Individual Fields for Service Groups
add 6389ecf [AMBARI-23726] Mpack Installation Response is not Updating State
add b6d82fe [AMBARI-23726] Mpack Installation Response is not Updating State - missed commit
add fa5469a Revert "Revert "Merge branch-feature-AMBARI-14714-configs to branch-feature-AMBARI-14714""
add 66b8b06 Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' into branch-feature-AMBARI-14714-configs
add 0f4f52e [AMBARI-23644] Handle back end issues related to new Service Config API - agent caching
add 9308a86 Ambari 23644 Handle back end issues related to new Service Config API
add f32f21f Merge pull request #1145 from apache/branch-feature-AMBARI-14714-configs
add 8072f35 [AMBARI-23746] Creation of service, servicecomponents and host components during multimpack deployment has issues
add 4f4d833 [AMBARI-23746] Use equals instead of equalsIgnoreCase for SG comparison
add a0c9de3 [AMBARI-23746] Review comments. Pass ServiceGroupaName when fetching service from cluster map
add e1848ec Creation of service, servicecomponents and host components during multimpack deployment has issues
add 8618c4c Fix UT compilation issue due to surrogate key changes (mradhakrishnan)
add e9dcb10 Fix Add Host wizard.
add 9614b25 AMBARI-22875. Remove temporary check (#1197)
add 97db52d Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' into AMBARI-23746
add b2e5123 [AMBARI-23746] During updateServices INIT-INSTALLED, we must fetch the services by servicegroupname instead of all clusterservices since we send the packages to be installed per mpack
add 6b15e77 Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' into AMBARI-23746
add c262a01 [AMBARI-23746] Review comments. Use entrySet for iterating over hashmap
add c715e17 Ambari 23746 : During updateServices INIT-INSTALLED, we must fetch the services by servicegroupname instead of all clusterservices since we send the packages to be installed per mpack
add 3782e18 AMBARI-23575 - Download mpacks during blueprint luster provisioning (benyoka) (#1209)
add d5b1856 AMBARI-23746. Fix typo in map lookup (#1208)
add fc49e9d MBARI-23797: Handle null values for configurations in the Execution Command API
add 731abfc Merge pull request #1223 from scottduan/AMBARI-23797-branch-feature-AMBARI-14714
add 12fb707 Removed unused code and deprecated API calls.
add 7a4fb42 [AMBARI-23746] Use stackSettings instead of clusterLevelParams. Fetch services by serviceGroupName where applicable
add 8ef4892 [AMBARI-23746] Replace clusterLevelParams with stackSettings for stack_name extraction
add d644932 Use stackSettings instead of clusterLevelParams. Fetch services by serviceGroupName where applicable
add 753f41d AMBARI-23746. Host components request fails due to missing component ID (#1265)
add 4587fc6 Removed "Stack and Versions" view and a lot of related code that is no longer needed.
add 2301672 Captured upgrade states as constants for future use.
add 369bf9e Do not repeatedly add same mpack to registered mpacks list.
add ff435c3 Do not repeatedly add same mpack to registered mpacks list.
add fbdfeb6 AMBARI-23746. Distinguish componentId and hostComponentId (#1288)
add 3e07779 Remove unused code.
add b8fef94 Fix constant declaration.
add 320da2b [AMBARI-23746] Use serviceGroupName to fetch services and components
add 1b269e5 Merge pull request #1308 from mradha25/AMBARI-23746
add 303e58f Fixed validations request to use correct stack.
add ddf2ee3 AMBARI-23874. Move user-related info to stack-level params (#1307)
add 2ce7766 AMBARI-23870. Implement 3.0 Mpack Advisor's Host Component Layout API Server code for : 'Recommendations' and 'Validations'.
add 5053d78 AMBARI-23870. Implement 3.0 Mpack Advisor's Host Component Layout API Server code for : 'Recommendations' and 'Validations'.
add ca2d0ef AMBARI-23619: Mpack Advisor Python Module (1): Implement component-layout recommendation and validation
add 1513dc5 AMBARI-23619: Mpack Advisor Python Module (1): Implement component-layout recommendation and validation
add cafbf5d Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add 126582a Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add 963c985 Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add aeea4f8 Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add 7191924 Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add ed7ee47 Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add 13efebc Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add f78e084 Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add ca0d7e8 Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add 4003269 Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add 8b6fe3a Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add bf184ec Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add 12ceeab Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add a6975b5 Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add f3fbda4 Merge branch 'AMBARI-23619-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23619-branch-feature-AMBARI-14714
add 018fc96 AMBARI-23619: Mpack Advisor Python Module (1): Implement component-layout recommendation and validation
add 2eab7cb Config requests for multiple mpacks.
add 29915a4 AMBARI-23940: Update ServiceGroup POST and GET APIs to be consistent (jluniya) (#1363)
add de898db [AMBARI-23746] ClusterStatusReport creates a map of host_id to component_name, needed change for resolving duplicate key
add 4253fce [AMBARI-23746] Use single map with hostcomponent id as the unique key
add 2d17eb4 ClusterStatusReport creates a map of host_id to component_name, needed change for resolving duplicate key
add 7bbf158 AMBARI-23032 export cluster as blueprint for 3.0 update (#1367)
add 1868c4c Restored missing data to config recommend request.
add 0c329c2 AMBARI-23923. Implement 3.0 Mpack Advisor's Configuration Recommendation API Server code for 'Cluster Create'.
add 39a6ec8 AMBARI-23923. Implement 3.0 Mpack Advisor's Configuration Recommendation API Server code for 'Cluster Create'
add 7202f28 AMBARI-23955. Implement 3.0 Mpack Advisor's Configuration 'Validations' and update code for Component Layout 'Validations'.
add 6cff03c AMBARI-23955. Implement 3.0 Mpack Advisor's Configuration 'Validations' and update code for Component Layout 'Validations'.
add c024327 Update mpack_advisor code for configurations validation (#1332)
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)
add a941bd9 [AMBARI-23643] Mpack Advisor integration in Install Wizard (#1604)
add 2d0cac0 AMBARI-24175. Error processing agent reports due to wrong stack usage (#1609)
No new revisions were added by this update.
Summary of changes:
.../execution_command/execution_command.py | 16 +-
.../libraries/execution_command/module_configs.py | 5 +-
.../libraries/functions/conf_select.py | 4 +-
.../functions/get_not_managed_resources.py | 6 +-
.../libraries/functions/mpack_manager_helper.py | 29 +-
.../libraries/functions/stack_features.py | 14 +-
.../libraries/functions/stack_select.py | 4 +-
.../libraries/functions/stack_tools.py | 2 +-
.../libraries/functions/version_select_util.py | 2 +-
.../resource_management/libraries/script/script.py | 36 +-
.../src/test/python/TestExecutionCommand.py | 13 +-
ambari-common/src/test/python/command.json | 6 +-
.../funtest/server/tests/DeleteServiceTest.java | 18 -
ambari-server/conf/unix/ambari.properties | 3 +-
ambari-server/src/main/assemblies/server.xml | 18 +
.../apache/ambari/annotations/Experimental.java | 2 +-
.../ambari/annotations/ExperimentalFeature.java | 16 +-
.../main/java/org/apache/ambari/server/Role.java | 1 -
.../actionmanager/ExecutionCommandWrapper.java | 25 +-
.../apache/ambari/server/actionmanager/Stage.java | 2 +-
.../ambari/server/actionmanager/StageHelper.java | 103 +
.../apache/ambari/server/agent/CommandReport.java | 5 +
.../ambari/server/agent/ExecutionCommand.java | 3 +
.../ambari/server/agent/HeartBeatHandler.java | 2 +-
.../server/agent/stomp/HostLevelParamsHolder.java | 5 +-
.../ambari/server/agent/stomp/MetadataHolder.java | 16 +-
.../ambari/server/agent/stomp/TopologyHolder.java | 8 +-
.../api/query/render/ClusterBlueprintRenderer.java | 30 +-
.../api/resources/BlueprintResourceDefinition.java | 4 +-
.../api/resources/ClusterResourceDefinition.java | 9 +-
.../ComponentStackVersionResourceDefinition.java | 49 -
.../api/resources/HostResourceDefinition.java | 1 -
... => MpackRecommendationResourceDefinition.java} | 30 +-
...java => MpackValidationResourceDefinition.java} | 27 +-
.../OperatingSystemReadOnlyResourceDefinition.java | 56 -
.../api/resources/ResourceInstanceFactoryImpl.java | 43 +-
.../resources/StackVersionResourceDefinition.java | 3 -
.../VersionDefinitionResourceDefinition.java | 61 -
.../ambari/server/api/services/AmbariMetaInfo.java | 79 +-
.../ambari/server/api/services/ClusterService.java | 16 -
.../api/services/ClusterStackVersionService.java | 151 -
.../CompatibleRepositoryVersionService.java | 115 -
.../ambari/server/api/services/HostService.java | 14 -
.../api/services/HostStackVersionService.java | 140 -
.../api/services/MpackRecommendationService.java | 66 +
.../api/services/MpackValidationService.java | 65 +
.../services/OperatingSystemReadOnlyService.java | 115 -
.../server/api/services/RepositoryService.java | 145 -
.../api/services/RepositoryVersionService.java | 161 -
.../ambari/server/api/services/StacksService.java | 52 -
.../server/api/services/UpgradePlanService.java | 14 +
.../api/services/VersionDefinitionService.java | 116 -
.../mpackadvisor/MpackAdvisorException.java | 20 +-
.../services/mpackadvisor/MpackAdvisorHelper.java | 213 +
.../services/mpackadvisor/MpackAdvisorRequest.java | 274 +
.../mpackadvisor/MpackAdvisorRequestException.java | 13 +-
.../mpackadvisor/MpackAdvisorResponse.java | 74 +
.../services/mpackadvisor/MpackAdvisorRunner.java | 226 +
.../mpackadvisor/commands/MpackAdvisorCommand.java | 547 ++
.../commands/MpackAdvisorCommandType.java} | 38 +-
.../MpackComponentLayoutRecommendationCommand.java | 82 +
.../MpackComponentLayoutValidationCommand.java | 82 +
.../MpackConfigurationRecommendationCommand.java | 84 +
.../MpackConfigurationValidationCommand.java | 82 +
.../MpackRecommendationResponse.java | 386 ++
.../validations/MpackValidationResponse.java | 188 +
.../event/request/AddUpgradeRequestAuditEvent.java | 12 +-
.../eventcreator/RepositoryEventCreator.java | 112 -
.../RepositoryVersionEventCreator.java | 197 -
.../request/eventcreator/UpgradeEventCreator.java | 2 +-
.../server/checks/AutoStartDisabledCheck.java | 19 +-
.../ambari/server/checks/CheckDescription.java | 137 +-
.../server/checks/ClientRetryPropertyCheck.java | 148 -
...tractCheckDescriptor.java => ClusterCheck.java} | 240 +-
.../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 +-
.../org/apache/ambari/server/checks/LZOCheck.java | 80 -
.../ambari/server/checks/PreUpgradeCheck.java | 98 +
.../server/checks/PreviousUpgradeCompleted.java | 23 +-
.../checks/RequiredServicesInRepositoryCheck.java | 93 -
.../server/checks/ServiceCheckValidityCheck.java | 22 +-
.../ambari/server/checks/ServicePresenceCheck.java | 28 +-
.../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 | 32 +-
.../ambari/server/configuration/AmbariConfig.java | 130 +
.../ambari/server/configuration/Configuration.java | 26 +
.../server/controller/ActionExecutionContext.java | 38 +-
.../controller/AmbariManagementController.java | 34 -
.../controller/AmbariManagementControllerImpl.java | 1055 +---
.../ambari/server/controller/AmbariServer.java | 4 +
.../ambari/server/controller/ControllerModule.java | 33 +-
.../server/controller/KerberosHelperImpl.java | 14 +-
.../server/controller/MaintenanceStateHelper.java | 2 +-
.../ambari/server/controller/MpackRequest.java | 3 +-
.../server/controller/PrereqCheckRequest.java | 110 +-
.../PrereqCheckRequestFactory.java} | 23 +-
.../server/controller/RepositoryRequest.java | 132 -
.../server/controller/RepositoryResponse.java | 201 -
.../server/controller/ResourceProviderFactory.java | 7 -
.../controller/ServiceComponentHostRequest.java | 24 +-
.../server/controller/ServiceGroupRequest.java | 60 +-
.../server/controller/ServiceGroupResponse.java | 80 +-
.../ambari/server/controller/ServiceResponse.java | 23 +
.../AbstractControllerResourceProvider.java | 14 +-
.../internal/BlueprintConfigurationProcessor.java | 2 +-
.../internal/BlueprintResourceProvider.java | 4 +-
.../internal/ClusterResourceProvider.java | 25 +-
.../ClusterStackVersionResourceProvider.java | 870 ---
.../internal/CompatibleRepositoryVersion.java | 62 -
...ompatibleRepositoryVersionResourceProvider.java | 347 --
.../internal/ComponentResourceProvider.java | 48 +-
.../server/controller/internal/CompositeStack.java | 17 +-
.../controller/internal/DefaultProviderModule.java | 8 +-
.../internal/ExportBlueprintRequest.java | 5 +-
.../internal/HostComponentResourceProvider.java | 44 +-
.../controller/internal/HostResourceProvider.java | 22 -
.../internal/HostStackVersionResourceProvider.java | 571 --
.../internal/MpackAdvisorResourceProvider.java | 454 ++
.../MpackRecommendationResourceProvider.java | 238 +
.../controller/internal/MpackResourceProvider.java | 7 -
.../internal/MpackValidationResourceProvider.java | 212 +
.../OperatingSystemReadOnlyResourceProvider.java | 163 -
.../internal/OperatingSystemResourceProvider.java | 3 +
.../internal/PreUpgradeCheckResourceProvider.java | 103 +-
.../internal/ProvisionClusterRequest.java | 77 +-
.../internal/RepositoryResourceProvider.java | 273 -
.../RepositoryVersionResourceProvider.java | 509 --
.../ServiceDependencyResourceProvider.java | 19 +-
.../internal/ServiceGroupResourceProvider.java | 78 +-
.../internal/ServiceResourceProvider.java | 102 +-
.../ambari/server/controller/internal/Stack.java | 20 +-
.../controller/internal/StackDefinition.java | 8 +-
.../UpgradePlanInstallResourceProvider.java | 441 ++
.../internal/UpgradePlanResourceProvider.java | 22 +-
.../internal/UpgradeResourceProvider.java | 313 +-
.../VersionDefinitionResourceProvider.java | 821 ---
.../logging/LoggingRequestHelperFactoryImpl.java | 2 +-
.../ambari/server/controller/spi/Resource.java | 20 +-
.../controller/utilities/UsedIdentities.java | 2 +-
.../apache/ambari/server/events/AmbariEvent.java | 4 +-
.../HostComponentVersionAdvertisedEvent.java | 2 +-
...ent.java => ServiceGroupMpackChangedEvent.java} | 6 +-
.../ambari/server/events/UpgradeUpdateEvent.java | 12 -
.../listeners/alerts/AlertReceivedListener.java | 2 +-
.../upgrade/MpackInstallStateListener.java | 7 +-
.../upgrade/StackUpgradeFinishListener.java | 2 +-
.../publishers/CommandReportEventPublisher.java | 9 +-
.../server/metadata/ClusterMetadataGenerator.java | 285 +
.../ambari/server/metadata/RoleCommandOrder.java | 6 +-
.../apache/ambari/server/mpack/MpackGenerator.java | 525 --
.../ambari/server/orm/dao/AlertDispatchDAO.java | 2 +-
.../org/apache/ambari/server/orm/dao/MpackDAO.java | 2 +-
.../ambari/server/orm/dao/MpackHostStateDAO.java | 25 +
.../server/orm/dao/RepositoryVersionDAO.java | 266 -
.../ambari/server/orm/dao/ServiceConfigDAO.java | 2 +-
.../apache/ambari/server/orm/dao/UpgradeDAO.java | 24 -
.../server/orm/entities/ClusterServiceEntity.java | 4 +-
.../orm/entities/HostGroupComponentEntity.java | 2 +-
.../ambari/server/orm/entities/MpackEntity.java | 18 +-
.../server/orm/entities/MpackHostStateEntity.java | 6 +-
.../server/orm/entities/MpackInstanceEntity.java | 21 +-
.../ambari/server/orm/entities/RepoOsEntity.java | 26 +-
.../orm/entities/RepositoryVersionEntity.java | 506 --
.../server/orm/entities/ServiceGroupEntity.java | 21 +
.../ambari/server/orm/entities/UpgradeEntity.java | 179 +-
.../server/orm/entities/UpgradeHistoryEntity.java | 143 +-
.../orm/entities/UpgradePlanConfigEntity.java | 2 +-
.../orm/entities/UpgradePlanDetailEntity.java | 17 +
.../server/serveraction/ServerActionExecutor.java | 28 +-
.../AbstractPrepareKerberosServerAction.java | 2 +-
.../server/serveraction/kerberos/Component.java | 12 +
.../PrepareDisableKerberosServerAction.java | 2 +-
.../PrepareEnableKerberosServerAction.java | 2 +-
.../PrepareKerberosIdentitiesServerAction.java | 2 +-
.../serveraction/upgrades/ConfigureAction.java | 27 +-
.../upgrades/CreateAndConfigureAction.java | 19 +-
.../upgrades/FinalizeUpgradeAction.java | 197 +-
.../serveraction/upgrades/FixNotebookStorage.java | 96 -
.../upgrades/PreconfigureKerberosAction.java | 21 +-
.../upgrades/UpdateDesiredMpackAction.java | 51 +
.../upgrades/UpdateDesiredRepositoryAction.java | 156 -
.../upgrades/UpgradeUserKerberosDescriptor.java | 7 +-
.../ambari/server/stack/MasterHostResolver.java | 25 +-
.../org/apache/ambari/server/stack/RepoUtil.java | 24 -
.../apache/ambari/server/stack/StackContext.java | 187 -
.../apache/ambari/server/stack/StackManager.java | 24 +-
.../apache/ambari/server/stack/StackModule.java | 139 +-
.../ambari/server/stack/StackServiceDirectory.java | 13 +-
.../apache/ambari/server/state/CheckHelper.java | 78 +-
.../org/apache/ambari/server/state/Cluster.java | 29 +-
.../apache/ambari/server/state/ConfigHelper.java | 43 +-
.../ambari/server/state/ConfigMergeHelper.java | 3 +-
.../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/RepositoryInfo.java | 8 -
.../apache/ambari/server/state/RepositoryType.java | 93 -
.../ambari/server/state/ServiceComponent.java | 9 +-
.../ambari/server/state/ServiceComponentImpl.java | 25 +-
.../apache/ambari/server/state/ServiceGroup.java | 8 +
.../ambari/server/state/ServiceGroupImpl.java | 91 +-
.../apache/ambari/server/state/ServiceImpl.java | 3 -
.../org/apache/ambari/server/state/StackInfo.java | 74 +-
.../apache/ambari/server/state/UpgradeContext.java | 857 ++-
.../apache/ambari/server/state/UpgradeHelper.java | 487 +-
.../server/state/alert/AlertDefinitionHash.java | 5 +-
.../ambari/server/state/cluster/ClusterImpl.java | 162 +-
.../ambari/server/state/cluster/ClustersImpl.java | 6 +-
.../apache/ambari/server/state/host/HostImpl.java | 5 +-
.../ambari/server/state/repository/Release.java | 7 -
.../state/repository/VersionDefinitionXml.java | 706 ---
.../state/services/RetryUpgradeActionService.java | 14 +-
.../server/state/stack/LatestRepoCallable.java | 263 -
.../ambari/server/state/stack/RepoVdfCallable.java | 161 -
...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 | 179 +-
.../state/stack/upgrade/ServiceCheckGrouping.java | 7 +-
.../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/ServiceComponentHostImpl.java | 7 +-
.../svccomphost/ServiceComponentHostSummary.java | 91 -
.../ambari/server/topology/AmbariContext.java | 181 +-
.../AmbiguousComponentException.java} | 43 +-
.../server/topology/AsyncCallableService.java | 2 +-
.../BlueprintBasedClusterProvisionRequest.java | 46 +-
.../ambari/server/topology/BlueprintFactory.java | 36 +-
.../ambari/server/topology/BlueprintImpl.java | 16 +-
.../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 | 45 +-
.../topology/ConfigRecommendationStrategy.java | 24 +-
.../ambari/server/topology/DownloadMpacksTask.java | 115 +
.../ambari/server/topology/HostGroupImpl.java | 2 +-
.../ambari/server/topology/HostGroupInfo.java | 5 +-
.../ambari/server/topology/MpackInstance.java | 50 +-
.../ambari/server/topology/ProvisionRequest.java | 2 +
.../ambari/server/topology/ResolvedComponent.java | 30 +-
.../server/topology/ResolvedComponent_Builder.java | 276 +-
.../server/topology/StackComponentResolver.java | 106 +-
.../ambari/server/topology/TopologyManager.java | 39 +-
.../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 +-
.../server/upgrade/AbstractUpgradeCatalog.java | 14 +-
.../ambari/server/upgrade/FinalUpgradeCatalog.java | 2 +-
.../ambari/server/upgrade/UpgradeCatalog251.java | 4 +-
.../ambari/server/upgrade/UpgradeCatalog260.java | 18 -
.../org/apache/ambari/server/utils/StageUtils.java | 6 +-
.../apache/ambari/server/view/ViewRegistry.java | 7 +-
.../src/main/python/ambari_server/BackupRestore.py | 3 +-
.../python/ambari_server/serverConfiguration.py | 5 +
.../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 41 +-
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 40 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 40 +-
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 40 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 40 +-
.../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 40 +-
.../src/main/resources/META-INF/persistence.xml | 1 -
.../system_action_definitions.xml | 4 +-
.../custom_actions/scripts/install_packages.py | 480 --
.../custom_actions/scripts/mpack_packages.py | 216 +
.../resources/scripts/mpack_advisor_wrapper.py | 157 +
.../stack-hooks/before-ANY/scripts/params.py | 28 +-
.../before-ANY/scripts/shared_initialization.py | 77 -
.../stack-hooks/before-INSTALL/scripts/params.py | 16 +-
.../before-START/scripts/custom_extensions.py | 31 +-
.../stack-hooks/before-START/scripts/params.py | 16 +-
.../stacks/{stack_advisor.py => mpack_advisor.py} | 1209 ++--
.../src/main/resources/stacks/service_advisor.py | 16 +-
.../src/main/resources/stacks/stack_advisor.py | 4 +-
ambari-server/src/main/resources/upgrade-pack.xsd | 11 -
.../actionmanager/ExecutionCommandWrapperTest.java | 40 +-
.../server/actionmanager/StageHelperTest.java | 102 +
.../actionmanager/TestActionDBAccessorImpl.java | 3 +
.../server/actionmanager/TestActionScheduler.java | 21 +-
.../TestActionSchedulerThreading.java | 21 +-
.../ambari/server/agent/AgentResourceTest.java | 2 +
.../server/agent/HeartbeatProcessorTest.java | 66 +-
.../ambari/server/agent/TestHeartbeatHandler.java | 5 +
.../ambari/server/agent/TestHeartbeatMonitor.java | 13 +-
.../ambari/server/api/query/QueryImplTest.java | 27 -
.../query/render/ClusterBlueprintRendererTest.java | 18 +-
.../api/resources/BaseResourceDefinitionTest.java | 7 +-
.../resources/ClusterResourceDefinitionTest.java | 3 +-
...omponentStackVersionResourceDefinitionTest.java | 48 -
.../api/resources/HostResourceDefinitionTest.java | 22 +-
.../RepositoryResourceDefinitionTest.java | 57 -
.../RepositoryVersionResourceDefinitionTest.java | 52 -
.../StackVersionResourceDefinitionTest.java | 81 -
.../server/api/services/AmbariMetaInfoTest.java | 102 +-
.../services/ClusterStackVersionServiceTest.java | 98 -
.../api/services/HostComponentServiceTest.java | 6 -
.../api/services/HostStackVersionServiceTest.java | 86 -
.../api/services/KerberosServiceMetaInfoTest.java | 17 -
.../server/api/services/RepositoryServiceTest.java | 107 -
.../creator/RepositoryEventCreatorTest.java | 88 -
.../creator/RepositoryVersionEventCreatorTest.java | 163 -
.../request/creator/UpgradeEventCreatorTest.java | 4 +-
.../server/checks/AutoStartDisabledCheckTest.java | 57 +-
.../checks/ClientRetryPropertyCheckTest.java | 193 -
...ckDescriptorTest.java => ClusterCheckTest.java} | 70 +-
.../checks/ComponentExistsInRepoCheckTest.java | 121 +-
.../checks/ComponentsInstallationCheckTest.java | 71 +-
.../server/checks/ConfigurationMergeCheckTest.java | 97 +-
.../checks/DatabaseConsistencyCheckHelperTest.java | 16 +-
.../ambari/server/checks/HealthCheckTest.java | 24 +-
.../checks/HostMaintenanceModeCheckTest.java | 40 +-
.../server/checks/HostsHeartbeatCheckTest.java | 43 +-
.../checks/HostsMasterMaintenanceCheckTest.java | 77 +-
.../apache/ambari/server/checks/LZOCheckTest.java | 152 -
.../checks/PreviousUpgradeCompletedTest.java | 34 +-
.../RequiredServicesInRepositoryCheckTest.java | 115 -
.../checks/ServiceCheckValidityCheckTest.java | 54 +-
.../server/checks/ServicePresenceCheckTest.java | 99 +-
.../checks/ServicesMaintenanceModeCheckTest.java | 44 +-
.../ambari/server/checks/ServicesUpCheckTest.java | 69 +-
.../server/checks/UpgradeCheckOrderTest.java | 10 +-
.../server/checks/VersionMismatchCheckTest.java | 26 +-
.../AmbariConfigTest.java} | 41 +-
.../AmbariCustomCommandExecutionHelperTest.java | 247 +-
.../AmbariManagementControllerImplTest.java | 565 +-
.../controller/AmbariManagementControllerTest.java | 231 +-
.../ambari/server/controller/AmbariServerTest.java | 22 +-
.../BackgroundCustomCommandExecutionTest.java | 78 +-
.../server/controller/KerberosHelperTest.java | 40 +-
.../AbstractControllerResourceProviderTest.java | 7 +-
.../internal/AbstractResourceProviderTest.java | 7 +-
.../BlueprintConfigurationProcessorTest.java | 85 +-
.../internal/ClusterControllerImplTest.java | 73 -
.../internal/ClusterResourceProviderTest.java | 67 +-
...tibleRepositoryVersionResourceProviderTest.java | 429 --
.../internal/ComponentResourceProviderTest.java | 38 +-
.../HostComponentResourceProviderTest.java | 10 +-
.../internal/HostResourceProviderTest.java | 17 +-
.../controller/internal/JMXHostProviderTest.java | 39 +-
.../PreUpgradeCheckResourceProviderTest.java | 25 +-
.../internal/ProvisionClusterRequestTest.java | 43 +-
.../internal/RepositoryResourceProviderTest.java | 205 -
.../RepositoryVersionResourceProviderTest.java | 592 --
.../controller/internal/RequestImplTest.java | 23 -
.../ServiceDependencyResourceProviderTest.java | 62 +-
...ServiceGroupDependencyResourceProviderTest.java | 17 +-
.../internal/ServiceGroupResourceProviderTest.java | 2 +-
.../internal/ServiceResourceProviderTest.java | 279 +-
.../internal/StackDefinedPropertyProviderTest.java | 2 +-
.../internal/UpgradePlanResourceProviderTest.java | 2 +
.../UpgradeSummaryResourceProviderTest.java | 16 +-
.../LoggingRequestHelperFactoryImplTest.java | 8 +-
.../utilities/KerberosIdentityCleanerTest.java | 14 +-
.../apache/ambari/server/events/EventsTest.java | 7 +-
.../server/metadata/RoleCommandOrderTest.java | 35 +-
.../ambari/server/metadata/RoleGraphTest.java | 12 +-
.../apache/ambari/server/orm/OrmTestHelper.java | 144 +-
.../apache/ambari/server/orm/dao/CrudDAOTest.java | 56 +-
.../server/orm/dao/RepositoryVersionDAOTest.java | 220 -
.../ambari/server/orm/dao/UpgradeDAOTest.java | 133 +-
.../orm/entities/ServiceConfigEntityTest.java | 16 +-
.../server/sample/checks/SampleServiceCheck.java | 16 +-
...apAuthenticationProviderForDNWithSpaceTest.java | 1 +
.../AmbariLdapAuthenticationProviderTest.java | 1 +
.../AbstractPrepareKerberosServerActionTest.java | 2 +-
.../kerberos/FinalizeKerberosServerActionTest.java | 1 +
.../kerberos/KerberosServerActionTest.java | 1 +
.../upgrades/ComponentVersionCheckActionTest.java | 83 +-
.../upgrades/CreateAndConfigureActionTest.java | 59 +-
.../upgrades/PreconfigureKerberosActionTest.java | 7 +-
.../UpgradeUserKerberosDescriptorTest.java | 15 +-
.../apache/ambari/server/stack/RepoUtilTest.java | 19 +-
.../stack/StackManagerCommonServicesTest.java | 19 -
.../ambari/server/stack/StackModuleTest.java | 72 -
.../server/stageplanner/TestStagePlanner.java | 42 +-
.../ambari/server/state/CheckHelperTest.java | 100 +-
.../ambari/server/state/ConfigGroupTest.java | 2 +-
.../ambari/server/state/ConfigHelperTest.java | 17 +-
.../ambari/server/state/ServiceComponentTest.java | 21 +-
.../apache/ambari/server/state/ServiceTest.java | 3 +-
.../ambari/server/state/UpgradeContextTest.java | 501 --
.../state/alerts/AlertDefinitionHashTest.java | 40 +-
.../state/alerts/AlertEventPublisherTest.java | 3 +-
.../server/state/alerts/InitialAlertEventTest.java | 3 +-
.../server/state/cluster/ClusterDeadlockTest.java | 3 +-
.../server/state/cluster/ClusterImplTest.java | 61 +-
.../ambari/server/state/cluster/ClusterTest.java | 46 +-
.../server/state/cluster/ClustersDeadlockTest.java | 3 +-
.../ambari/server/state/cluster/ClustersTest.java | 43 +-
.../ConcurrentServiceConfigVersionTest.java | 3 +-
...ceComponentHostConcurrentWriteDeadlockTest.java | 3 +-
.../ambari/server/state/host/HostImplTest.java | 88 +-
.../apache/ambari/server/state/host/HostTest.java | 12 +-
.../services/RetryUpgradeActionServiceTest.java | 30 +-
.../stack/upgrade/StageWrapperBuilderTest.java | 25 +-
.../svccomphost/ServiceComponentHostTest.java | 19 +-
.../ambari/server/topology/AmbariContextTest.java | 156 +-
.../server/topology/BlueprintFactoryTest.java | 42 -
.../topology/ClusterConfigurationRequestTest.java | 145 +-
.../topology/ClusterDeployWithStartOnlyTest.java | 64 +-
...terInstallWithoutStartOnComponentLevelTest.java | 62 +-
.../topology/ClusterInstallWithoutStartTest.java | 63 +-
.../server/topology/ClusterTopologyImplTest.java | 149 +-
.../server/topology/ConfigureClusterTaskTest.java | 7 +
.../server/topology/DownloadMpacksTaskTest.java | 160 +
.../ambari/server/topology/StackBuilder.java | 190 +
.../topology/StackComponentResolverTest.java | 284 +-
.../server/topology/TopologyManagerTest.java | 164 +-
.../DependencyAndCardinalityValidatorTest.java | 502 +-
.../validators/HiveServiceValidatorTest.java | 7 +-
.../RejectUnknownComponentsTest.java} | 10 +-
.../validators/RequiredPasswordValidatorTest.java | 22 +-
.../topology/validators/TopologyValidatorTest.java | 256 +
.../ambari/server/update/HostUpdateHelperTest.java | 2 +-
.../server/upgrade/AbstractUpgradeCatalogTest.java | 22 +-
.../server/upgrade/UpgradeCatalog251Test.java | 16 +-
.../server/upgrade/UpgradeCatalog252Test.java | 30 +-
.../server/upgrade/UpgradeCatalog260Test.java | 52 +-
.../server/upgrade/UpgradeCatalog270Test.java | 27 +-
.../server/upgrade/UpgradeCatalogHelper.java | 114 -
.../apache/ambari/server/utils/StageUtilsTest.java | 8 +-
.../ambari/server/view/ViewRegistryTest.java | 7 +-
ambari-server/src/test/python/TestMpackAdvisor.py | 55 +
.../python/custom_actions/TestInstallPackages.py | 1278 -----
.../custom_actions/configs/mpack_packages.json | 227 +
.../python/custom_actions/test_mpack_install.py | 191 +
.../mpack_advisor_data/hdfs/service_advisor.py | 685 +++
.../python/mpacks/mpack_advisor_data/hosts.json | 405 ++
.../python/mpacks/mpack_advisor_data/services.json | 6011 ++++++++++++++++++++
.../mpack_advisor_data/yarn/service_advisor.py | 2215 ++++++++
.../zookeeper/service_advisor.py | 171 +
.../cust_action_definitions1.xml | 6 +-
.../cust_action_definitions_invalid.xml | 3 +-
.../HDP/2.0.6/services/HADOOP_CLIENTS/metainfo.xml | 5 +
ambari-web/app/app.js | 120 +-
ambari-web/app/assets/test/tests.js | 12 -
ambari-web/app/controllers.js | 3 -
ambari-web/app/controllers/application.js | 34 -
.../app/controllers/global/cluster_controller.js | 154 +-
.../app/controllers/global/update_controller.js | 7 +-
ambari-web/app/controllers/installer.js | 222 +-
.../nameNode/rollbackHA/step2_controller.js | 2 +-
.../nameNode/rollback_controller.js | 10 +-
.../highAvailability/nameNode/step4_controller.js | 2 +-
.../highAvailability/nameNode/step5_controller.js | 2 +-
.../highAvailability/nameNode/step6_controller.js | 2 +-
.../highAvailability/nameNode/step9_controller.js | 2 +-
.../highAvailability/progress_popup_controller.js | 3 -
.../main/admin/kerberos/step6_controller.js | 4 +-
.../controllers/main/admin/service_auto_start.js | 12 +-
.../main/admin/stack_and_upgrade_controller.js | 2226 --------
ambari-web/app/controllers/main/host.js | 10 -
.../app/controllers/main/host/add_controller.js | 10 -
.../main/host/bulk_operations_controller.js | 3 +-
ambari-web/app/controllers/main/host/details.js | 14 +-
ambari-web/app/controllers/main/service.js | 8 +-
.../app/controllers/main/service/info/configs.js | 6 +-
.../app/controllers/main/service/info/summary.js | 2 +-
ambari-web/app/controllers/main/service/item.js | 62 +-
.../main/service/reassign/step4_controller.js | 58 +-
.../main/service/reassign/step6_controller.js | 6 +-
.../main/service/reassign/step7_controller.js | 4 +-
.../service/widgets/create/wizard_controller.js | 2 +-
ambari-web/app/controllers/wizard.js | 180 +-
.../wizard/downloadMpacks_controller.js | 25 +-
.../controllers/wizard/selectMpacks_controller.js | 5 +-
.../app/controllers/wizard/step1_controller.js | 474 --
.../app/controllers/wizard/step2_controller.js | 26 +-
.../app/controllers/wizard/step4_controller.js | 642 ---
.../app/controllers/wizard/step6_controller.js | 249 +-
.../wizard/step7/assign_master_controller.js | 2 +-
.../app/controllers/wizard/step7_controller.js | 10 +-
.../app/controllers/wizard/step8_controller.js | 499 +-
.../app/controllers/wizard/step9_controller.js | 44 +-
ambari-web/app/data/controller_route.js | 4 -
ambari-web/app/mappers.js | 3 +-
.../configs/stack_config_properties_mapper.js | 27 +-
ambari-web/app/mappers/hosts_mapper.js | 3 +
ambari-web/app/mappers/mpack_service_mapper.js | 6 +-
ambari-web/app/mappers/service_mapper.js | 63 +-
ambari-web/app/mappers/service_metrics_mapper.js | 2 +-
.../app/mappers/socket/upgrade_state_mapper.js | 42 -
ambari-web/app/mappers/stack_mapper.js | 1 +
ambari-web/app/mappers/stack_service_mapper.js | 16 +-
ambari-web/app/messages.js | 1 +
ambari-web/app/mixins/common/blueprint.js | 6 +-
.../app/mixins/common/configs/configs_saver.js | 9 +-
.../app/mixins/common/configs/enhanced_configs.js | 72 +-
.../hosts/host_component_recommendation_mixin.js | 64 +-
.../hosts/host_component_validation_mixin.js | 58 +-
ambari-web/app/mixins/common/serverValidator.js | 74 +-
.../details/host_components/decommissionable.js | 2 +-
.../details/host_components/install_component.js | 2 +-
.../details/support_client_configs_download.js | 2 +-
.../configs/component_actions_by_configs.js | 2 +-
.../app/mixins/main/service/themes_mapping.js | 22 +-
.../app/mixins/wizard/assign_master_components.js | 43 +-
.../mixins/wizard/wizardProgressPageController.js | 14 +-
ambari-web/app/models/host_component.js | 4 +-
ambari-web/app/models/service.js | 3 +
ambari-web/app/models/stack_service.js | 2 +-
ambari-web/app/router.js | 24 +-
ambari-web/app/routes/add_host_routes.js | 24 +-
ambari-web/app/routes/add_service_routes.js | 38 +-
ambari-web/app/routes/installer.js | 88 +-
ambari-web/app/routes/main.js | 74 +-
ambari-web/app/routes/stack_upgrade_routes.js | 95 -
ambari-web/app/styles/application.less | 11 +-
ambari-web/app/styles/bootstrap_overrides.less | 2 -
ambari-web/app/styles/dashrow.less | 8 +-
ambari-web/app/styles/wizard.less | 7 +
ambari-web/app/templates/application.hbs | 26 -
.../app/templates/main/admin/stack_and_upgrade.hbs | 22 -
.../main/admin/stack_upgrade/services.hbs | 123 -
.../admin/stack_upgrade/stack_upgrade_wizard.hbs | 340 --
.../stack_upgrade/upgrade_configs_merge_table.hbs | 2 +-
.../upgrade_configs_recommend_table.hbs | 2 +-
.../admin/stack_upgrade/upgrade_version_box.hbs | 116 -
.../admin/stack_upgrade/upgrade_version_column.hbs | 121 -
.../main/admin/stack_upgrade/versions.hbs | 71 -
.../app/templates/main/host/stack_versions.hbs | 10 +-
ambari-web/app/templates/main/service/service.hbs | 6 +
ambari-web/app/templates/wizard/step1.hbs | 292 -
.../step1/public_option_disabled_window_body.hbs | 26 -
.../app/templates/wizard/step1/vdf_upload.hbs | 40 -
.../templates/wizard/step1_addLocalRepository.hbs | 55 -
ambari-web/app/templates/wizard/step2.hbs | 3 +-
ambari-web/app/templates/wizard/step4.hbs | 115 -
.../step4/step4_ranger_requirements_popup.hbs | 22 -
ambari-web/app/templates/wizard/step6.hbs | 7 +-
ambari-web/app/templates/wizard/step8.hbs | 46 +-
ambari-web/app/utils/ajax/ajax.js | 212 +-
ambari-web/app/utils/batch_scheduled_requests.js | 77 +-
ambari-web/app/utils/config.js | 18 +-
ambari-web/app/utils/constants.js | 14 +-
ambari-web/app/utils/misc.js | 7 +-
ambari-web/app/views.js | 9 -
.../views/common/host_progress_popup_body_view.js | 3 +-
.../common/modal_popups/cluster_check_popup.js | 38 +-
.../app/views/common/quick_view_link_view.js | 4 +-
ambari-web/app/views/main/admin.js | 7 -
.../views/main/admin/stack_upgrade/menu_view.js | 70 -
.../main/admin/stack_upgrade/services_view.js | 277 -
.../stack_upgrade/upgrade_version_box_view.js | 635 ---
.../stack_upgrade/upgrade_version_column_view.js | 120 -
.../admin/stack_upgrade/upgrade_wizard_view.js | 520 --
.../main/admin/stack_upgrade/versions_view.js | 254 -
.../views/main/dashboard/widgets/hbase_links.js | 2 +-
.../details/host_component_views/datanode_view.js | 2 +-
.../app/views/main/host/stack_versions_view.js | 7 -
ambari-web/app/views/main/menu.js | 8 -
.../info/metrics/flume/flume_metric_graph.js | 2 +-
.../info/metrics/flume/flume_metric_graphs.js | 2 +-
ambari-web/app/views/main/service/item.js | 2 +-
.../app/views/main/service/reassign/step5_view.js | 2 +-
ambari-web/app/views/main/service/service.js | 7 +-
.../main/service/widgets/create/expression_view.js | 2 +-
ambari-web/app/views/wizard/step1_view.js | 290 -
ambari-web/app/views/wizard/step6_view.js | 1 -
ambari-web/test/app_test.js | 176 -
.../controllers/global/cluster_controller_test.js | 354 +-
.../controllers/global/update_controller_test.js | 1 -
ambari-web/test/controllers/installer_test.js | 230 +-
.../nameNode/step4_controller_test.js | 2 +-
.../nameNode/step5_controller_test.js | 2 +-
.../nameNode/step6_controller_test.js | 2 +-
.../nameNode/step9_controller_test.js | 2 +-
.../progress_popup_controller_test.js | 6 -
.../main/admin/kerberos/step6_controller_test.js | 6 +-
.../main/admin/service_auto_start_test.js | 12 +-
.../admin/stack_and_upgrade_controller_test.js | 3606 ------------
.../controllers/main/host/configs_service_test.js | 8 +
.../test/controllers/main/host/details_test.js | 16 +-
.../controllers/main/service/info/config_test.js | 6 +-
.../test/controllers/main/service/item_test.js | 22 +-
.../main/service/reassign/step4_controller_test.js | 14 +-
.../main/service/reassign/step6_controller_test.js | 6 +-
.../main/service/reassign/step7_controller_test.js | 8 +-
ambari-web/test/controllers/main/service_test.js | 16 +-
.../test/controllers/wizard/downloadMpacks_test.js | 26 +-
.../test/controllers/wizard/selectMpacks_test.js | 12 +-
ambari-web/test/controllers/wizard/step1_test.js | 403 --
ambari-web/test/controllers/wizard/step4_test.js | 1084 ----
ambari-web/test/controllers/wizard/step5_test.js | 24 +-
ambari-web/test/controllers/wizard/step6_test.js | 656 ---
.../wizard/step7/assign_master_controller_test.js | 6 +-
ambari-web/test/controllers/wizard/step8_test.js | 273 +-
ambari-web/test/controllers/wizard_test.js | 6 +-
.../mappers/socket/upgrade_state_mapper_test.js | 80 -
.../test/mappers/stack_service_mapper_test.js | 2 +-
.../mixins/common/configs/configs_saver_test.js | 150 +-
.../mixins/common/configs/enhanced_configs_test.js | 115 +-
.../host_component_recommendation_mixin_test.js | 74 +-
.../hosts/host_component_validation_mixin_test.js | 73 +-
.../mixins/common/widgets/widget_section_test.js | 4 +-
.../host_components/install_component_test.js | 2 +-
.../configs/component_actions_by_configs_test.js | 2 +-
ambari-web/test/utils/config_test.js | 11 +-
.../main/admin/stack_upgrade/menu_view_test.js | 59 -
.../main/admin/stack_upgrade/services_view_test.js | 91 -
.../stack_upgrade/upgrade_version_box_view_test.js | 1552 -----
.../upgrade_version_column_view_test.js | 193 -
.../stack_upgrade/upgrade_wizard_view_test.js | 956 ----
.../main/admin/stack_upgrade/version_view_test.js | 604 --
.../host_component_views/datanode_view_test.js | 2 +-
.../host_component_views/decommissionable_test.js | 2 +-
.../views/main/host/stack_versions_view_test.js | 21 -
ambari-web/test/views/wizard/step1_view_test.js | 230 -
ambari-web/test/views/wizard/step4_view_test.js | 21 -
ambari-web/test/views/wizard/step6_view_test.js | 6 -
.../python/instance_manager/instance_manager.py | 74 +-
.../instance_manager/mpack-instance-manager.py | 18 +-
.../instance_manager/test_instance_manager.py | 108 +
642 files changed, 25267 insertions(+), 43675 deletions(-)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/actionmanager/StageHelper.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentStackVersionResourceDefinition.java
copy ambari-server/src/main/java/org/apache/ambari/server/api/resources/{RepositoryResourceDefinition.java => MpackRecommendationResourceDefinition.java} (69%)
rename ambari-server/src/main/java/org/apache/ambari/server/api/resources/{RepositoryVersionResourceDefinition.java => MpackValidationResourceDefinition.java} (69%)
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/resources/OperatingSystemReadOnlyResourceDefinition.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/resources/VersionDefinitionResourceDefinition.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/MpackRecommendationService.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/MpackValidationService.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemReadOnlyService.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java
rename ambari-web/app/views/wizard/step4_view.js => ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/MpackAdvisorException.java (71%)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/MpackAdvisorHelper.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/MpackAdvisorRequest.java
rename ambari-web/app/views/main/admin/stack_and_upgrade_view.js => ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/MpackAdvisorRequestException.java (76%)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/MpackAdvisorResponse.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/MpackAdvisorRunner.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/commands/MpackAdvisorCommand.java
rename ambari-server/src/main/java/org/apache/ambari/server/api/{resources/RepositoryResourceDefinition.java => services/mpackadvisor/commands/MpackAdvisorCommandType.java} (55%)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/commands/MpackComponentLayoutRecommendationCommand.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/commands/MpackComponentLayoutValidationCommand.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/commands/MpackConfigurationRecommendationCommand.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/commands/MpackConfigurationValidationCommand.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/recommendations/MpackRecommendationResponse.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/api/services/mpackadvisor/validations/MpackValidationResponse.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryEventCreator.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/RepositoryVersionEventCreator.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/ClientRetryPropertyCheck.java
rename ambari-server/src/main/java/org/apache/ambari/server/checks/{AbstractCheckDescriptor.java => ClusterCheck.java} (67%)
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/checks/LZOCheck.java
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
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/configuration/AmbariConfig.java
copy ambari-server/src/main/java/org/apache/ambari/server/{topology/validators/TopologyValidator.java => controller/PrereqCheckRequestFactory.java} (61%)
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/RepositoryRequest.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/RepositoryResponse.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersion.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackAdvisorResourceProvider.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackRecommendationResourceProvider.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackValidationResourceProvider.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/OperatingSystemReadOnlyResourceProvider.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradePlanInstallResourceProvider.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
rename ambari-server/src/main/java/org/apache/ambari/server/events/{ClusterComponentsRepoChangedEvent.java => ServiceGroupMpackChangedEvent.java} (81%)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/metadata/ClusterMetadataGenerator.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackGenerator.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
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
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/UpdateDesiredMpackAction.java
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
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
delete mode 100644 ambari-server/src/main/java/org/apache/ambari/server/state/stack/RepoVdfCallable.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/svccomphost/ServiceComponentHostSummary.java
rename ambari-server/src/main/java/org/apache/ambari/server/{state/stack/upgrade/UpgradeScope.java => topology/AmbiguousComponentException.java} (55%)
create mode 100644 ambari-server/src/main/java/org/apache/ambari/server/topology/DownloadMpacksTask.java
delete mode 100644 ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
create mode 100644 ambari-server/src/main/resources/custom_actions/scripts/mpack_packages.py
create mode 100644 ambari-server/src/main/resources/scripts/mpack_advisor_wrapper.py
copy ambari-server/src/main/resources/stacks/{stack_advisor.py => mpack_advisor.py} (76%)
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/actionmanager/StageHelperTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/api/resources/ComponentStackVersionResourceDefinitionTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/api/resources/RepositoryResourceDefinitionTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/api/resources/RepositoryVersionResourceDefinitionTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinitionTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/audit/request/creator/RepositoryEventCreatorTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/audit/request/creator/RepositoryVersionEventCreatorTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/ClientRetryPropertyCheckTest.java
rename ambari-server/src/test/java/org/apache/ambari/server/checks/{AbstractCheckDescriptorTest.java => ClusterCheckTest.java} (79%)
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/LZOCheckTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
copy ambari-server/src/test/java/org/apache/ambari/server/{orm/entities/ServiceConfigEntityTest.java => configuration/AmbariConfigTest.java} (51%)
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java
delete mode 100644 ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/topology/DownloadMpacksTaskTest.java
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/topology/StackBuilder.java
copy ambari-server/src/test/java/org/apache/ambari/server/topology/{StackComponentResolverTest.java => validators/RejectUnknownComponentsTest.java} (89%)
create mode 100644 ambari-server/src/test/java/org/apache/ambari/server/topology/validators/TopologyValidatorTest.java
create mode 100644 ambari-server/src/test/python/TestMpackAdvisor.py
delete mode 100644 ambari-server/src/test/python/custom_actions/TestInstallPackages.py
create mode 100644 ambari-server/src/test/python/custom_actions/configs/mpack_packages.json
create mode 100644 ambari-server/src/test/python/custom_actions/test_mpack_install.py
create mode 100644 ambari-server/src/test/python/mpacks/mpack_advisor_data/hdfs/service_advisor.py
create mode 100644 ambari-server/src/test/python/mpacks/mpack_advisor_data/hosts.json
create mode 100644 ambari-server/src/test/python/mpacks/mpack_advisor_data/services.json
create mode 100644 ambari-server/src/test/python/mpacks/mpack_advisor_data/yarn/service_advisor.py
create mode 100644 ambari-server/src/test/python/mpacks/mpack_advisor_data/zookeeper/service_advisor.py
delete mode 100644 ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
delete mode 100644 ambari-web/app/controllers/wizard/step1_controller.js
delete mode 100644 ambari-web/app/controllers/wizard/step4_controller.js
delete mode 100644 ambari-web/app/mappers/socket/upgrade_state_mapper.js
delete mode 100644 ambari-web/app/routes/stack_upgrade_routes.js
delete mode 100644 ambari-web/app/templates/main/admin/stack_and_upgrade.hbs
delete mode 100644 ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
delete mode 100644 ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
delete mode 100644 ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
delete mode 100644 ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
delete mode 100644 ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
delete mode 100644 ambari-web/app/templates/wizard/step1.hbs
delete mode 100644 ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs
delete mode 100644 ambari-web/app/templates/wizard/step1/vdf_upload.hbs
delete mode 100644 ambari-web/app/templates/wizard/step1_addLocalRepository.hbs
delete mode 100644 ambari-web/app/templates/wizard/step4.hbs
delete mode 100644 ambari-web/app/templates/wizard/step4/step4_ranger_requirements_popup.hbs
delete mode 100644 ambari-web/app/views/main/admin/stack_upgrade/menu_view.js
delete mode 100644 ambari-web/app/views/main/admin/stack_upgrade/services_view.js
delete mode 100644 ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
delete mode 100644 ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
delete mode 100644 ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
delete mode 100644 ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
delete mode 100644 ambari-web/app/views/wizard/step1_view.js
delete mode 100644 ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
delete mode 100644 ambari-web/test/controllers/wizard/step1_test.js
delete mode 100644 ambari-web/test/controllers/wizard/step4_test.js
delete mode 100644 ambari-web/test/mappers/socket/upgrade_state_mapper_test.js
delete mode 100644 ambari-web/test/views/main/admin/stack_upgrade/menu_view_test.js
delete mode 100644 ambari-web/test/views/main/admin/stack_upgrade/services_view_test.js
delete mode 100644 ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
delete mode 100644 ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js
delete mode 100644 ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
delete mode 100644 ambari-web/test/views/main/admin/stack_upgrade/version_view_test.js
delete mode 100644 ambari-web/test/views/wizard/step1_view_test.js
delete mode 100644 ambari-web/test/views/wizard/step4_view_test.js