Merge trunk to ambari-rest-api-explorer branch. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3acd2e6d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3acd2e6d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3acd2e6d Branch: refs/heads/trunk Commit: 3acd2e6da46494c175250e4f3a9ec074456b12b9 Parents: 3cb45e8 69c5593 Author: Jaimin Jetly <jai...@hortonworks.com> Authored: Tue Apr 11 11:20:34 2017 -0700 Committer: Jaimin Jetly <jai...@hortonworks.com> Committed: Tue Apr 11 11:20:34 2017 -0700 ---------------------------------------------------------------------- .../main/resources/ui/admin-web/app/index.html | 4 +- ambari-agent/pom.xml | 10 +- .../ambari_agent/StatusCommandsExecutor.py | 209 +-- .../src/main/python/ambari_agent/main.py | 5 +- .../python/resource_management/TestUtils.py | 39 + .../src/main/python/ambari_commons/network.py | 2 + .../ambari_commons/resources/os_family.json | 1 + .../python/resource_management/core/sudo.py | 58 +- .../python/resource_management/core/utils.py | 56 +- .../libraries/functions/copy_tarball.py | 24 +- .../functions/setup_ranger_plugin_xml.py | 16 +- .../libraries/functions/solr_cloud_util.py | 7 +- .../libraries/functions/stack_select.py | 16 +- .../libraries/script/script.py | 8 +- ambari-infra/ambari-infra-solr-client/pom.xml | 5 + .../ambari/infra/solr/AmbariSolrCloudCLI.java | 17 +- .../infra/solr/AmbariSolrCloudClient.java | 9 + .../solr/commands/UnsecureZNodeZkCommand.java | 44 + .../FieldAuditLogRequestQueryConverter.java | 1 - .../TopFieldAuditLogRequestQueryConverter.java | 54 + .../logsearch/manager/AuditLogsManager.java | 3 +- .../request/impl/FieldAuditLogRequest.java | 17 +- .../request/impl/TopFieldAuditLogRequest.java | 40 + .../logsearch/rest/AuditLogsResource.java | 4 +- .../logsearch/rest/UserConfigResource.java | 2 +- .../FieldAuditLogRequestQueryConverterTest.java | 3 +- ...pFieldAuditLogRequestQueryConverterTest.java | 61 + .../ambari-logsearch-web/package.json | 17 +- .../main/webapp/scripts/views/common/Header.js | 6 +- .../conf/unix/ambari-metrics-collector | 3 +- .../server/KdcServerConnectionVerification.java | 31 +- .../java/org/apache/ambari/server/Role.java | 2 +- .../server/actionmanager/ActionDBAccessor.java | 16 +- .../actionmanager/ActionDBAccessorImpl.java | 27 +- .../server/actionmanager/ActionManager.java | 2 +- .../server/actionmanager/ActionScheduler.java | 178 +- .../server/actionmanager/HostRoleCommand.java | 26 + .../ambari/server/actionmanager/Request.java | 10 +- .../ambari/server/actionmanager/Stage.java | 44 +- .../apache/ambari/server/agent/ActionQueue.java | 12 +- .../ambari/server/agent/AgentRequests.java | 2 +- .../ambari/server/agent/ExecutionCommand.java | 10 +- .../apache/ambari/server/agent/HeartBeat.java | 6 +- .../ambari/server/agent/HeartBeatHandler.java | 14 +- .../ambari/server/agent/HeartBeatResponse.java | 10 +- .../ambari/server/agent/HeartbeatMonitor.java | 6 +- .../ambari/server/agent/HeartbeatProcessor.java | 2 +- .../apache/ambari/server/agent/HostInfo.java | 2 +- .../ambari/server/agent/RecoveryReport.java | 2 +- .../server/agent/RegistrationResponse.java | 2 +- .../ambari/server/agent/StatusCommand.java | 4 +- .../alerts/AmbariPerformanceRunnable.java | 2 +- .../server/alerts/StaleAlertRunnable.java | 2 +- .../server/api/AmbariCsrfProtectionFilter.java | 2 +- .../ambari/server/api/AmbariErrorHandler.java | 2 +- .../server/api/handlers/QueryCreateHandler.java | 6 +- .../ambari/server/api/predicate/QueryLexer.java | 24 +- .../server/api/predicate/QueryParser.java | 8 +- .../expressions/AbstractExpression.java | 2 +- .../expressions/NotLogicalExpression.java | 2 +- .../api/predicate/operators/EqualsOperator.java | 2 +- .../operators/GreaterEqualsOperator.java | 2 +- .../predicate/operators/GreaterOperator.java | 2 +- .../api/predicate/operators/InOperator.java | 2 +- .../predicate/operators/LessEqualsOperator.java | 2 +- .../api/predicate/operators/LessOperator.java | 2 +- .../predicate/operators/NotEqualsOperator.java | 2 +- .../query/ExtendedResourcePredicateVisitor.java | 2 +- .../server/api/query/JpaPredicateVisitor.java | 4 +- .../ambari/server/api/query/JpaSortBuilder.java | 2 +- .../api/query/ProcessingPredicateVisitor.java | 6 +- .../ambari/server/api/query/QueryImpl.java | 60 +- .../ambari/server/api/query/QueryInfo.java | 2 +- .../api/query/SubResourcePredicateVisitor.java | 2 +- .../render/AlertSummaryGroupedRenderer.java | 6 +- .../api/query/render/AlertSummaryRenderer.java | 4 +- .../server/api/query/render/BaseRenderer.java | 2 +- .../query/render/ClusterBlueprintRenderer.java | 36 +- .../api/query/render/DefaultRenderer.java | 4 +- .../api/query/render/MinimalRenderer.java | 10 +- .../api/resources/BaseResourceDefinition.java | 8 +- .../resources/ClusterResourceDefinition.java | 2 +- ...ComponentStackVersionResourceDefinition.java | 2 +- .../ExtensionLinkResourceDefinition.java | 2 +- .../resources/ExtensionResourceDefinition.java | 2 +- .../ExtensionVersionResourceDefinition.java | 2 +- .../api/resources/FeedResourceDefinition.java | 2 +- .../api/resources/GroupResourceDefinition.java | 2 +- .../HostComponentResourceDefinition.java | 4 +- .../api/resources/JobResourceDefinition.java | 2 +- .../resources/PermissionResourceDefinition.java | 2 +- .../resources/ResourceInstanceFactoryImpl.java | 2 +- ...tServiceHostComponentResourceDefinition.java | 2 +- .../RootServiceResourceDefinition.java | 2 +- .../resources/ServiceResourceDefinition.java | 2 +- .../StackConfigurationResourceDefinition.java | 2 +- ...ackLevelConfigurationResourceDefinition.java | 2 +- .../api/resources/StackResourceDefinition.java | 2 +- .../StackServiceResourceDefinition.java | 2 +- .../StackVersionResourceDefinition.java | 2 +- .../api/resources/UserResourceDefinition.java | 2 +- .../ViewInstanceResourceDefinition.java | 2 +- .../ViewVersionResourceDefinition.java | 2 +- .../resources/WorkflowResourceDefinition.java | 2 +- .../server/api/rest/BootStrapResource.java | 4 +- .../api/services/AlertDefinitionService.java | 2 +- .../server/api/services/AlertGroupService.java | 2 +- .../api/services/AlertHistoryService.java | 2 +- .../server/api/services/AlertNoticeService.java | 2 +- .../server/api/services/AlertService.java | 2 +- .../server/api/services/AlertTargetService.java | 2 +- .../server/api/services/AmbariMetaInfo.java | 46 +- .../ambari/server/api/services/BaseRequest.java | 6 +- .../ClusterKerberosDescriptorService.java | 2 +- .../api/services/ClusterPrivilegeService.java | 2 +- .../server/api/services/ClusterService.java | 2 +- .../services/ClusterStackVersionService.java | 4 +- .../CompatibleRepositoryVersionService.java | 4 +- .../server/api/services/ComponentService.java | 4 +- .../server/api/services/ConfigGroupService.java | 2 +- .../api/services/ConfigurationService.java | 2 +- .../server/api/services/CredentialService.java | 2 +- .../api/services/ExtensionLinksService.java | 2 +- .../server/api/services/ExtensionsService.java | 4 +- .../api/services/HostComponentService.java | 6 +- .../services/HostKerberosIdentityService.java | 2 +- .../ambari/server/api/services/HostService.java | 2 +- .../api/services/HostStackVersionService.java | 4 +- .../server/api/services/InstanceService.java | 2 +- .../ambari/server/api/services/JobService.java | 2 +- .../server/api/services/LoggingService.java | 2 +- .../api/services/OperatingSystemService.java | 4 +- .../api/services/PersistKeyValueImpl.java | 4 +- .../api/services/PersistKeyValueService.java | 2 +- .../api/services/RecommendationService.java | 2 +- .../server/api/services/RepositoryService.java | 2 +- .../api/services/RepositoryVersionService.java | 4 +- .../ambari/server/api/services/RequestBody.java | 6 +- .../server/api/services/RequestFactory.java | 2 +- .../api/services/RequestScheduleService.java | 2 +- .../server/api/services/RequestService.java | 2 +- .../ambari/server/api/services/ResultImpl.java | 2 +- .../api/services/ResultPostProcessorImpl.java | 4 +- .../api/services/RoleAuthorizationService.java | 2 +- .../server/api/services/RootServiceService.java | 6 +- .../services/ServiceConfigVersionService.java | 2 +- .../server/api/services/ServiceService.java | 4 +- .../server/api/services/StacksService.java | 30 +- .../server/api/services/StageService.java | 2 +- .../server/api/services/TaskAttemptService.java | 2 +- .../ambari/server/api/services/TaskService.java | 2 +- .../api/services/UpgradeGroupService.java | 2 +- .../server/api/services/UpgradeItemService.java | 2 +- .../server/api/services/UpgradeService.java | 2 +- .../api/services/UpgradeSummaryService.java | 2 +- .../server/api/services/ValidationService.java | 2 +- .../api/services/VersionDefinitionService.java | 2 +- .../api/services/WidgetLayoutService.java | 2 +- .../server/api/services/WidgetService.java | 2 +- .../server/api/services/WorkflowService.java | 2 +- .../services/groups/GroupPrivilegeService.java | 2 +- .../api/services/groups/MemberService.java | 2 +- .../services/parsers/JsonRequestBodyParser.java | 10 +- .../api/services/serializers/CsvSerializer.java | 6 +- .../StackAdvisorBlueprintProcessor.java | 16 +- .../stackadvisor/StackAdvisorRequest.java | 16 +- .../stackadvisor/StackAdvisorRunner.java | 2 +- ...rationDependenciesRecommendationCommand.java | 12 +- .../ConfigurationRecommendationCommand.java | 12 +- .../commands/StackAdvisorCommand.java | 6 +- .../recommendations/RecommendationResponse.java | 6 +- .../users/ActiveWidgetLayoutService.java | 2 +- .../users/UserAuthorizationService.java | 2 +- .../services/users/UserPrivilegeService.java | 2 +- .../views/ViewExternalSubResourceService.java | 4 +- .../api/services/views/ViewInstanceService.java | 2 +- .../services/views/ViewPermissionService.java | 2 +- .../services/views/ViewPrivilegeService.java | 2 +- .../services/views/ViewSubResourceService.java | 2 +- .../api/services/views/ViewVersionService.java | 2 +- .../ambari/server/api/util/TreeNodeImpl.java | 6 +- ...ClusterPrivilegeChangeRequestAuditEvent.java | 4 +- .../ViewPrivilegeChangeRequestAuditEvent.java | 4 +- .../eventcreator/PrivilegeEventCreator.java | 2 +- .../RepositoryVersionEventCreator.java | 4 +- .../RequestAuditEventCreatorHelper.java | 2 +- .../eventcreator/ViewPrivilegeEventCreator.java | 2 +- .../server/bootstrap/BSHostStatusCollector.java | 2 +- .../ambari/server/bootstrap/BSRunner.java | 2 +- .../ambari/server/bootstrap/BootStrapImpl.java | 4 +- .../ambari/server/bootstrap/SshHostInfo.java | 2 +- .../server/checks/AbstractCheckDescriptor.java | 2 +- .../server/checks/AtlasPresenceCheck.java | 4 +- .../ambari/server/checks/CheckDescription.java | 5 +- .../server/checks/ClientRetryPropertyCheck.java | 2 +- .../checks/ComponentsInstallationCheck.java | 6 +- .../server/checks/ConfigurationMergeCheck.java | 2 +- .../ambari/server/checks/HealthCheck.java | 2 +- .../HiveDynamicServiceDiscoveryCheck.java | 2 +- .../checks/HostsMasterMaintenanceCheck.java | 4 +- .../server/checks/InstallPackagesCheck.java | 6 +- ...apReduce2JobHistoryStatePreservingCheck.java | 2 +- .../server/checks/PreviousUpgradeCompleted.java | 2 +- .../checks/SecondaryNamenodeDeletedCheck.java | 2 +- .../checks/ServiceCheckValidityCheck.java | 13 +- .../server/checks/ServicePresenceCheck.java | 56 +- .../ServicesMapReduceDistributedCacheCheck.java | 2 +- .../ServicesTezDistributedCacheCheck.java | 2 +- .../ambari/server/checks/ServicesUpCheck.java | 6 +- .../server/checks/UpgradeCheckRegistry.java | 12 +- .../server/checks/VersionMismatchCheck.java | 2 +- .../collections/functors/ContainsPredicate.java | 2 +- .../DelegatedMultiplePredicateContainer.java | 2 +- .../collections/functors/EqualsPredicate.java | 2 +- .../functors/PredicateClassFactory.java | 2 +- .../server/configuration/Configuration.java | 2 +- .../ambari/server/controller/ActionRequest.java | 19 +- .../AmbariCustomCommandExecutionHelper.java | 3 +- .../server/controller/AmbariHandlerList.java | 4 +- .../server/controller/AuthToLocalBuilder.java | 8 +- .../server/controller/ClusterResponse.java | 17 +- .../server/controller/ConfigurationRequest.java | 4 +- .../server/controller/ExecuteActionRequest.java | 20 +- .../controller/ExtensionLinkResponse.java | 2 +- .../controller/ExtensionVersionResponse.java | 2 +- .../server/controller/KerberosHelperImpl.java | 118 +- .../server/controller/LdapSyncRequest.java | 2 +- .../controller/MaintenanceStateHelper.java | 6 +- .../server/controller/PrereqCheckRequest.java | 2 +- .../controller/RequestsByStatusesRequest.java | 2 +- .../controller/RootServiceResponseFactory.java | 8 +- .../server/controller/ServiceRequest.java | 10 +- .../server/controller/ShortTaskStatus.java | 19 +- .../StackServiceComponentResponse.java | 2 +- .../server/controller/StackServiceResponse.java | 10 +- .../server/controller/StackVersionResponse.java | 2 +- .../ambari/server/controller/UserRequest.java | 2 +- .../gsinstaller/ClusterDefinition.java | 26 +- .../gsinstaller/GSInstallerNoOpProvider.java | 2 +- .../gsinstaller/GSInstallerProviderModule.java | 2 +- .../GSInstallerResourceProvider.java | 12 +- .../AbstractAuthorizedResourceProvider.java | 2 +- .../internal/AbstractPropertyProvider.java | 10 +- .../internal/AbstractProviderModule.java | 70 +- .../internal/AbstractResourceProvider.java | 16 +- .../internal/ActionResourceProvider.java | 10 +- .../ActiveWidgetLayoutResourceProvider.java | 14 +- .../AlertDefinitionResourceProvider.java | 16 +- .../internal/AlertGroupResourceProvider.java | 34 +- .../internal/AlertHistoryResourceProvider.java | 10 +- .../internal/AlertNoticeResourceProvider.java | 10 +- .../internal/AlertResourceProvider.java | 10 +- .../internal/AlertSummaryPropertyProvider.java | 14 +- .../internal/AlertTargetResourceProvider.java | 34 +- .../AmbariPrivilegeResourceProvider.java | 6 +- .../controller/internal/AppCookieManager.java | 2 +- .../internal/ArtifactResourceProvider.java | 26 +- .../controller/internal/BaseClusterRequest.java | 4 +- .../controller/internal/BaseProvider.java | 22 +- .../BlueprintConfigurationProcessor.java | 186 +- .../internal/BlueprintResourceProvider.java | 28 +- .../controller/internal/CalculatedStatus.java | 18 +- .../internal/ClientConfigResourceProvider.java | 80 +- .../internal/ClusterControllerImpl.java | 22 +- ...usterKerberosDescriptorResourceProvider.java | 8 +- .../ClusterPrivilegeResourceProvider.java | 6 +- .../internal/ClusterResourceProvider.java | 16 +- .../ClusterStackVersionResourceProvider.java | 26 +- ...atibleRepositoryVersionResourceProvider.java | 2 +- .../internal/ConfigGroupResourceProvider.java | 34 +- .../internal/ConfigurationResourceProvider.java | 22 +- .../internal/CredentialResourceProvider.java | 10 +- .../internal/ExportBlueprintRequest.java | 30 +- .../server/controller/internal/Extension.java | 20 +- .../internal/ExtensionLinkResourceProvider.java | 14 +- .../internal/ExtensionResourceProvider.java | 8 +- .../ExtensionVersionResourceProvider.java | 8 +- .../internal/FeedResourceProvider.java | 10 +- .../GroupPrivilegeResourceProvider.java | 6 +- .../internal/GroupResourceProvider.java | 14 +- .../HostComponentProcessResourceProvider.java | 8 +- .../internal/HostComponentResourceProvider.java | 50 +- .../HostKerberosIdentityResourceProvider.java | 4 +- .../internal/HostResourceProvider.java | 32 +- .../internal/InstanceResourceProvider.java | 10 +- .../internal/JobResourceProvider.java | 14 +- .../KerberosDescriptorResourceProvider.java | 2 +- .../internal/LdapSyncEventResourceProvider.java | 28 +- .../internal/LoggingResourceProvider.java | 6 +- .../internal/MemberResourceProvider.java | 18 +- .../OperatingSystemResourceProvider.java | 4 +- .../internal/PermissionResourceProvider.java | 8 +- .../PreUpgradeCheckResourceProvider.java | 2 +- .../internal/PrivilegeResourceProvider.java | 22 +- .../internal/PropertyPredicateVisitor.java | 2 +- .../QuickLinkArtifactResourceProvider.java | 16 +- .../RecommendationResourceProvider.java | 14 +- .../internal/RemoteClusterResourceProvider.java | 10 +- .../internal/RepositoryResourceProvider.java | 8 +- .../RepositoryVersionResourceProvider.java | 12 +- .../internal/RequestResourceFilter.java | 2 +- .../internal/RequestResourceProvider.java | 28 +- .../RequestScheduleResourceProvider.java | 22 +- .../internal/RequestStageContainer.java | 2 +- .../RoleAuthorizationResourceProvider.java | 8 +- .../RootServiceComponentPropertyProvider.java | 4 +- .../RootServiceComponentResourceProvider.java | 8 +- ...ootServiceHostComponentResourceProvider.java | 10 +- .../internal/RootServiceResourceProvider.java | 8 +- .../ServiceConfigVersionResourceProvider.java | 24 +- .../internal/ServiceResourceProvider.java | 42 +- .../internal/SimplifyingPredicateVisitor.java | 6 +- .../controller/internal/SortRequestImpl.java | 2 +- .../server/controller/internal/Stack.java | 76 +- .../internal/StackAdvisorResourceProvider.java | 22 +- .../internal/StackArtifactResourceProvider.java | 18 +- ...ConfigurationDependencyResourceProvider.java | 12 +- .../StackConfigurationResourceProvider.java | 10 +- .../internal/StackDefinedPropertyProvider.java | 10 +- .../StackDependencyResourceProvider.java | 10 +- ...StackLevelConfigurationResourceProvider.java | 10 +- .../internal/StackResourceProvider.java | 8 +- .../StackServiceComponentResourceProvider.java | 12 +- .../internal/StackServiceResourceProvider.java | 16 +- .../internal/StackVersionResourceProvider.java | 8 +- .../internal/StageResourceProvider.java | 14 +- .../internal/TargetClusterResourceProvider.java | 12 +- .../internal/TaskAttemptResourceProvider.java | 16 +- .../internal/TaskResourceProvider.java | 8 +- .../internal/ThemeArtifactResourceProvider.java | 16 +- .../controller/internal/URLStreamProvider.java | 2 +- .../internal/UpgradeGroupResourceProvider.java | 12 +- .../internal/UpgradeItemResourceProvider.java | 75 +- .../internal/UpgradeResourceProvider.java | 86 +- .../UpgradeSummaryResourceProvider.java | 14 +- .../UserAuthorizationResourceProvider.java | 10 +- .../internal/UserPrivilegeResourceProvider.java | 6 +- .../internal/UserResourceProvider.java | 14 +- .../internal/ValidationResourceProvider.java | 10 +- .../VersionDefinitionResourceProvider.java | 2 +- .../internal/ViewInstanceResourceProvider.java | 14 +- .../ViewPermissionResourceProvider.java | 8 +- .../internal/ViewPrivilegeResourceProvider.java | 8 +- .../internal/ViewResourceProvider.java | 8 +- .../internal/ViewURLResourceProvider.java | 6 +- .../internal/ViewVersionResourceProvider.java | 8 +- .../internal/WidgetLayoutResourceProvider.java | 18 +- .../internal/WidgetResourceProvider.java | 12 +- .../internal/WorkflowResourceProvider.java | 14 +- .../controller/jdbc/JDBCResourceProvider.java | 10 +- .../controller/jmx/JMXPropertyProvider.java | 8 +- .../controller/logging/LogLineResult.java | 2 +- .../logging/LoggingRequestHelperImpl.java | 4 +- .../logging/LoggingSearchPropertyProvider.java | 2 +- .../MetricsDataTransferMethodFactory.java | 4 +- .../MetricsDownsamplingMethodFactory.java | 2 +- .../metrics/RestMetricsPropertyProvider.java | 10 +- .../ThreadPoolEnabledPropertyProvider.java | 4 +- .../GangliaComponentPropertyProvider.java | 6 +- .../GangliaHostComponentPropertyProvider.java | 6 +- .../ganglia/GangliaHostPropertyProvider.java | 2 +- .../metrics/ganglia/GangliaMetric.java | 2 +- .../ganglia/GangliaPropertyProvider.java | 24 +- .../ganglia/GangliaReportPropertyProvider.java | 6 +- .../metrics/timeline/AMSPropertyProvider.java | 26 +- .../timeline/AMSReportPropertyProvider.java | 8 +- .../cache/TimelineMetricCacheEntryFactory.java | 4 +- .../controller/predicate/AndPredicate.java | 2 +- .../controller/predicate/ArrayPredicate.java | 8 +- .../controller/predicate/EqualsPredicate.java | 2 +- .../predicate/GreaterEqualsPredicate.java | 2 +- .../controller/predicate/GreaterPredicate.java | 2 +- .../predicate/LessEqualsPredicate.java | 2 +- .../controller/predicate/LessPredicate.java | 2 +- .../controller/predicate/OrPredicate.java | 2 +- .../ambari/server/controller/spi/Resource.java | 2 +- ...eredThreadPoolExecutorCompletionService.java | 2 +- .../controller/utilities/PredicateBuilder.java | 12 +- .../controller/utilities/PropertyHelper.java | 26 +- .../customactions/ActionDefinitionManager.java | 12 +- .../customactions/ActionDefinitionXml.java | 2 +- .../ambari/server/events/HostsRemovedEvent.java | 2 +- .../alerts/AlertAggregateListener.java | 2 +- .../listeners/alerts/AlertHostListener.java | 2 +- .../alerts/AlertStateChangedListener.java | 4 +- .../listeners/tasks/TaskStatusListener.java | 2 +- .../upgrade/HostVersionOutOfSyncListener.java | 4 +- .../listeners/upgrade/StackVersionListener.java | 2 +- .../ambari/server/metadata/ActionMetadata.java | 10 +- .../metadata/AmbariServiceAlertDefinitions.java | 2 +- .../server/metadata/RoleCommandOrder.java | 8 +- .../system/impl/AmbariMetricSinkImpl.java | 2 +- .../system/impl/AmbariPerformanceMonitor.java | 2 +- .../server/notifications/DispatchFactory.java | 2 +- .../dispatchers/SNMPDispatcher.java | 2 +- .../orm/AmbariJpaLocalTxnInterceptor.java | 2 +- .../orm/AmbariLocalSessionInterceptor.java | 2 +- .../apache/ambari/server/orm/dao/AlertsDAO.java | 6 +- .../orm/dao/ConfigGroupHostMappingDAO.java | 14 +- .../ambari/server/orm/dao/ExtensionLinkDAO.java | 4 +- .../apache/ambari/server/orm/dao/GroupDAO.java | 2 +- .../server/orm/dao/HostConfigMappingDAO.java | 22 +- .../apache/ambari/server/orm/dao/HostDAO.java | 2 +- .../server/orm/dao/HostRoleCommandDAO.java | 65 +- .../dao/HostRoleCommandStatusSummaryDTO.java | 4 +- .../apache/ambari/server/orm/dao/MemberDAO.java | 2 +- .../ambari/server/orm/dao/ServiceConfigDAO.java | 2 +- .../apache/ambari/server/orm/dao/StageDAO.java | 76 +- .../ambari/server/orm/dao/UpgradeDAO.java | 5 - .../apache/ambari/server/orm/dao/UserDAO.java | 4 +- .../orm/entities/AlertCurrentEntity_.java | 2 +- .../orm/entities/AlertDefinitionEntity.java | 2 +- .../orm/entities/AlertHistoryEntity_.java | 2 +- .../server/orm/entities/AlertNoticeEntity_.java | 2 +- .../server/orm/entities/AlertTargetEntity.java | 4 +- .../server/orm/entities/ClusterEntity.java | 13 +- .../orm/entities/HostRoleCommandEntity.java | 33 +- .../orm/entities/HostRoleCommandEntity_.java | 2 +- .../orm/entities/OperatingSystemEntity.java | 2 +- .../server/orm/entities/PrincipalEntity.java | 2 +- .../server/orm/entities/ResourceEntity.java | 2 +- .../ambari/server/orm/entities/StageEntity.java | 28 +- .../server/orm/entities/StageEntityPK.java | 35 +- .../server/orm/entities/StageEntity_.java | 2 +- .../server/orm/entities/UpgradeEntity.java | 27 +- .../ambari/server/orm/entities/UserEntity.java | 2 +- .../ambari/server/orm/entities/ViewEntity.java | 14 +- .../server/orm/entities/ViewInstanceEntity.java | 18 +- .../server/orm/helpers/dbms/PostgresHelper.java | 2 +- .../server/orm/models/HostComponentSummary.java | 2 +- .../ambari/server/proxy/ProxyService.java | 2 +- .../server/security/SecurePasswordHelper.java | 2 +- .../AmbariKerberosAuthenticationProperties.java | 2 +- .../AmbariLdapAuthenticationProvider.java | 4 +- .../AmbariPamAuthenticationProvider.java | 4 +- .../authorization/LdapServerProperties.java | 2 +- .../server/security/authorization/User.java | 2 +- .../server/security/authorization/Users.java | 46 +- .../jwt/JwtAuthenticationProperties.java | 2 +- .../encryption/AbstractCredentialStore.java | 2 +- .../security/encryption/CredentialProvider.java | 2 +- .../encryption/CredentialStoreServiceImpl.java | 2 +- .../encryption/InMemoryCredentialStore.java | 2 +- .../encryption/MasterKeyServiceImpl.java | 2 +- .../security/ldap/AmbariLdapDataPopulator.java | 18 +- .../server/security/ldap/LdapBatchDto.java | 18 +- .../server/security/ldap/LdapGroupDto.java | 2 +- .../server/security/ldap/LdapSyncDto.java | 4 +- .../security/unsecured/rest/ConnectionInfo.java | 2 +- .../serveraction/ServerActionExecutor.java | 118 +- .../kerberos/ADKerberosOperationHandler.java | 2 +- .../AbstractPrepareKerberosServerAction.java | 6 +- .../kerberos/CreateKeytabFilesServerAction.java | 4 +- .../kerberos/CreatePrincipalsServerAction.java | 2 +- .../kerberos/DestroyPrincipalsServerAction.java | 2 +- .../kerberos/IPAKerberosOperationHandler.java | 4 +- .../kerberos/KerberosOperationHandler.java | 24 +- .../kerberos/MITKerberosOperationHandler.java | 8 +- .../PrepareDisableKerberosServerAction.java | 10 +- .../PrepareEnableKerberosServerAction.java | 4 +- .../PrepareKerberosIdentitiesServerAction.java | 6 +- .../UpdateKerberosConfigsServerAction.java | 10 +- .../upgrades/FinalizeUpgradeAction.java | 12 +- .../FixCapacitySchedulerOrderingPolicy.java | 118 ++ .../upgrades/FixYarnWebServiceUrl.java | 103 ++ .../upgrades/UpgradeUserKerberosDescriptor.java | 6 +- .../apache/ambari/server/stack/BaseModule.java | 4 +- .../ambari/server/stack/ComponentModule.java | 8 +- .../server/stack/ConfigurationDirectory.java | 6 +- .../ambari/server/stack/ConfigurationInfo.java | 6 +- .../server/stack/ConfigurationModule.java | 6 +- .../ambari/server/stack/ExtensionDirectory.java | 2 +- .../ambari/server/stack/ExtensionModule.java | 8 +- .../apache/ambari/server/stack/HostsType.java | 4 +- .../ambari/server/stack/MasterHostResolver.java | 8 +- .../stack/QuickLinksConfigurationModule.java | 4 +- .../ambari/server/stack/ServiceDirectory.java | 4 +- .../ambari/server/stack/ServiceModule.java | 36 +- .../ambari/server/stack/StackContext.java | 4 +- .../ambari/server/stack/StackDirectory.java | 4 +- .../ambari/server/stack/StackManager.java | 18 +- .../apache/ambari/server/stack/StackModule.java | 27 +- .../apache/ambari/server/stack/ThemeModule.java | 4 +- .../ambari/server/stageplanner/RoleGraph.java | 8 +- .../server/stageplanner/RoleGraphNode.java | 6 +- .../apache/ambari/server/state/CheckHelper.java | 2 +- .../org/apache/ambari/server/state/Cluster.java | 30 +- .../ambari/server/state/ComponentInfo.java | 6 +- .../ambari/server/state/ConfigHelper.java | 2 +- .../apache/ambari/server/state/ConfigImpl.java | 2 +- .../ambari/server/state/ConfigMergeHelper.java | 2 +- .../ambari/server/state/DependencyInfo.java | 2 +- .../ambari/server/state/DesiredConfig.java | 2 +- .../ambari/server/state/ExtensionInfo.java | 6 +- .../apache/ambari/server/state/HostConfig.java | 6 +- .../ambari/server/state/PropertyInfo.java | 10 +- .../server/state/ServiceComponentImpl.java | 19 +- .../apache/ambari/server/state/ServiceImpl.java | 10 +- .../apache/ambari/server/state/ServiceInfo.java | 50 +- .../ambari/server/state/ServiceOsSpecific.java | 2 +- .../apache/ambari/server/state/StackInfo.java | 33 +- .../ambari/server/state/UpgradeHelper.java | 58 +- .../state/alert/AggregateDefinitionMapping.java | 6 +- .../state/alert/AlertDefinitionFactory.java | 2 +- .../server/state/alert/AlertDefinitionHash.java | 16 +- .../ambari/server/state/alert/MetricSource.java | 4 +- .../server/state/cluster/ClusterImpl.java | 48 +- .../server/state/cluster/ClustersImpl.java | 22 +- .../state/configgroup/ConfigGroupImpl.java | 12 +- .../server/state/fsm/StateMachineFactory.java | 5 +- .../state/host/HostHealthyHeartbeatEvent.java | 2 +- .../kerberos/AbstractKerberosDescriptor.java | 2 +- .../AbstractKerberosDescriptorContainer.java | 49 +- .../KerberosConfigurationDescriptor.java | 6 +- .../state/kerberos/KerberosDescriptor.java | 12 +- .../KerberosDescriptorUpdateHelper.java | 14 +- .../kerberos/KerberosIdentityDescriptor.java | 18 + .../kerberos/KerberosKeytabDescriptor.java | 6 +- .../kerberos/KerberosPrincipalDescriptor.java | 2 +- .../kerberos/KerberosServiceDescriptor.java | 4 +- .../KerberosServiceDescriptorFactory.java | 2 +- .../kerberos/VariableReplacementHelper.java | 4 +- .../quicklinks/QuickLinksConfiguration.java | 4 +- .../ambari/server/state/scheduler/Batch.java | 2 +- .../server/state/scheduler/BatchRequestJob.java | 4 +- .../services/AlertNoticeDispatchService.java | 34 +- .../services/AmbariServerAlertService.java | 2 +- .../state/services/MetricsRetrievalService.java | 29 +- .../services/RetryUpgradeActionService.java | 2 +- .../server/state/stack/ConfigurationXml.java | 6 +- .../state/stack/ExtensionMetainfoXml.java | 6 +- .../server/state/stack/MetricDefinition.java | 2 +- .../ambari/server/state/stack/OsFamily.java | 8 +- .../server/state/stack/PrerequisiteCheck.java | 4 +- .../server/state/stack/RepositoryXml.java | 4 +- .../server/state/stack/ServiceMetainfoXml.java | 2 +- .../server/state/stack/StackMetainfoXml.java | 2 +- .../state/stack/StackRoleCommandOrder.java | 8 +- .../ambari/server/state/stack/UpgradePack.java | 26 +- .../state/stack/upgrade/ClusterGrouping.java | 8 +- .../state/stack/upgrade/ColocatedGrouping.java | 108 +- .../state/stack/upgrade/ConfigureTask.java | 2 +- .../server/state/stack/upgrade/Grouping.java | 16 +- .../stack/upgrade/RepositoryVersionHelper.java | 2 +- .../stack/upgrade/ServiceCheckGrouping.java | 8 +- .../state/stack/upgrade/StageWrapper.java | 4 +- .../state/stack/upgrade/TaskWrapperBuilder.java | 14 +- .../svccomphost/ServiceComponentHostImpl.java | 2 +- .../ambari/server/state/theme/Layout.java | 4 +- .../ambari/server/state/theme/Placement.java | 4 +- .../ambari/server/state/theme/Section.java | 4 +- .../ambari/server/state/theme/TabLayout.java | 4 +- .../server/state/theme/ThemeConfiguration.java | 8 +- .../ambari/server/topology/AmbariContext.java | 20 +- .../server/topology/BlueprintFactory.java | 6 +- .../ambari/server/topology/BlueprintImpl.java | 24 +- .../server/topology/BlueprintValidatorImpl.java | 32 +- .../topology/ClusterConfigurationRequest.java | 22 +- .../server/topology/ClusterTopologyImpl.java | 14 +- .../ambari/server/topology/Configuration.java | 22 +- .../server/topology/ConfigurationFactory.java | 4 +- .../ambari/server/topology/HostGroupImpl.java | 16 +- .../ambari/server/topology/HostGroupInfo.java | 4 +- .../ambari/server/topology/HostRequest.java | 12 +- .../ambari/server/topology/LogicalRequest.java | 26 +- .../server/topology/PersistedStateImpl.java | 16 +- .../ambari/server/topology/TopologyManager.java | 24 +- .../tasks/PersistHostResourcesTask.java | 4 +- .../validators/ClusterConfigTypeValidator.java | 2 +- .../validators/RequiredPasswordValidator.java | 8 +- .../server/upgrade/AbstractUpgradeCatalog.java | 20 +- .../ambari/server/upgrade/StackUpgradeUtil.java | 2 +- .../server/upgrade/UpgradeCatalog200.java | 22 +- .../server/upgrade/UpgradeCatalog210.java | 42 +- .../server/upgrade/UpgradeCatalog212.java | 16 +- .../server/upgrade/UpgradeCatalog2121.java | 6 +- .../server/upgrade/UpgradeCatalog220.java | 6 +- .../server/upgrade/UpgradeCatalog221.java | 2 +- .../server/upgrade/UpgradeCatalog222.java | 6 +- .../server/upgrade/UpgradeCatalog230.java | 6 +- .../server/upgrade/UpgradeCatalog240.java | 12 +- .../server/upgrade/UpgradeCatalog242.java | 2 +- .../server/upgrade/UpgradeCatalog250.java | 2 +- .../apache/ambari/server/utils/HTTPUtils.java | 2 +- .../server/utils/JaxbMapKeyListAdapter.java | 2 +- .../server/utils/JaxbMapKeyMapAdapter.java | 2 +- .../server/utils/JaxbMapKeyValAdapter.java | 2 +- .../apache/ambari/server/utils/Parallel.java | 12 +- .../apache/ambari/server/utils/SetUtils.java | 4 +- .../ambari/server/utils/ShellCommandUtil.java | 4 +- .../apache/ambari/server/utils/StageUtils.java | 60 +- .../ambari/server/utils/VersionUtils.java | 4 +- .../apache/ambari/server/view/ClusterImpl.java | 2 +- .../ambari/server/view/RemoteAmbariCluster.java | 4 +- .../view/RemoteAmbariClusterRegistry.java | 4 +- .../server/view/RemoteAmbariStreamProvider.java | 4 +- .../server/view/ViewAmbariStreamProvider.java | 4 +- .../ambari/server/view/ViewContextImpl.java | 4 +- .../view/ViewExternalSubResourceProvider.java | 12 +- .../ambari/server/view/ViewExtractor.java | 2 +- .../apache/ambari/server/view/ViewRegistry.java | 83 +- .../server/view/ViewSubResourceDefinition.java | 2 +- .../server/view/ViewSubResourceProvider.java | 12 +- .../server/view/ViewURLStreamProvider.java | 4 +- .../server/view/persistence/DataStoreImpl.java | 20 +- ambari-server/src/main/python/ambari-server.py | 4 +- .../python/ambari_server/serverConfiguration.py | 3 + .../main/resources/Ambari-DDL-Derby-CREATE.sql | 1 + .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 + .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 + .../resources/Ambari-DDL-Postgres-CREATE.sql | 1 + .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 3 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 1 + ambari-server/src/main/resources/alerts.json | 12 + .../1.6.1.2.2.0/role_command_order.json | 14 + .../0.1.0/configuration/ams-env.xml | 11 + .../0.1.0/configuration/ams-grafana-ini.xml | 11 + .../HDP/grafana-llapdaemon-daemons.json | 313 +++- .../0.1.0/package/scripts/hbase.py | 11 +- .../package/scripts/metrics_grafana_util.py | 8 +- .../0.1.0/package/scripts/params.py | 5 + .../0.1.0/role_command_order.json | 9 + .../ATLAS/0.1.0.2.3/package/scripts/params.py | 5 + .../DRUID/0.9.2/package/scripts/superset.py | 2 +- .../FALCON/0.5.0.2.1/role_command_order.json | 7 + .../0.96.0.2.0/package/scripts/params_linux.py | 9 +- .../HBASE/0.96.0.2.0/role_command_order.json | 10 + .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 2 +- .../2.1.0.2.0/package/scripts/params_linux.py | 11 +- .../HDFS/2.1.0.2.0/role_command_order.json | 22 + .../configuration/ranger-hdfs-audit.xml | 9 + .../3.0.0.3.0/package/scripts/params_linux.py | 9 +- .../HDFS/3.0.0.3.0/service_advisor.py | 27 +- .../HIVE/0.12.0.2.0/configuration/hive-env.xml | 3 +- .../0.12.0.2.0/package/scripts/params_linux.py | 6 +- .../HIVE/0.12.0.2.0/role_command_order.json | 14 + .../HIVE/2.1.0.3.0/configuration/hive-env.xml | 1 + .../configuration/ranger-hive-audit.xml | 9 + .../2.1.0.3.0/package/scripts/params_linux.py | 6 +- .../HIVE/2.1.0.3.0/service_advisor.py | 25 +- .../KAFKA/0.8.1/package/scripts/params.py | 9 +- .../KAFKA/0.8.1/role_command_order.json | 7 + .../KAFKA/0.9.0/role_command_order.json | 6 + .../1.10.3-10/configuration/kerberos-env.xml | 15 + .../1.10.3-10/configuration/krb5-conf.xml | 43 +- .../package/scripts/kerberos_common.py | 5 +- .../1.10.3-10/package/scripts/params.py | 2 + .../1.10.3-10/package/templates/krb5_conf.j2 | 54 - .../KERBEROS/1.10.3-10/properties/krb5_conf.j2 | 60 + .../0.5.0.2.2/package/scripts/params_linux.py | 11 +- .../KNOX/0.5.0.2.2/role_command_order.json | 7 + .../MAHOUT/1.0.0.2.3/role_command_order.json | 6 + .../OOZIE/4.0.0.2.0/role_command_order.json | 9 + .../PIG/0.12.0.2.0/role_command_order.json | 6 + .../PIG/0.16.1.3.0/configuration/pig-env.xml | 41 + .../PIG/0.16.1.3.0/configuration/pig-log4j.xml | 65 + .../0.16.1.3.0/configuration/pig-properties.xml | 93 + .../PIG/0.16.1.3.0/kerberos.json | 17 + .../common-services/PIG/0.16.1.3.0/metainfo.xml | 101 ++ .../PIG/0.16.1.3.0/package/files/pigSmoke.sh | 18 + .../PIG/0.16.1.3.0/package/scripts/params.py | 31 + .../0.16.1.3.0/package/scripts/params_linux.py | 104 ++ .../package/scripts/params_windows.py | 45 + .../PIG/0.16.1.3.0/package/scripts/pig.py | 80 + .../0.16.1.3.0/package/scripts/pig_client.py | 71 + .../0.16.1.3.0/package/scripts/service_check.py | 142 ++ .../PIG/0.16.1.3.0/service_advisor.py | 171 ++ .../RANGER/0.4.0/role_command_order.json | 8 + .../RANGER/0.5.0/role_command_order.json | 6 + .../RANGER/0.6.0/role_command_order.json | 6 + .../0.5.0.2.3/package/scripts/params.py | 10 +- .../0.5.0.2.3/role_command_order.json | 7 + .../SLIDER/0.91.0.3.0/service_advisor.py | 7 +- .../SPARK/1.2.1/role_command_order.json | 6 + .../SPARK/1.5.2/role_command_order.json | 6 + .../SPARK/1.6.0/role_command_order.json | 8 + .../SPARK/2.2.0/service_advisor.py | 7 +- .../SPARK2/2.0.0/role_command_order.json | 6 + .../SQOOP/1.4.4.2.0/role_command_order.json | 6 + .../STORM/0.10.0/role_command_order.json | 8 + .../STORM/0.9.1/package/scripts/params_linux.py | 6 +- .../STORM/0.9.1/role_command_order.json | 13 + .../STORM/0.9.3/role_command_order.json | 7 + .../TEZ/0.4.0.2.1/configuration/tez-site.xml | 2 +- .../0.4.0.2.1/package/scripts/params_linux.py | 2 + .../TEZ/0.4.0.2.1/role_command_order.json | 6 + .../TEZ/0.9.0.3.0/service_advisor.py | 9 +- .../configuration-mapred/mapred-site.xml | 2 +- .../2.1.0.2.0/package/scripts/params_linux.py | 10 +- .../YARN/2.1.0.2.0/package/scripts/yarn.py | 16 +- .../YARN/2.1.0.2.0/role_command_order.json | 21 + .../configuration/ranger-yarn-audit.xml | 9 + .../3.0.0.3.0/package/scripts/params_linux.py | 9 +- .../YARN/3.0.0.3.0/package/scripts/yarn.py | 14 +- .../YARN/3.0.0.3.0/service_advisor.py | 259 +-- .../0.6.0.2.5/package/scripts/master.py | 10 +- .../ZOOKEEPER/3.4.5/role_command_order.json | 9 + .../ZOOKEEPER/3.4.9/service_advisor.py | 13 +- .../host_scripts/alert_version_select.py | 104 ++ .../src/main/resources/properties.json | 1 + .../stacks/BIGTOP/0.8/services/stack_advisor.py | 3 +- .../2.0.6/hooks/before-ANY/scripts/params.py | 1 + .../stacks/HDP/2.0.6/services/stack_advisor.py | 7 +- .../stacks/HDP/2.1/services/stack_advisor.py | 3 +- .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../stacks/HDP/2.2/services/stack_advisor.py | 3 +- .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../stacks/HDP/2.3/services/stack_advisor.py | 3 +- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 6 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 10 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 10 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 16 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 29 + .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 10 + .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 10 + .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 11 + .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 21 + .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 10 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 16 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 31 +- .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 10 + .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 11 + .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 21 + .../stacks/HDP/2.5/services/stack_advisor.py | 277 ++- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 6 + .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 16 + .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 29 + .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 16 + .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 23 + .../resources/stacks/HDP/2.6/repos/repoinfo.xml | 16 +- .../HDP/2.6/services/ACCUMULO/metainfo.xml | 2 +- .../ATLAS/configuration/ranger-atlas-audit.xml | 33 + .../stacks/HDP/2.6/services/ATLAS/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/DRUID/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/FALCON/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/FLUME/metainfo.xml | 2 +- .../HBASE/configuration/ranger-hbase-audit.xml | 33 + .../stacks/HDP/2.6/services/HBASE/metainfo.xml | 2 +- .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../HDFS/configuration/ranger-hdfs-audit.xml | 33 + .../stacks/HDP/2.6/services/HDFS/metainfo.xml | 2 +- .../HIVE/configuration/ranger-hive-audit.xml | 33 + .../stacks/HDP/2.6/services/HIVE/metainfo.xml | 2 +- .../KAFKA/configuration/ranger-kafka-audit.xml | 33 + .../stacks/HDP/2.6/services/KAFKA/metainfo.xml | 2 +- .../KNOX/configuration/ranger-knox-audit.xml | 33 + .../stacks/HDP/2.6/services/KNOX/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/MAHOUT/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/OOZIE/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/PIG/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/RANGER/metainfo.xml | 2 +- .../configuration/ranger-kms-audit.xml | 33 + .../HDP/2.6/services/RANGER_KMS/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/SLIDER/metainfo.xml | 2 +- .../STORM/configuration/ranger-storm-audit.xml | 33 + .../stacks/HDP/2.6/services/STORM/metainfo.xml | 2 +- .../YARN/configuration/ranger-yarn-audit.xml | 33 + .../stacks/HDP/2.6/services/YARN/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/stack_advisor.py | 27 +- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 108 ++ .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 63 +- .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 43 + .../stacks/HDP/3.0/services/PIG/metainfo.xml | 27 + .../stacks/HDPWIN/2.1/services/stack_advisor.py | 9 +- .../stacks/HDPWIN/2.2/services/stack_advisor.py | 3 +- .../KERBEROS/configuration/kerberos-env.xml | 15 + .../KERBEROS/configuration/krb5-conf.xml | 43 +- .../KERBEROS/package/scripts/kerberos_common.py | 5 +- .../services/KERBEROS/package/scripts/params.py | 2 + .../KERBEROS/package/templates/krb5_conf.j2 | 54 - .../services/KERBEROS/properties/krb5_conf.j2 | 60 + .../stacks/PERF/1.0/services/stack_advisor.py | 3 +- .../1.0/upgrades/nonrolling-upgrade-2.0.xml | 10 + .../stacks/PERF/1.0/upgrades/upgrade-2.0.xml | 10 + .../src/main/resources/stacks/stack_advisor.py | 88 +- .../ExecutionCommandWrapperTest.java | 28 +- .../actionmanager/TestActionDBAccessorImpl.java | 69 +- .../server/actionmanager/TestActionManager.java | 12 +- .../actionmanager/TestActionScheduler.java | 250 +-- .../TestActionSchedulerThreading.java | 4 +- .../ambari/server/actionmanager/TestStage.java | 2 +- .../server/agent/HeartbeatProcessorTest.java | 36 +- .../server/agent/HeartbeatTestHelper.java | 6 +- .../ambari/server/agent/TestActionQueue.java | 12 +- .../server/agent/TestHeartbeatHandler.java | 52 +- .../server/agent/TestHeartbeatMonitor.java | 2 +- .../alerts/AgentHeartbeatAlertRunnableTest.java | 4 +- .../alerts/AmbariPerformanceRunnableTest.java | 4 +- .../server/alerts/StaleAlertRunnableTest.java | 4 +- .../server/api/handlers/CreateHandlerTest.java | 6 +- .../server/api/handlers/DeleteHandlerTest.java | 2 +- .../api/handlers/QueryCreateHandlerTest.java | 98 +- .../server/api/handlers/ReadHandlerTest.java | 4 +- .../server/api/handlers/UpdateHandlerTest.java | 4 +- .../server/api/predicate/QueryLexerTest.java | 40 +- .../server/api/predicate/QueryParserTest.java | 56 +- .../predicate/operators/AndOperatorTest.java | 4 +- .../predicate/operators/EqualsOperatorTest.java | 2 +- .../operators/GreaterEqualsOperatorTest.java | 2 +- .../operators/GreaterOperatorTest.java | 2 +- .../api/predicate/operators/InOperatorTest.java | 6 +- .../operators/LessEqualsOperatorTest.java | 2 +- .../predicate/operators/LessOperatorTest.java | 2 +- .../operators/NotEqualsOperatorTest.java | 2 +- .../predicate/operators/NotOperatorTest.java | 2 +- .../api/predicate/operators/OrOperatorTest.java | 4 +- .../ExtendedResourcePredicateVisitorTest.java | 18 +- .../server/api/query/JpaSortBuilderTest.java | 2 +- .../query/ProcessingPredicateVisitorTest.java | 12 +- .../ambari/server/api/query/QueryImplTest.java | 62 +- .../ambari/server/api/query/QueryInfoTest.java | 2 +- .../render/ClusterBlueprintRendererTest.java | 44 +- .../api/query/render/DefaultRendererTest.java | 32 +- .../render/MetricsPaddingRendererTest.java | 4 +- .../api/query/render/MinimalRendererTest.java | 40 +- .../resources/BaseResourceDefinitionTest.java | 10 +- .../PermissionResourceDefinitionTest.java | 2 +- .../resources/SimpleResourceDefinitionTest.java | 2 +- .../ViewInstanceResourceDefinitionTest.java | 2 +- .../server/api/services/ActionServiceTest.java | 2 +- .../server/api/services/AmbariMetaInfoTest.java | 31 +- .../server/api/services/BaseServiceTest.java | 2 +- .../api/services/BlueprintServiceTest.java | 2 +- .../ClusterKerberosDescriptorServiceTest.java | 2 +- .../services/ClusterPrivilegeServiceTest.java | 2 +- .../server/api/services/ClusterServiceTest.java | 2 +- .../ClusterStackVersionServiceTest.java | 2 +- .../api/services/ComponentServiceTest.java | 2 +- .../api/services/ConfigGroupServiceTest.java | 2 +- .../api/services/ConfigurationServiceTest.java | 2 +- .../api/services/CredentialServiceTest.java | 2 +- .../api/services/ExtensionsServiceTest.java | 2 +- .../server/api/services/FeedServiceTest.java | 2 +- .../server/api/services/GroupServiceTest.java | 2 +- .../api/services/HostComponentServiceTest.java | 2 +- .../HostKerberosIdentityServiceTest.java | 2 +- .../server/api/services/HostServiceTest.java | 2 +- .../services/HostStackVersionServiceTest.java | 2 +- .../api/services/InstanceServiceTest.java | 2 +- .../server/api/services/JobServiceTest.java | 2 +- .../api/services/LdapSyncEventServiceTest.java | 2 +- .../api/services/NamedPropertySetTest.java | 6 +- .../api/services/PermissionServiceTest.java | 2 +- .../services/PersistenceManagerImplTest.java | 32 +- .../services/PreUpgradeCheckServiceTest.java | 2 +- .../api/services/PrivilegeServiceTest.java | 2 +- .../api/services/RecommendationServiceTest.java | 2 +- .../api/services/RepositoryServiceTest.java | 2 +- .../server/api/services/RequestFactoryTest.java | 18 +- .../services/RoleAuthorizationServiceTest.java | 2 +- .../api/services/RootServiceServiceTest.java | 2 +- .../server/api/services/ServiceServiceTest.java | 2 +- .../server/api/services/StacksServiceTest.java | 2 +- .../api/services/TargetClusterServiceTest.java | 2 +- .../api/services/TaskAttemptServiceTest.java | 2 +- .../api/services/UpgradeItemServiceTest.java | 2 +- .../api/services/ValidationServiceTest.java | 2 +- .../services/ViewSubResourceServiceTest.java | 12 +- .../api/services/WorkflowServiceTest.java | 2 +- .../parsers/JsonRequestBodyParserTest.java | 20 +- .../serializers/JsonSerializerTest.java | 16 +- .../StackAdvisorBlueprintProcessorTest.java | 30 +- .../ConfigurationRecommendationCommandTest.java | 12 +- .../audit/request/AllPostAndPutCreator.java | 2 +- .../creator/RequestEventCreatorTest.java | 2 +- .../ambari/server/bootstrap/BootStrapTest.java | 6 +- .../checks/AbstractCheckDescriptorTest.java | 2 +- .../checks/ClientRetryPropertyCheckTest.java | 8 +- .../checks/ComponentsInstallationCheckTest.java | 12 +- .../checks/ConfigurationMergeCheckTest.java | 2 +- .../HiveDynamicServiceDiscoveryCheckTest.java | 6 +- .../checks/HiveMultipleMetastoreCheckTest.java | 8 +- .../checks/HostsMasterMaintenanceCheckTest.java | 2 +- .../checks/HostsRepositoryVersionCheckTest.java | 6 +- .../server/checks/InstallPackagesCheckTest.java | 6 +- ...duce2JobHistoryStatePreservingCheckTest.java | 6 +- .../server/checks/RangerAuditDbCheckTest.java | 4 +- .../server/checks/RangerPasswordCheckTest.java | 2 +- .../server/checks/RangerSSLConfigCheckTest.java | 4 +- .../checks/ServiceCheckValidityCheckTest.java | 20 +- .../server/checks/ServicePresenceCheckTest.java | 59 +- ...vicesMapReduceDistributedCacheCheckTest.java | 10 +- ...rvicesNamenodeHighAvailabilityCheckTest.java | 2 +- .../ServicesNamenodeTruncateCheckTest.java | 2 +- .../ServicesTezDistributedCacheCheckTest.java | 10 +- .../server/checks/ServicesUpCheckTest.java | 10 +- .../ServicesYarnWorkPreservingCheckTest.java | 2 +- ...nTimelineServerStatePreservingCheckTest.java | 12 +- .../collections/functors/AndPredicateTest.java | 8 +- .../functors/ContainsPredicateTest.java | 8 +- .../functors/ContextTransformerTest.java | 8 +- .../functors/EqualsPredicateTest.java | 4 +- .../collections/functors/NotPredicateTest.java | 2 +- .../collections/functors/OrPredicateTest.java | 8 +- .../AmbariCustomCommandExecutionHelperTest.java | 12 +- .../controller/AmbariHandlerListTest.java | 6 +- .../AmbariManagementControllerImplTest.java | 64 +- .../AmbariManagementControllerTest.java | 386 ++-- .../BackgroundCustomCommandExecutionTest.java | 8 +- .../server/controller/ClusterRequestTest.java | 2 +- .../server/controller/ClusterResponseTest.java | 2 +- .../server/controller/KerberosHelperTest.java | 2 +- .../server/controller/LdapSyncRequestTest.java | 8 +- .../controller/MaintenanceStateHelperTest.java | 4 +- ...hYarnCapacitySchedulerReleaseConfigTest.java | 8 +- .../AbstractControllerResourceProviderTest.java | 4 +- .../AbstractDRResourceProviderTest.java | 4 +- .../AbstractJDBCResourceProviderTest.java | 4 +- .../internal/AbstractResourceProviderTest.java | 36 +- .../internal/ActionResourceProviderTest.java | 8 +- .../AlertDefinitionResourceProviderTest.java | 10 +- .../AlertGroupResourceProviderTest.java | 38 +- .../internal/AlertResourceProviderTest.java | 4 +- .../AlertTargetResourceProviderTest.java | 22 +- .../AmbariPrivilegeResourceProviderTest.java | 44 +- .../internal/ArtifactResourceProviderTest.java | 68 +- .../internal/BaseBlueprintProcessorTest.java | 12 +- .../controller/internal/BaseProviderTest.java | 32 +- .../BlueprintConfigurationProcessorTest.java | 1695 +++++++++--------- .../internal/BlueprintResourceProviderTest.java | 68 +- .../internal/CalculatedStatusTest.java | 12 +- .../ClientConfigResourceProviderTest.java | 116 +- .../internal/ClusterControllerImplTest.java | 104 +- ...rKerberosDescriptorResourceProviderTest.java | 52 +- .../ClusterPrivilegeResourceProviderTest.java | 28 +- .../internal/ClusterResourceProviderTest.java | 70 +- ...ClusterStackVersionResourceProviderTest.java | 60 +- ...leRepositoryVersionResourceProviderTest.java | 4 +- .../internal/ComponentResourceProviderTest.java | 32 +- .../ConfigGroupResourceProviderTest.java | 76 +- .../ConfigurationResourceProviderTest.java | 16 +- .../CredentialResourceProviderTest.java | 8 +- .../internal/ExportBlueprintRequestTest.java | 2 +- .../internal/ExtensionResourceProviderTest.java | 6 +- .../internal/FeedResourceProviderTest.java | 24 +- .../GroupPrivilegeResourceProviderTest.java | 4 +- .../internal/GroupResourceProviderTest.java | 10 +- .../HostComponentResourceProviderTest.java | 38 +- ...ostKerberosIdentityResourceProviderTest.java | 10 +- .../internal/HostResourceProviderTest.java | 56 +- .../internal/InstanceResourceProviderTest.java | 16 +- .../internal/JMXHostProviderTest.java | 36 +- .../internal/JobResourceProviderTest.java | 12 +- .../LdapSyncEventResourceProviderTest.java | 18 +- .../internal/MemberResourceProviderTest.java | 6 +- .../internal/PageResponseImplTest.java | 8 +- .../PermissionResourceProviderTest.java | 2 +- .../PreUpgradeCheckResourceProviderTest.java | 8 +- .../internal/ProvisionClusterRequestTest.java | 56 +- .../internal/QueryResponseImplTest.java | 8 +- .../RemoteClusterResourceProviderTest.java | 8 +- .../RepositoryResourceProviderTest.java | 8 +- .../RepositoryVersionResourceProviderTest.java | 28 +- .../internal/RequestOperationLevelTest.java | 2 +- .../internal/RequestResourceProviderTest.java | 82 +- .../RequestScheduleResourceProviderTest.java | 45 +- .../internal/RequestStageContainerTest.java | 12 +- .../RoleAuthorizationResourceProviderTest.java | 6 +- ...ootServiceComponentPropertyProviderTest.java | 2 +- ...ootServiceComponentResourceProviderTest.java | 6 +- ...erviceHostComponentResourceProviderTest.java | 8 +- .../RootServiceResourceProviderTest.java | 6 +- .../internal/ScaleClusterRequestTest.java | 16 +- .../controller/internal/SchemaImplTest.java | 12 +- .../internal/ServiceResourceProviderTest.java | 36 +- .../SimplifyingPredicateVisitorTest.java | 2 +- .../StackAdvisorResourceProviderTest.java | 18 +- .../StackArtifactResourceProviderTest.java | 6 +- ...igurationDependencyResourceProviderTest.java | 4 +- .../StackConfigurationResourceProviderTest.java | 12 +- .../StackDefinedPropertyProviderTest.java | 20 +- .../StackDependencyResourceProviderTest.java | 44 +- ...kLevelConfigurationResourceProviderTest.java | 12 +- .../internal/StackResourceProviderTest.java | 6 +- .../server/controller/internal/StackTest.java | 8 +- .../internal/StageResourceProviderTest.java | 6 +- .../TargetClusterResourceProviderTest.java | 22 +- .../TaskAttemptResourceProviderTest.java | 6 +- .../internal/TaskResourceProviderTest.java | 10 +- .../controller/internal/TestIvoryService.java | 18 +- .../internal/URLStreamProviderTest.java | 4 +- .../internal/UpgradeResourceProviderTest.java | 4 +- .../UpgradeSummaryResourceProviderTest.java | 18 +- .../UserPrivilegeResourceProviderTest.java | 10 +- .../internal/UserResourceProviderDBTest.java | 16 +- .../VersionDefinitionResourceProviderTest.java | 12 +- .../ViewInstanceResourceProviderTest.java | 20 +- .../ViewPermissionResourceProviderTest.java | 4 +- .../ViewPrivilegeResourceProviderTest.java | 6 +- .../internal/ViewURLResourceProviderTest.java | 2 +- .../WidgetLayoutResourceProviderTest.java | 14 +- .../internal/WorkflowResourceProviderTest.java | 6 +- .../server/controller/ivory/FeedTest.java | 30 +- .../controller/jmx/TestStreamProvider.java | 2 +- .../LoggingRequestHelperFactoryImplTest.java | 4 +- .../logging/LoggingRequestHelperImplTest.java | 12 +- .../LoggingSearchPropertyProviderTest.java | 4 +- .../metrics/JMXPropertyProviderTest.java | 24 +- .../RestMetricsPropertyProviderTest.java | 24 +- .../metrics/ganglia/GangliaMetricTest.java | 4 +- .../ganglia/GangliaPropertyProviderTest.java | 58 +- .../GangliaReportPropertyProviderTest.java | 2 +- .../metrics/ganglia/TestStreamProvider.java | 2 +- .../timeline/AMSPropertyProviderTest.java | 28 +- .../timeline/AMSReportPropertyProviderTest.java | 4 +- .../timeline/MetricsPaddingMethodTest.java | 14 +- .../timeline/MetricsRequestHelperTest.java | 2 +- .../timeline/cache/TimelineMetricCacheTest.java | 16 +- .../controller/predicate/AndPredicateTest.java | 12 +- .../predicate/CategoryIsEmptyPredicateTest.java | 2 +- .../predicate/EqualsPredicateTest.java | 8 +- .../predicate/GreaterEqualsPredicateTest.java | 4 +- .../predicate/GreaterPredicateTest.java | 6 +- .../predicate/LessEqualsPredicateTest.java | 4 +- .../controller/predicate/LessPredicateTest.java | 4 +- .../controller/predicate/NotPredicateTest.java | 4 +- .../controller/predicate/OrPredicateTest.java | 12 +- .../predicate/PredicateVisitorTest.java | 2 +- ...ThreadPoolExecutorCompletionServiceTest.java | 6 +- .../utilities/PropertyHelperTest.java | 12 +- .../utilities/webserver/StartServer.java | 2 +- .../credentialapi/CredentialUtilTest.java | 12 +- .../apache/ambari/server/events/EventsTest.java | 2 +- .../ambari/server/events/MockEventListener.java | 8 +- .../listeners/tasks/TaskStatusListenerTest.java | 4 +- .../AlertMaintenanceModeListenerTest.java | 2 +- .../HostVersionOutOfSyncListenerTest.java | 28 +- .../upgrade/StackVersionListenerTest.java | 2 +- .../server/hooks/users/UserHookServiceTest.java | 2 +- .../metadata/AgentAlertDefinitionsTest.java | 2 +- .../server/metadata/RoleCommandOrderTest.java | 4 +- .../dispatchers/AlertScriptDispatcherTest.java | 2 +- .../dispatchers/AmbariSNMPDispatcherTest.java | 58 +- .../dispatchers/EmailDispatcherTest.java | 12 +- .../dispatchers/SNMPDispatcherTest.java | 60 +- .../ambari/server/orm/DBAccessorImplTest.java | 10 +- .../apache/ambari/server/orm/OrmTestHelper.java | 8 +- .../apache/ambari/server/orm/TestOrmImpl.java | 2 +- .../server/orm/dao/AlertDefinitionDAOTest.java | 2 +- .../ambari/server/orm/dao/AlertsDAOTest.java | 4 +- .../server/orm/dao/ConfigGroupDAOTest.java | 8 +- .../server/orm/dao/HostVersionDAOTest.java | 4 +- .../ambari/server/orm/dao/RequestDAOTest.java | 23 +- .../ambari/server/orm/dao/StageDAOTest.java | 4 +- .../ambari/server/orm/dao/UpgradeDAOTest.java | 23 +- .../ambari/server/orm/dao/WidgetDAOTest.java | 2 +- .../server/orm/dao/WidgetLayoutDAOTest.java | 2 +- .../apache/ambari/server/orm/db/DDLTests.java | 6 +- .../orm/entities/LdapSyncSpecEntityTest.java | 4 +- .../orm/entities/PrincipalEntityTest.java | 4 +- .../orm/entities/ViewInstanceEntityTest.java | 2 +- .../ambari/server/proxy/ProxyServiceTest.java | 28 +- .../scheduler/ExecutionScheduleManagerTest.java | 10 +- .../AmbariServerSecurityHeaderFilterTest.java | 4 +- .../AmbariViewsSecurityHeaderFilterTest.java | 4 +- .../server/security/CertificateManagerTest.java | 2 +- .../security/SecurePasswordHelperTest.java | 2 +- ...ariKerberosAuthenticationPropertiesTest.java | 6 +- .../AmbariPamAuthenticationProviderTest.java | 2 +- .../authorization/AuthorizationHelperTest.java | 4 +- .../security/authorization/UsersTest.java | 4 +- .../encryption/MasterKeyServiceTest.java | 4 +- .../ldap/AmbariLdapDataPopulatorTest.java | 20 +- .../security/ldap/LdapPerformanceTest.java | 4 +- .../serveraction/ServerActionExecutorTest.java | 2 +- .../ADKerberosOperationHandlerTest.java | 4 +- .../FinalizeKerberosServerActionTest.java | 4 +- .../kerberos/KerberosOperationHandlerTest.java | 2 +- .../kerberos/KerberosServerActionTest.java | 12 +- .../UpdateKerberosConfigsServerActionTest.java | 8 +- .../AutoSkipFailedSummaryActionTest.java | 8 +- .../ComponentVersionCheckActionTest.java | 12 +- .../FixCapacitySchedulerOrderingPolicyTest.java | 127 ++ .../upgrades/FixOozieAdminUsersTest.java | 2 +- .../upgrades/FixYarnWebServiceUrlTest.java | 305 ++++ .../HBaseEnvMaxDirectMemorySizeActionTest.java | 2 +- .../upgrades/HiveEnvClasspathActionTest.java | 2 +- .../upgrades/KerberosKeytabsActionTest.java | 6 +- .../upgrades/RangerConfigCalculationTest.java | 4 +- .../RangerKerberosConfigCalculationTest.java | 2 +- .../upgrades/RangerKmsProxyConfigTest.java | 2 +- .../RangerWebAlertConfigActionTest.java | 6 +- .../upgrades/UpgradeActionTest.java | 32 +- .../UpgradeUserKerberosDescriptorTest.java | 4 +- .../server/stack/ComponentModuleTest.java | 22 +- .../ambari/server/stack/ServiceModuleTest.java | 76 +- .../stack/StackManagerCommonServicesTest.java | 2 +- .../server/stack/StackManagerExtensionTest.java | 2 +- .../ambari/server/stack/StackManagerTest.java | 30 +- .../ambari/server/stack/StackModuleTest.java | 13 +- .../ambari/server/state/CheckHelperTest.java | 10 +- .../ambari/server/state/ConfigGroupTest.java | 16 +- .../ambari/server/state/PropertyInfoTest.java | 2 +- .../server/state/RequestExecutionTest.java | 4 +- .../server/state/ServiceComponentTest.java | 21 +- .../ambari/server/state/ServiceInfoTest.java | 49 +- .../apache/ambari/server/state/ServiceTest.java | 4 +- .../ambari/server/state/UpgradeHelperTest.java | 188 +- .../state/alerts/AlertDefinitionHashTest.java | 16 +- .../alerts/AlertStateChangedEventTest.java | 30 +- .../state/cluster/ClusterDeadlockTest.java | 16 +- .../server/state/cluster/ClusterImplTest.java | 14 +- .../state/cluster/ClustersDeadlockTest.java | 6 +- .../server/state/cluster/ClustersImplTest.java | 4 +- .../ConcurrentServiceConfigVersionTest.java | 4 +- ...omponentHostConcurrentWriteDeadlockTest.java | 8 +- .../KerberosComponentDescriptorTest.java | 14 +- .../KerberosConfigurationDescriptorTest.java | 14 +- .../state/kerberos/KerberosDescriptorTest.java | 45 +- .../KerberosIdentityDescriptorTest.java | 18 +- .../kerberos/KerberosKeytabDescriptorTest.java | 6 +- .../KerberosPrincipalDescriptorTest.java | 4 +- .../kerberos/KerberosServiceDescriptorTest.java | 16 +- .../kerberos/VariableReplacementHelperTest.java | 16 +- .../state/scheduler/BatchRequestJobTest.java | 4 +- .../AlertNoticeDispatchServiceTest.java | 10 +- .../services/MetricsRetrievalServiceTest.java | 63 + .../services/RetryUpgradeActionServiceTest.java | 14 +- .../ambari/server/state/stack/OSFamilyTest.java | 16 +- .../upgrade/RepositoryVersionHelperTest.java | 2 +- .../svccomphost/ServiceComponentHostTest.java | 24 +- .../server/testing/DeadlockWarningThread.java | 4 +- .../server/testing/DeadlockedThreadsTest.java | 2 +- .../server/topology/AmbariContextTest.java | 32 +- .../server/topology/BlueprintFactoryTest.java | 6 +- .../server/topology/BlueprintImplTest.java | 18 +- .../topology/BlueprintValidatorImplTest.java | 20 +- .../ClusterConfigurationRequestTest.java | 10 +- .../ClusterDeployWithStartOnlyTest.java | 12 +- ...InstallWithoutStartOnComponentLevelTest.java | 12 +- .../ClusterInstallWithoutStartTest.java | 12 +- .../topology/ClusterTopologyImplTest.java | 22 +- .../topology/ConfigurationFactoryTest.java | 14 +- .../server/topology/ConfigurationTest.java | 106 +- .../topology/RequiredPasswordValidatorTest.java | 24 +- .../ambari/server/topology/SettingTest.java | 6 +- .../server/topology/TopologyManagerTest.java | 12 +- .../ClusterConfigTypeValidatorTest.java | 14 +- .../upgrade/AbstractUpgradeCatalogTest.java | 6 +- .../server/upgrade/UpgradeCatalog200Test.java | 12 +- .../server/upgrade/UpgradeCatalog210Test.java | 32 +- .../server/upgrade/UpgradeCatalog212Test.java | 8 +- .../server/upgrade/UpgradeCatalog220Test.java | 8 +- .../server/upgrade/UpgradeCatalog221Test.java | 10 +- .../server/upgrade/UpgradeCatalog230Test.java | 2 +- .../server/upgrade/UpgradeCatalog240Test.java | 34 +- .../server/upgrade/UpgradeCatalog242Test.java | 4 +- .../server/upgrade/UpgradeCatalog250Test.java | 54 +- .../ambari/server/upgrade/UpgradeTest.java | 2 +- .../ambari/server/utils/SetUtilsTest.java | 10 +- .../ambari/server/utils/StageUtilsTest.java | 40 +- .../ambari/server/utils/TestParallel.java | 8 +- .../ambari/server/view/ClusterImplTest.java | 4 +- .../view/ViewAmbariStreamProviderTest.java | 16 +- .../ambari/server/view/ViewExtractorTest.java | 6 +- .../ambari/server/view/ViewRegistryTest.java | 40 +- .../view/ViewSubResourceProviderTest.java | 6 +- .../server/view/ViewURLStreamProviderTest.java | 44 +- .../server/view/events/EventImplTest.java | 2 +- .../view/persistence/DataStoreImplTest.java | 4 +- .../InstanceValidationResultImplTest.java | 2 +- .../stacks/2.0.6/HDFS/test_hdfs_client.py | 11 +- .../stacks/2.0.6/YARN/test_nodemanager.py | 6 +- .../python/stacks/2.0.6/configs/default.json | 24 + .../stacks/2.2/KERBEROS/test_kerberos_client.py | 4 +- .../python/stacks/2.2/KERBEROS/use_cases.py | 5 +- .../stacks/2.3/ATLAS/test_metadata_server.py | 6 +- .../stacks/2.5/RANGER/test_ranger_admin.py | 8 +- .../stacks/2.6/RANGER/test_ranger_admin.py | 8 +- .../test_filtering_identity_descriptor.json | 74 + .../HDP/2.0.7/services/SYSTEMML/metainfo.xml | 39 + .../stacks/HDP/2.0.8/services/HIVE/metainfo.xml | 174 ++ .../HDP/2.0.8/services/SYSTEMML/metainfo.xml | 39 + .../upgrades/upgrade_multi_server_tasks.xml | 88 + ambari-web/app/app.js | 4 + ambari-web/app/assets/index.html | 4 +- ambari-web/app/assets/test/tests.js | 6 +- ambari-web/app/config.js | 2 - ambari-web/app/controllers/application.js | 10 +- ambari-web/app/controllers/experimental.js | 2 +- .../controllers/global/cluster_controller.js | 31 +- .../global/errors_handler_controller.js | 2 +- .../global/user_settings_controller.js | 2 +- .../global/wizard_watcher_controller.js | 2 +- ambari-web/app/controllers/installer.js | 23 +- ambari-web/app/controllers/main.js | 28 +- .../main/admin/kerberos/wizard_controller.js | 18 +- ambari-web/app/controllers/main/host/details.js | 14 +- .../controllers/main/service/add_controller.js | 43 +- ambari-web/app/controllers/wizard.js | 62 +- .../app/controllers/wizard/step1_controller.js | 6 +- .../app/controllers/wizard/step3_controller.js | 15 +- .../app/controllers/wizard/step4_controller.js | 2 + .../app/controllers/wizard/step6_controller.js | 8 +- .../app/controllers/wizard/step9_controller.js | 3 +- .../wizards/kerberos_descriptor_properties.js | 5 + ambari-web/app/mappers/stack_service_mapper.js | 1 + ambari-web/app/messages.js | 8 +- ambari-web/app/mixins.js | 3 +- ambari-web/app/mixins/common/persist.js | 166 ++ ambari-web/app/mixins/common/persist_mixin.js | 45 - ambari-web/app/mixins/common/userPref.js | 126 -- .../main/host/details/actions/check_host.js | 110 +- .../app/mixins/wizard/addSecurityConfigs.js | 4 +- .../mixins/wizard/assign_master_components.js | 1 + ambari-web/app/models/cluster_states.js | 3 +- ambari-web/app/models/host_component.js | 3 +- ambari-web/app/models/repository.js | 15 +- ambari-web/app/models/stack_service.js | 1 + ambari-web/app/routes/add_kerberos_routes.js | 22 +- ambari-web/app/routes/add_service_routes.js | 16 +- ambari-web/app/routes/installer.js | 25 +- ambari-web/app/routes/main.js | 34 +- ambari-web/app/routes/stack_upgrade_routes.js | 2 +- .../app/styles/theme/bootstrap-ambari.css | 42 +- ambari-web/app/styles/widgets.less | 1 + ambari-web/app/templates/application.hbs | 10 +- .../common/assign_master_components.hbs | 14 +- .../common/configs/overriddenProperty.hbs | 4 +- .../common/configs/service_config_category.hbs | 16 +- .../common/configs/services_config.hbs | 6 +- .../app/templates/common/form/dropdown.hbs | 2 +- ambari-web/app/templates/common/modal_popup.hbs | 16 +- ambari-web/app/templates/common/pagination.hbs | 2 +- ambari-web/app/templates/installer.hbs | 24 +- ambari-web/app/templates/login.hbs | 12 +- ambari-web/app/templates/main.hbs | 2 +- .../stack_upgrade/stack_upgrade_wizard.hbs | 47 +- .../templates/main/service/services/oozie.hbs | 40 - ambari-web/app/templates/wizard/step0.hbs | 9 +- ambari-web/app/templates/wizard/step1.hbs | 72 +- ambari-web/app/templates/wizard/step10.hbs | 2 +- ambari-web/app/templates/wizard/step2.hbs | 246 +-- ambari-web/app/templates/wizard/step3.hbs | 63 +- .../step3/step3_host_warning_popup_footer.hbs | 5 +- .../wizard/step3/step3_host_warnings_popup.hbs | 35 +- .../step3/step3_registered_hosts_popup.hbs | 2 +- ambari-web/app/templates/wizard/step4.hbs | 20 +- .../step4/step4_ranger_requirements_popup.hbs | 2 +- ambari-web/app/templates/wizard/step6.hbs | 18 +- ambari-web/app/templates/wizard/step7.hbs | 4 +- ambari-web/app/templates/wizard/step8.hbs | 8 +- ambari-web/app/templates/wizard/step9.hbs | 46 +- .../wizard/step9/step9HostTasksLogPopup.hbs | 2 +- ambari-web/app/utils/ajax/ajax.js | 24 +- ambari-web/app/utils/helper.js | 55 +- ambari-web/app/utils/persist.js | 101 -- ambari-web/app/views.js | 1 - .../common/assign_master_components_view.js | 4 + ambari-web/app/views/common/checkbox_view.js | 3 +- .../configs/service_configs_by_category_view.js | 8 +- ambari-web/app/views/common/controls_view.js | 5 +- ambari-web/app/views/common/modal_popup.js | 1 + .../views/common/modal_popups/alert_popup.js | 1 + .../common/modal_popups/confirmation_popup.js | 1 + .../app/views/common/quick_view_link_view.js | 8 - ambari-web/app/views/common/table_view.js | 2 +- ambari-web/app/views/login.js | 6 +- ambari-web/app/views/main/dashboard/widgets.js | 2 +- .../app/views/main/service/info/summary.js | 9 +- .../main/service/manage_config_groups_view.js | 2 +- ambari-web/app/views/main/service/menu.js | 40 +- .../app/views/main/service/reconfigure.js | 8 +- ambari-web/app/views/main/service/service.js | 23 +- .../app/views/main/service/services/hbase.js | 6 - .../app/views/main/service/services/hdfs.js | 4 - .../app/views/main/service/services/oozie.js | 29 - ambari-web/app/views/wizard/step1_view.js | 13 +- ambari-web/app/views/wizard/step2_view.js | 4 +- .../wizard/step3/hostWarningPopupBody_view.js | 3 +- .../wizard/step3/hostWarningPopupFooter_view.js | 4 +- ambari-web/app/views/wizard/step6_view.js | 12 +- ambari-web/app/views/wizard/step9_view.js | 1 + .../global/cluster_controller_test.js | 73 +- ambari-web/test/controllers/installer_test.js | 23 +- .../test/controllers/main/service/item_test.js | 2 +- ambari-web/test/controllers/main_test.js | 67 - .../test/controllers/wizard/step3_test.js | 34 - ambari-web/test/controllers/wizard_test.js | 47 +- ambari-web/test/init_test.js | 27 + .../test/mappers/stack_service_mapper_test.js | 7 +- ambari-web/test/mixins/common/persist_test.js | 125 ++ .../test/views/common/quick_link_view_test.js | 10 - ambari-web/test/views/common/table_view_test.js | 14 +- .../test/views/main/dashboard/widgets_test.js | 2 +- .../views/main/service/info/summary_test.js | 26 - ambari-web/test/views/main/service/item_test.js | 166 +- .../service/manage_config_groups_view_test.js | 125 ++ ambari-web/test/views/main/service/menu_test.js | 210 ++- .../views/main/service/reassign_view_test.js | 128 ++ .../test/views/main/service/reconfigure_test.js | 126 ++ .../test/views/main/service/service_test.js | 264 +++ .../views/main/service/services/hbase_test.js | 23 - .../views/main/service/services/hdfs_test.js | 20 - .../views/main/service/services/oozie_test.js | 55 - ambari-web/test/views/wizard/step1_view_test.js | 16 +- .../step3/hostWarningPopupFooter_view_test.js | 14 +- .../vendor/scripts/theme/bootstrap-ambari.js | 29 +- ambari-web/vendor/scripts/visualsearch.js | 2 +- .../stacks/ODPi/2.0/services/stack_advisor.py | 21 +- .../uploads/parsers/xml/XMLParser.java | 2 + .../uploads/parsers/xml/XMLParser.java | 2 + .../main/resources/ui/app/routes/queries/new.js | 5 +- .../src/main/resources/ui/app/styles/app.scss | 41 +- .../ui/app/styles/bootstrap-overrides.scss | 25 +- .../resources/ui/app/templates/application.hbs | 2 +- .../app/templates/components/alert-message.hbs | 6 +- .../components/top-application-bar.hbs | 2 +- .../ui/app/utils/hive-explainer/renderer.js | 40 +- .../src/main/resources/ui/pig-web/app/app.js | 19 +- .../apache/ambari/view/utils/hdfs/HdfsApi.java | 1 + .../ui/app/components/bundle-config.js | 1 + .../resources/ui/app/components/coord-config.js | 1 + .../ui/app/components/designer-workspace.js | 1 + .../ui/app/components/flow-designer.js | 17 +- .../ui/app/components/global-config.js | 5 + .../resources/ui/app/components/job-config.js | 32 +- .../ui/app/components/workflow-credentials.js | 2 +- .../ui/app/domain/cytoscape-flow-renderer.js | 20 +- .../resources/ui/app/domain/cytoscape-style.js | 10 +- .../src/main/resources/ui/app/index.html | 14 + .../src/main/resources/ui/app/routes/index.js | 5 +- .../ui/app/services/workflow-manager-configs.js | 27 + .../src/main/resources/ui/app/styles/app.less | 3 - .../app/templates/components/bundle-config.hbs | 2 +- .../app/templates/components/coord-config.hbs | 2 +- .../templates/components/credentials-config.hbs | 2 +- .../app/templates/components/flow-designer.hbs | 2 +- .../app/templates/components/global-config.hbs | 2 +- .../templates/components/transition-config.hbs | 34 +- .../components/workflow-credentials.hbs | 13 +- .../main/resources/ui/public/assets/custom.png | Bin 0 -> 350 bytes .../main/resources/ui/public/assets/distcp.png | Bin 0 -> 229 bytes .../main/resources/ui/public/assets/email.png | Bin 0 -> 340 bytes .../src/main/resources/ui/public/assets/fs.png | Bin 0 -> 254 bytes .../main/resources/ui/public/assets/hive.png | Bin 0 -> 270 bytes .../main/resources/ui/public/assets/hive2.png | Bin 0 -> 270 bytes .../main/resources/ui/public/assets/java.png | Bin 0 -> 385 bytes .../resources/ui/public/assets/map-reduce.png | Bin 0 -> 552 bytes .../src/main/resources/ui/public/assets/pig.png | Bin 0 -> 342 bytes .../main/resources/ui/public/assets/shell.png | Bin 0 -> 222 bytes .../main/resources/ui/public/assets/spark.png | Bin 0 -> 381 bytes .../main/resources/ui/public/assets/sqoop.png | Bin 0 -> 482 bytes .../src/main/resources/ui/public/assets/ssh.png | Bin 0 -> 222 bytes .../resources/ui/public/assets/sub-workflow.png | Bin 0 -> 433 bytes .../services/workflow-manager-configs-test.js | 28 + dev-support/test-patch.sh | 88 +- docs/pom.xml | 15 +- docs/src/site/apt/index.apt | 2 +- docs/src/site/apt/whats-new.apt | 24 +- docs/src/site/site.xml | 2 + 1353 files changed, 14682 insertions(+), 9155 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/3acd2e6d/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/GroupPrivilegeService.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/GroupPrivilegeService.java index 72f4d82,0000000..6b6a674 mode 100644,000000..100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/GroupPrivilegeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/GroupPrivilegeService.java @@@ -1,113 -1,0 +1,113 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ambari.server.api.services.groups; + +import java.util.HashMap; +import java.util.Map; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; + +import org.apache.ambari.server.api.resources.ResourceInstance; +import org.apache.ambari.server.api.services.BaseService; +import org.apache.ambari.server.api.services.Request; +import org.apache.ambari.server.controller.GroupPrivilegeResponse; +import org.apache.ambari.server.controller.PrivilegeResponse; +import org.apache.ambari.server.controller.spi.Resource; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; + +/** + * Service responsible for group privilege resource requests. + */ +@Path("/groups/{groupName}/privileges") +@Api(value = "Groups", description = "Endpoint for group specific operations") +public class GroupPrivilegeService extends BaseService { + + /** + * Handles: GET /groups/{groupName}/privileges + * Get all group privileges. + * @param headers + * @param ui + * @param groupName + * @return + */ + @GET + @Produces("text/plain") + @ApiOperation(value = "Get all privileges", nickname = "GroupPrivilegeService#getPrivileges", notes = "Returns all privileges for group.", response = GroupPrivilegeResponse.class, responseContainer = "List") + @ApiImplicitParams({ + @ApiImplicitParam(name = "fields", value = "Filter user privileges", defaultValue = "PrivilegeInfo/*", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "sortBy", value = "Sort user privileges (asc | desc)", defaultValue = "PrivilegeInfo/user_name.asc", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "page_size", value = "The number of resources to be returned for the paged response.", defaultValue = "10", dataType = "integer", paramType = "query"), + @ApiImplicitParam(name = "from", value = "The starting page resource (inclusive). Valid values are :offset | \"start\"", defaultValue = "0", dataType = "string", paramType = "query"), + @ApiImplicitParam(name = "to", value = "The ending page resource (inclusive). Valid values are :offset | \"end\"", dataType = "string", paramType = "query") + }) + + public Response getPrivileges(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "group name", required = true) @PathParam("groupName") String groupName) { + return handleRequest(headers, null, ui, Request.Type.GET, createPrivilegeResource(groupName, null)); + } + + + /** + * Handles: GET /groups/{groupName}/privileges{privilegeID} + * Get a specific privilege for a group. + * + * @param headers http headers + * @param ui uri info + * @param groupName group name + * @param privilegeId privilege id + * @return privilege instance representation + */ + @GET + @Path("{privilegeId}") + @Produces("text/plain") + @ApiOperation(value = "Get group privilege", nickname = "GroupPrivilegeService#getPrivilege", notes = "Returns group privilege details.", response = GroupPrivilegeResponse.class) + @ApiImplicitParams({ + @ApiImplicitParam(name = "fields", value = "Filter group privilege details", defaultValue = "PrivilegeInfo/*", dataType = "string", paramType = "query") + }) + @ApiResponses(value = { + @ApiResponse(code = 200, message = "Successful operation", response = PrivilegeResponse.class)} + ) + public Response getPrivilege(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam(value = "group name", required = true) @PathParam ("groupName") String groupName, + @ApiParam(value = "privilege id", required = true) @PathParam("privilegeId") String privilegeId) { + return handleRequest(headers, null, ui, Request.Type.GET, createPrivilegeResource(groupName, privilegeId)); + } + + + + protected ResourceInstance createPrivilegeResource(String groupName, String privilegeId) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); ++ final Map<Resource.Type, String> mapIds = new HashMap<>(); + mapIds.put(Resource.Type.Group, groupName); + mapIds.put(Resource.Type.GroupPrivilege, privilegeId); + return createResource(Resource.Type.GroupPrivilege, mapIds); + } +}