Merge branch 'branch-feature-AMBARI-14714' into branch-feature-AMBARI-14714-ui
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/272e5006 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/272e5006 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/272e5006 Branch: refs/heads/branch-feature-AMBARI-14714-ui Commit: 272e5006c6364544719b3ed2a65e9c6800567b66 Parents: 96959e9 259036f Author: Madhuvanthi Radhakrishnan <mradhakrish...@hortonworks.com> Authored: Mon Oct 30 11:43:17 2017 -0700 Committer: Madhuvanthi Radhakrishnan <mradhakrish...@hortonworks.com> Committed: Mon Oct 30 11:43:17 2017 -0700 ---------------------------------------------------------------------- .../server/PropertyNotFoundException.java | 27 ++ .../server/ResourcesPathNotFoundException.java | 25 ++ .../actionmanager/ExecutionCommandWrapper.java | 6 +- .../ambari/server/agent/HeartBeatHandler.java | 2 +- .../alerts/ComponentVersionAlertRunnable.java | 2 +- .../query/render/ClusterBlueprintRenderer.java | 21 +- .../resources/ResourceInstanceFactoryImpl.java | 4 + .../RootClusterSettingsResourceDefinition.java | 52 +++ .../server/api/services/AmbariMetaInfo.java | 51 ++- .../server/api/services/ComponentService.java | 8 +- .../api/services/RootClusterSettingService.java | 135 ++++++ .../server/api/services/ServiceService.java | 2 +- .../server/api/services/StacksService.java | 10 +- .../StackAdvisorBlueprintProcessor.java | 14 +- .../users/ActiveWidgetLayoutService.java | 2 +- .../api/services/views/ViewInstanceService.java | 2 +- .../server/checks/AbstractCheckDescriptor.java | 8 +- .../checks/ComponentsExistInRepoCheck.java | 7 +- .../ambari/server/checks/ServicesUpCheck.java | 4 +- .../controller/AmbariActionExecutionHelper.java | 6 +- .../AmbariCustomCommandExecutionHelper.java | 10 +- .../controller/AmbariManagementController.java | 12 +- .../AmbariManagementControllerImpl.java | 85 ++-- .../ambari/server/controller/AmbariServer.java | 10 +- .../server/controller/ControllerModule.java | 2 + .../controller/DeleteIdentityHandler.java | 4 +- .../ReadOnlyConfigurationResponse.java | 272 +++++++++++ .../controller/RootClusterSettingRequest.java | 39 ++ .../controller/StackConfigurationResponse.java | 266 ----------- .../StackLevelConfigurationRequest.java | 2 +- .../StackLevelConfigurationResponse.java | 20 +- .../ambari/server/controller/StackV2.java | 447 +++++-------------- .../server/controller/StackV2Factory.java | 251 +++++++++++ .../AbstractControllerResourceProvider.java | 4 +- .../controller/internal/BaseClusterRequest.java | 38 +- .../BlueprintConfigurationProcessor.java | 286 +++++++----- .../internal/BlueprintV2ResourceProvider.java | 391 ++++++++++++++++ .../internal/ClientConfigResourceProvider.java | 15 +- .../internal/ClusterResourceProvider.java | 2 +- .../ClusterStackVersionResourceProvider.java | 7 +- .../internal/ComponentResourceProvider.java | 8 +- .../internal/ConfigurationContext.java | 60 +++ .../internal/ExportBlueprintRequest.java | 34 +- .../HostStackVersionResourceProvider.java | 4 +- .../internal/MpackResourceProvider.java | 2 - .../internal/ProvisionClusterRequest.java | 49 +- .../RootClusterSettingsResourceProvider.java | 167 +++++++ .../internal/ScaleClusterRequest.java | 18 +- .../internal/ServiceResourceProvider.java | 2 +- .../server/controller/internal/Stack.java | 14 +- .../StackConfigurationResourceProvider.java | 8 +- .../internal/StackDefinedPropertyProvider.java | 2 +- ...StackLevelConfigurationResourceProvider.java | 8 +- .../server/controller/internal/UnitUpdater.java | 15 +- .../logging/LoggingSearchPropertyProvider.java | 2 +- .../metrics/timeline/AMSPropertyProvider.java | 2 +- .../ambari/server/controller/spi/Resource.java | 2 + .../controller/utilities/DatabaseChecker.java | 2 +- .../state/DefaultServiceCalculatedState.java | 2 +- .../state/HBaseServiceCalculatedState.java | 2 +- .../state/HDFSServiceCalculatedState.java | 2 +- .../state/HiveServiceCalculatedState.java | 2 +- .../state/OozieServiceCalculatedState.java | 2 +- .../state/YARNServiceCalculatedState.java | 2 +- .../alerts/AlertMaintenanceModeListener.java | 2 +- .../alerts/AlertServiceStateListener.java | 2 +- .../upgrade/HostVersionOutOfSyncListener.java | 3 +- .../listeners/upgrade/StackVersionListener.java | 2 +- .../ambari/server/mpack/MpackManager.java | 2 +- .../ambari/server/orm/dao/BlueprintV2DAO.java | 124 +++++ .../server/orm/entities/BlueprintEntity.java | 1 - .../server/orm/entities/BlueprintV2Entity.java | 90 ++++ .../orm/entities/HostGroupComponentEntity.java | 16 +- .../entities/HostGroupComponentEntityPK.java | 36 ++ .../ambari/server/orm/entities/StackEntity.java | 11 +- .../entities/TopologyConfigurationsEntity.java | 148 ++++++ .../orm/entities/TopologyRequestEntity.java | 40 +- .../ResourceLevelClusterSettingManager.java | 168 +++++++ ...sourceLevelClusterSettingManagerFactory.java | 34 ++ .../upgrades/FinalizeUpgradeAction.java | 2 +- .../ambari/server/state/ConfigHelper.java | 83 ++-- .../ambari/server/state/ConfigMergeHelper.java | 4 +- .../ambari/server/state/PropertyInfo.java | 6 +- .../server/state/ServiceComponentImpl.java | 4 +- .../apache/ambari/server/state/ServiceImpl.java | 3 +- .../apache/ambari/server/state/ServiceInfo.java | 28 +- .../ambari/server/state/UpgradeHelper.java | 19 +- .../server/state/alert/AlertDefinitionHash.java | 4 +- .../server/state/cluster/ClusterImpl.java | 9 +- .../ambari/server/state/host/HostImpl.java | 2 +- .../state/stack/upgrade/HostOrderGrouping.java | 2 +- .../stack/upgrade/ServiceCheckGrouping.java | 2 +- .../svccomphost/ServiceComponentHostImpl.java | 2 +- .../ServiceComponentHostSummary.java | 1 - .../ambari/server/topology/AmbariContext.java | 233 ++++------ .../ambari/server/topology/BlueprintImplV2.java | 308 ++++++++++++- .../ambari/server/topology/BlueprintV2.java | 110 ++++- .../server/topology/BlueprintV2Factory.java | 196 ++++++++ .../server/topology/BlueprintValidatorImpl.java | 68 +-- .../server/topology/BlueprintValidatorV2.java | 43 ++ .../topology/ClusterConfigurationRequest.java | 64 +-- .../ambari/server/topology/ClusterTopology.java | 15 +- .../server/topology/ClusterTopologyImpl.java | 84 ++-- .../ambari/server/topology/ComponentV2.java | 96 +++- .../ambari/server/topology/Configurable.java | 40 ++ .../ambari/server/topology/Configuration.java | 7 + .../ambari/server/topology/HostGroupImpl.java | 2 - .../ambari/server/topology/HostGroupInfo.java | 17 +- .../ambari/server/topology/HostGroupV2.java | 23 +- .../ambari/server/topology/HostGroupV2Impl.java | 169 +++++++ .../ambari/server/topology/HostRequest.java | 38 +- .../ambari/server/topology/LogicalRequest.java | 4 +- .../server/topology/PersistedStateImpl.java | 58 ++- .../server/topology/RepositoryVersion.java | 71 +++ .../server/topology/SecurityConfiguration.java | 7 +- .../apache/ambari/server/topology/Service.java | 131 ++++-- .../ambari/server/topology/ServiceGroup.java | 61 ++- .../ambari/server/topology/ServiceId.java | 79 ++++ .../apache/ambari/server/topology/Setting.java | 18 +- .../ambari/server/topology/TopologyManager.java | 20 +- .../ambari/server/topology/TopologyRequest.java | 10 +- .../tasks/PersistHostResourcesTask.java | 12 +- .../validators/ClusterConfigTypeValidator.java | 8 +- .../validators/HiveServiceValidator.java | 47 +- .../RequiredConfigPropertiesValidator.java | 91 ++-- .../validators/RequiredPasswordValidator.java | 27 +- .../validators/StackConfigTypeValidator.java | 31 +- .../topology/validators/UnitValidator.java | 34 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 22 + .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 22 + .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 23 + .../resources/Ambari-DDL-Postgres-CREATE.sql | 25 ++ .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 23 + .../resources/Ambari-DDL-SQLServer-CREATE.sql | 23 + .../src/main/resources/META-INF/persistence.xml | 1 + .../src/main/resources/cluster-settings.xml | 322 +++++++++++++ ...tryRecommendationResourceDefinitionTest.java | 37 ++ .../RegistryResourceDefinitionTest.java | 62 +++ ...egistryValidationResourceDefinitionTest.java | 37 ++ .../server/api/services/AmbariMetaInfoTest.java | 2 +- .../api/services/RegistryServiceTest.java | 94 ++++ .../api/services/RootServiceServiceTest.java | 2 +- .../server/api/services/ServiceServiceTest.java | 2 +- .../AmbariManagementControllerTest.java | 6 +- .../server/controller/RegistryRequestTest.java | 37 ++ .../internal/BlueprintResourceProviderTest.java | 5 +- .../server/state/cluster/ClusterTest.java | 2 +- .../server/topology/BlueprintImplTest.java | 10 +- .../topology/ClusterTopologyImplTest.java | 40 +- .../validators/BlueprintImplV2Test.java | 79 ++++ .../test/resources/blueprintv2/blueprintv2.json | 146 ++++++ 151 files changed, 5476 insertions(+), 1580 deletions(-) ----------------------------------------------------------------------