Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0f266ed6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0f266ed6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0f266ed6 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 0f266ed6a7b1df2c3d3b18aa49649e12d01b1a4b Parents: c4148d8 1c19200 Author: Jonathan Hurley <[email protected]> Authored: Tue May 23 18:49:01 2017 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Tue May 23 19:58:42 2017 -0400 ---------------------------------------------------------------------- LICENSE.txt | 17 + .../stackVersions/StackVersionsCreateCtrl.js | 1 - .../ui/admin-web/app/scripts/i18n.config.js | 2 +- .../ui/admin-web/app/scripts/services/Stack.js | 32 +- .../views/stackVersions/stackVersionPage.html | 4 +- .../StackVersionsCreateCtrl_test.js | 6 +- .../libraries/functions/conf_select.py | 13 +- .../org/apache/ambari/infra/InfraManager.java | 30 +- .../infra/common/InfraManagerConstants.java | 2 + .../conf/batch/InfraManagerBatchConfig.java | 55 + .../apache/ambari/infra/manager/JobManager.java | 274 + .../infra/model/ExecutionContextResponse.java | 40 + .../ambari/infra/model/JobDetailsResponse.java | 53 + .../model/JobExecutionDetailsResponse.java | 49 + .../infra/model/JobExecutionInfoResponse.java | 141 + .../ambari/infra/model/JobExecutionRequest.java | 46 + .../infra/model/JobExecutionRestartRequest.java | 52 + .../infra/model/JobExecutionStopRequest.java | 50 + .../infra/model/JobInstanceDetailsResponse.java | 54 + .../infra/model/JobInstanceStartRequest.java | 49 + .../ambari/infra/model/JobOperationParams.java | 31 + .../apache/ambari/infra/model/JobRequest.java | 37 + .../apache/ambari/infra/model/PageRequest.java | 49 + .../model/StepExecutionContextResponse.java | 58 + .../infra/model/StepExecutionInfoResponse.java | 115 + .../model/StepExecutionProgressResponse.java | 53 + .../infra/model/StepExecutionRequest.java | 49 + .../infra/model/wrapper/JobExecutionData.java | 118 + .../infra/model/wrapper/StepExecutionData.java | 133 + .../ambari/infra/rest/JobExceptionMapper.java | 110 + .../apache/ambari/infra/rest/JobResource.java | 151 +- .../ambari-logsearch-config-api/pom.xml | 14 +- .../config/api/InputConfigMonitor.java | 13 +- .../logsearch/config/api/LogSearchConfig.java | 3 +- .../config/api/LogSearchConfigFactory.java | 10 +- .../api/model/inputconfig/Conditions.java | 24 + .../config/api/model/inputconfig/Fields.java | 26 + .../api/model/inputconfig/FilterDescriptor.java | 39 + .../model/inputconfig/FilterGrokDescriptor.java | 28 + .../model/inputconfig/FilterJsonDescriptor.java | 23 + .../inputconfig/FilterKeyValueDescriptor.java | 28 + .../api/model/inputconfig/InputConfig.java | 28 + .../api/model/inputconfig/InputDescriptor.java | 54 + .../inputconfig/InputFileBaseDescriptor.java | 28 + .../model/inputconfig/InputFileDescriptor.java | 23 + .../inputconfig/InputS3FileDescriptor.java | 26 + .../model/inputconfig/MapDateDescriptor.java | 26 + .../inputconfig/MapFieldCopyDescriptor.java | 24 + .../model/inputconfig/MapFieldDescriptor.java | 24 + .../inputconfig/MapFieldNameDescriptor.java | 24 + .../inputconfig/MapFieldValueDescriptor.java | 26 + .../api/model/inputconfig/PostMapValues.java | 26 + .../config/api/LogSearchConfigClass1.java | 3 +- .../config/api/LogSearchConfigClass2.java | 3 +- .../config/api/LogSearchConfigFactoryTest.java | 16 +- .../ambari-logsearch-config-zookeeper/pom.xml | 6 + .../config/zookeeper/LogSearchConfigZK.java | 72 +- .../model/inputconfig/impl/ConditionsImpl.java | 37 + .../model/inputconfig/impl/FieldsImpl.java | 39 + .../model/inputconfig/impl/FilterAdapter.java | 42 + .../inputconfig/impl/FilterDescriptorImpl.java | 113 + .../impl/FilterGrokDescriptorImpl.java | 66 + .../impl/FilterJsonDescriptorImpl.java | 25 + .../impl/FilterKeyValueDescriptorImpl.java | 63 + .../model/inputconfig/impl/InputAdapter.java | 58 + .../model/inputconfig/impl/InputConfigGson.java | 46 + .../model/inputconfig/impl/InputConfigImpl.java | 54 + .../inputconfig/impl/InputDescriptorImpl.java | 204 + .../impl/InputFileBaseDescriptorImpl.java | 66 + .../impl/InputFileDescriptorImpl.java | 25 + .../impl/InputS3FileDescriptorImpl.java | 53 + .../inputconfig/impl/MapDateDescriptorImpl.java | 58 + .../impl/MapFieldCopyDescriptorImpl.java | 45 + .../impl/MapFieldNameDescriptorImpl.java | 45 + .../impl/MapFieldValueDescriptorImpl.java | 58 + .../inputconfig/impl/PostMapValuesAdapter.java | 99 + .../inputconfig/impl/PostMapValuesImpl.java | 40 + .../org/apache/ambari/logfeeder/LogFeeder.java | 2 +- .../ambari/logfeeder/common/ConfigBlock.java | 107 +- .../ambari/logfeeder/common/ConfigHandler.java | 126 +- .../ambari/logfeeder/common/ConfigItem.java | 97 + .../apache/ambari/logfeeder/filter/Filter.java | 53 +- .../ambari/logfeeder/filter/FilterGrok.java | 11 +- .../ambari/logfeeder/filter/FilterJSON.java | 3 - .../ambari/logfeeder/filter/FilterKeyValue.java | 12 +- .../logfeeder/input/AbstractInputFile.java | 16 +- .../apache/ambari/logfeeder/input/Input.java | 112 +- .../ambari/logfeeder/input/InputFile.java | 6 +- .../ambari/logfeeder/input/InputS3File.java | 5 +- .../ambari/logfeeder/input/InputSimulate.java | 23 +- .../logfeeder/loglevelfilter/FilterLogData.java | 2 +- .../apache/ambari/logfeeder/mapper/Mapper.java | 4 +- .../ambari/logfeeder/mapper/MapperDate.java | 15 +- .../logfeeder/mapper/MapperFieldCopy.java | 13 +- .../logfeeder/mapper/MapperFieldName.java | 14 +- .../logfeeder/mapper/MapperFieldValue.java | 14 +- .../apache/ambari/logfeeder/output/Output.java | 3 - .../logfeeder/output/OutputLineFilter.java | 2 +- .../ambari/logfeeder/output/OutputManager.java | 8 +- .../ambari/logfeeder/output/OutputS3File.java | 96 +- .../ambari/logfeeder/util/LogFeederUtil.java | 51 - .../ambari/logfeeder/filter/FilterGrokTest.java | 37 +- .../ambari/logfeeder/filter/FilterJSONTest.java | 14 +- .../logfeeder/filter/FilterKeyValueTest.java | 41 +- .../ambari/logfeeder/input/InputFileTest.java | 22 +- .../logconfig/LogConfigHandlerTest.java | 18 +- .../ambari/logfeeder/mapper/MapperDateTest.java | 44 +- .../logfeeder/mapper/MapperFieldCopyTest.java | 19 +- .../logfeeder/mapper/MapperFieldNameTest.java | 19 +- .../logfeeder/mapper/MapperFieldValueTest.java | 29 +- .../logfeeder/output/OutputLineFilterTest.java | 22 +- .../logfeeder/output/OutputManagerTest.java | 10 +- .../logfeeder/output/OutputS3FileTest.java | 17 +- .../logsearch/manager/ShipperConfigManager.java | 7 +- .../model/common/LSServerConditions.java | 41 + .../logsearch/model/common/LSServerFields.java | 43 + .../logsearch/model/common/LSServerFilter.java | 130 + .../model/common/LSServerFilterGrok.java | 73 + .../model/common/LSServerFilterJson.java | 31 + .../model/common/LSServerFilterKeyValue.java | 71 + .../logsearch/model/common/LSServerInput.java | 149 + .../model/common/LSServerInputConfig.java | 87 + .../model/common/LSServerInputFile.java | 31 + .../model/common/LSServerInputFileBase.java | 72 + .../model/common/LSServerInputS3File.java | 59 + .../logsearch/model/common/LSServerMapDate.java | 61 + .../model/common/LSServerMapField.java | 30 + .../model/common/LSServerMapFieldCopy.java | 49 + .../model/common/LSServerMapFieldName.java | 49 + .../model/common/LSServerMapFieldValue.java | 61 + .../model/common/LSServerPostMapValues.java | 63 + .../common/LSServerPostMapValuesSerializer.java | 39 + .../logsearch/rest/ShipperConfigResource.java | 6 +- .../test-config/logfeeder/logfeeder.properties | 1 + .../test-config/logsearch/logsearch.properties | 4 - .../timeline/HadoopTimelineMetricsSink.java | 2 +- .../timeline/HadoopTimelineMetricsSinkTest.java | 2 +- .../kafka/KafkaTimelineMetricsReporter.java | 4 +- .../storm/StormTimelineMetricsReporter.java | 6 +- .../sink/storm/StormTimelineMetricsSink.java | 2 +- .../sink/storm/StormTimelineMetricsSink.java | 2 +- ambari-server/checkstyle.xml | 1 + ambari-server/docs/api/generated/index.html | 17421 +++++++++++++ ambari-server/docs/api/generated/swagger.json | 2305 ++ ambari-server/pom.xml | 121 +- ambari-server/src/main/assemblies/server.xml | 2 +- .../server/actionmanager/ActionManager.java | 4 +- .../server/actionmanager/ActionScheduler.java | 25 +- .../ambari/server/actionmanager/Request.java | 18 +- .../server/actionmanager/RequestFactory.java | 4 +- .../ambari/server/actionmanager/Stage.java | 14 - .../server/actionmanager/StageFactory.java | 1 - .../server/actionmanager/StageFactoryImpl.java | 4 +- .../server/api/services/ActionService.java | 98 +- .../api/services/ActiveWidgetLayoutService.java | 76 - .../server/api/services/AmbariMetaInfo.java | 21 + .../ambari/server/api/services/BaseService.java | 41 + .../server/api/services/BlueprintService.java | 105 +- .../api/services/ClusterRequestSwagger.java | 30 + .../server/api/services/ClusterService.java | 305 +- .../api/services/GroupPrivilegeService.java | 77 - .../server/api/services/GroupService.java | 155 - .../ambari/server/api/services/HostService.java | 188 +- .../server/api/services/MemberService.java | 163 - .../server/api/services/RequestService.java | 105 +- .../server/api/services/RootServiceService.java | 363 +- .../server/api/services/ServiceService.java | 293 +- .../api/services/SettingRequestSwagger.java | 30 + .../server/api/services/SettingService.java | 126 +- .../server/api/services/StacksService.java | 730 +- .../api/services/UserAuthorizationService.java | 103 - .../api/services/UserPrivilegeService.java | 79 - .../ambari/server/api/services/UserService.java | 175 - .../api/services/ViewDataMigrationService.java | 122 - .../ViewExternalSubResourceService.java | 146 - .../api/services/ViewInstanceService.java | 282 - .../api/services/ViewPermissionService.java | 186 - .../api/services/ViewPrivilegeService.java | 55 - .../ambari/server/api/services/ViewService.java | 162 - .../api/services/ViewSubResourceService.java | 134 - .../server/api/services/ViewVersionService.java | 199 - .../services/groups/GroupPrivilegeService.java | 113 + .../api/services/groups/GroupService.java | 177 + .../api/services/groups/MemberService.java | 200 + .../users/ActiveWidgetLayoutService.java | 111 + .../users/UserAuthorizationService.java | 120 + .../services/users/UserPrivilegeService.java | 113 + .../server/api/services/users/UserService.java | 193 + .../views/ViewDataMigrationService.java | 113 + .../views/ViewExternalSubResourceService.java | 148 + .../api/services/views/ViewInstanceService.java | 313 + .../services/views/ViewPermissionService.java | 208 + .../services/views/ViewPrivilegeService.java | 268 + .../server/api/services/views/ViewService.java | 181 + .../services/views/ViewSubResourceService.java | 136 + .../api/services/views/ViewVersionService.java | 208 + .../request/eventcreator/HostEventCreator.java | 4 +- .../server/checks/RangerSSLConfigCheck.java | 1 - .../ambari/server/controller/ActionRequest.java | 19 + .../server/controller/ActionRequestSwagger.java | 31 + .../server/controller/ActionResponse.java | 20 +- .../controller/ActiveWidgetLayoutRequest.java | 66 + .../controller/ActiveWidgetLayoutResponse.java | 142 + .../AmbariCustomCommandExecutionHelper.java | 12 +- .../AmbariManagementControllerImpl.java | 16 +- .../ambari/server/controller/ApiModel.java | 28 + .../server/controller/BlueprintSwagger.java | 91 + .../controller/ClusterArtifactRequest.java | 46 + .../controller/ClusterArtifactResponse.java | 49 + .../server/controller/ClusterRequest.java | 111 +- .../server/controller/ClusterResponse.java | 106 +- .../ClusterServiceArtifactRequest.java | 46 + .../ClusterServiceArtifactResponse.java | 52 + .../controller/ComponentDependencyResponse.java | 64 + .../controller/ExtensionLinkResponse.java | 137 +- .../controller/GroupPrivilegeResponse.java | 61 + .../ambari/server/controller/GroupRequest.java | 5 +- .../ambari/server/controller/GroupResponse.java | 7 +- .../ambari/server/controller/HostRequest.java | 72 +- .../ambari/server/controller/HostResponse.java | 287 +- .../server/controller/KerberosHelperImpl.java | 51 +- .../ambari/server/controller/MemberRequest.java | 4 + .../server/controller/MemberResponse.java | 6 +- .../server/controller/PrivilegeResponse.java | 175 + .../server/controller/QuickLinksResponse.java | 56 + .../server/controller/RequestPostRequest.java | 96 + .../server/controller/RequestPostResponse.java | 43 + .../server/controller/RequestPutRequest.java | 33 + .../server/controller/RequestRequest.java | 6 + .../server/controller/RequestResponse.java | 100 + .../RootServiceComponentResponse.java | 56 +- .../RootServiceHostComponentResponse.java | 72 +- .../server/controller/RootServiceResponse.java | 24 +- .../controller/RootServiceResponseFactory.java | 29 +- .../server/controller/ServiceRequest.java | 8 + .../controller/ServiceRequestSwagger.java | 31 + .../server/controller/ServiceResponse.java | 18 + .../server/controller/SettingRequest.java | 69 + .../server/controller/SettingResponse.java | 90 + .../controller/StackArtifactResponse.java | 52 + .../StackConfigurationDependencyResponse.java | 17 + .../controller/StackConfigurationResponse.java | 26 +- .../ambari/server/controller/StackResponse.java | 12 + .../StackServiceArtifactResponse.java | 53 + .../StackServiceComponentResponse.java | 27 + .../server/controller/StackServiceResponse.java | 31 +- .../server/controller/StackVersionResponse.java | 59 +- .../ambari/server/controller/ThemeResponse.java | 56 + .../controller/UserAuthorizationResponse.java | 153 + .../controller/UserPrivilegeResponse.java | 61 + .../ambari/server/controller/UserRequest.java | 17 +- .../ambari/server/controller/UserResponse.java | 48 +- .../server/controller/ViewInstanceRequest.java | 209 + .../server/controller/ViewInstanceResponse.java | 198 + .../controller/ViewPermissionResponse.java | 122 + .../server/controller/ViewPrivilegeRequest.java | 79 + .../controller/ViewPrivilegeResponse.java | 55 + .../ambari/server/controller/ViewResponse.java | 82 + .../server/controller/ViewVersionResponse.java | 234 + .../ActiveWidgetLayoutResourceProvider.java | 59 +- .../internal/ArtifactResourceProvider.java | 33 +- .../internal/ClusterResourceProvider.java | 90 +- .../ClusterStackVersionResourceProvider.java | 3 +- .../GroupPrivilegeResourceProvider.java | 80 +- .../internal/HostResourceProvider.java | 190 +- .../HostStackVersionResourceProvider.java | 4 +- .../controller/internal/HostStatusHelper.java | 7 +- .../internal/ProvisionClusterRequest.java | 4 +- .../internal/RequestResourceFilter.java | 3 +- .../internal/RequestResourceProvider.java | 81 +- .../internal/RequestStageContainer.java | 11 +- .../RootServiceComponentResourceProvider.java | 63 +- ...ootServiceHostComponentResourceProvider.java | 72 +- .../internal/RootServiceResourceProvider.java | 20 +- .../internal/ScaleClusterRequest.java | 10 +- .../internal/SettingResourceProvider.java | 64 +- .../internal/StageResourceProvider.java | 8 - .../internal/UpgradeResourceProvider.java | 13 +- .../UserAuthorizationResourceProvider.java | 64 +- .../internal/UserPrivilegeResourceProvider.java | 82 +- .../ViewPermissionResourceProvider.java | 44 +- .../internal/ViewVersionResourceProvider.java | 61 +- .../controller/utilities/PropertyHelper.java | 2 +- .../server/hooks/users/UserHookService.java | 3 +- .../system/impl/AmbariMetricSinkImpl.java | 1 - .../apache/ambari/server/orm/DBAccessor.java | 24 + .../ambari/server/orm/DBAccessorImpl.java | 44 + .../orm/entities/PrincipalTypeEntity.java | 12 +- .../server/orm/entities/RequestEntity.java | 19 + .../ambari/server/orm/entities/StageEntity.java | 18 - .../server/orm/entities/StageEntity_.java | 4 - .../server/orm/helpers/dbms/DbmsHelper.java | 21 + .../orm/helpers/dbms/GenericDbmsHelper.java | 8 + .../server/orm/helpers/dbms/MySqlHelper.java | 12 + .../server/orm/helpers/dbms/OracleHelper.java | 12 + .../server/orm/helpers/dbms/PostgresHelper.java | 12 + .../server/security/authorization/User.java | 12 + .../ambari/server/stageplanner/RoleGraph.java | 2 +- .../server/state/ClusterHealthReport.java | 43 +- .../state/QuickLinksConfigurationInfo.java | 8 +- .../apache/ambari/server/state/StackInfo.java | 2 +- .../server/state/ValueAttributesInfo.java | 87 +- .../ambari/server/state/ValueEntryInfo.java | 8 +- .../ambari/server/state/host/HostImpl.java | 5 +- .../server/state/theme/ConfigCondition.java | 13 +- .../server/state/theme/ConfigPlacement.java | 25 +- .../ambari/server/state/theme/Layout.java | 5 + .../ambari/server/state/theme/Section.java | 22 +- .../ambari/server/state/theme/Subsection.java | 13 +- .../apache/ambari/server/state/theme/Tab.java | 12 +- .../ambari/server/state/theme/TabLayout.java | 8 +- .../apache/ambari/server/state/theme/Theme.java | 9 +- .../server/state/theme/ThemeConfiguration.java | 10 +- .../apache/ambari/server/state/theme/Unit.java | 7 +- .../ambari/server/state/theme/Widget.java | 12 +- .../ambari/server/state/theme/WidgetEntry.java | 9 +- .../ambari/server/topology/AmbariContext.java | 2 +- .../ambari/server/topology/Blueprint.java | 3 + .../ambari/server/topology/BlueprintImpl.java | 33 +- .../ambari/server/topology/HostRequest.java | 2 +- .../server/topology/RepositorySetting.java | 116 + .../apache/ambari/server/topology/Setting.java | 2 + .../ambari/server/topology/TopologyManager.java | 49 +- .../server/upgrade/UpgradeCatalog251.java | 30 + .../apache/ambari/server/utils/StageUtils.java | 8 +- .../apache/ambari/server/view/ViewRegistry.java | 4 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 2 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +- .../resources/Ambari-DDL-Postgres-CREATE.sql | 2 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +- .../hadoop-metrics2-accumulo.properties.j2 | 2 - .../hadoop-metrics2-hbase.properties.j2 | 2 - .../configuration/application-properties.xml | 10 +- .../templates/flume-metrics2.properties.j2 | 3 - ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 2 - ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 2 - .../hadoop-metrics2.properties.xml | 2 - .../hadoop-metrics2-hivemetastore.properties.j2 | 2 - .../hadoop-metrics2-hiveserver2.properties.j2 | 2 - .../templates/hadoop-metrics2-llapdaemon.j2 | 2 - .../hadoop-metrics2-llaptaskscheduler.j2 | 2 - .../hadoop-metrics2-hivemetastore.properties.j2 | 2 - .../hadoop-metrics2-hiveserver2.properties.j2 | 2 - .../templates/hadoop-metrics2-llapdaemon.j2 | 2 - .../hadoop-metrics2-llaptaskscheduler.j2 | 2 - .../0.10.0.3.0/configuration/kafka-broker.xml | 10 - .../KAFKA/0.8.1/configuration/kafka-broker.xml | 10 - .../common-services/OOZIE/4.2.0.3.0/alerts.json | 45 + .../OOZIE/4.2.0.3.0/configuration/oozie-env.xml | 255 + .../4.2.0.3.0/configuration/oozie-log4j.xml | 149 + .../4.2.0.3.0/configuration/oozie-site.xml | 254 + .../OOZIE/4.2.0.3.0/kerberos.json | 70 + .../OOZIE/4.2.0.3.0/metainfo.xml | 203 + .../package/alerts/alert_check_oozie_server.py | 244 + .../4.2.0.3.0/package/files/oozieSmoke2.sh | 84 + .../files/prepareOozieHdfsDirectories.sh | 42 + .../4.2.0.3.0/package/files/wrap_ooziedb.sh | 31 + .../scripts/check_oozie_server_status.py | 38 + .../OOZIE/4.2.0.3.0/package/scripts/oozie.py | 516 + .../4.2.0.3.0/package/scripts/oozie_client.py | 78 + .../4.2.0.3.0/package/scripts/oozie_server.py | 163 + .../package/scripts/oozie_server_upgrade.py | 237 + .../4.2.0.3.0/package/scripts/oozie_service.py | 188 + .../OOZIE/4.2.0.3.0/package/scripts/params.py | 39 + .../4.2.0.3.0/package/scripts/params_linux.py | 374 + .../4.2.0.3.0/package/scripts/params_windows.py | 34 + .../4.2.0.3.0/package/scripts/service_check.py | 140 + .../4.2.0.3.0/package/scripts/status_params.py | 65 + .../package/templates/adminusers.txt.j2 | 28 + .../templates/input.config-oozie.json.j2 | 48 + .../package/templates/oozie-log4j.properties.j2 | 93 + .../4.2.0.3.0/package/templates/oozie.conf.j2 | 35 + .../package/templates/zkmigrator_jaas.conf.j2 | 26 + .../OOZIE/4.2.0.3.0/quicklinks/quicklinks.json | 45 + .../OOZIE/4.2.0.3.0/role_command_order.json | 9 + .../OOZIE/4.2.0.3.0/service_advisor.py | 314 + .../OOZIE/4.2.0.3.0/themes/theme.json | 116 + .../STORM/0.9.1/configuration/storm-env.xml | 11 + .../0.9.1/package/templates/config.yaml.j2 | 3 - .../templates/storm-metrics2.properties.j2 | 2 - .../common-services/STORM/1.0.1.3.0/alerts.json | 145 + .../configuration/ranger-storm-audit.xml | 133 + .../ranger-storm-plugin-properties.xml | 121 + .../ranger-storm-policymgr-ssl.xml | 70 + .../configuration/ranger-storm-security.xml | 67 + .../storm-atlas-application.properties.xml | 31 + .../configuration/storm-cluster-log4j.xml | 133 + .../STORM/1.0.1.3.0/configuration/storm-env.xml | 165 + .../1.0.1.3.0/configuration/storm-site.xml | 1002 + .../configuration/storm-worker-log4j.xml | 189 + .../STORM/1.0.1.3.0/kerberos.json | 134 + .../STORM/1.0.1.3.0/metainfo.xml | 179 + .../STORM/1.0.1.3.0/metrics.json | 1202 + .../alerts/check_supervisor_process_win.py | 50 + .../STORM/1.0.1.3.0/package/files/wordCount.jar | Bin 0 -> 690588 bytes .../1.0.1.3.0/package/scripts/drpc_server.py | 91 + .../STORM/1.0.1.3.0/package/scripts/nimbus.py | 116 + .../1.0.1.3.0/package/scripts/nimbus_prod.py | 81 + .../1.0.1.3.0/package/scripts/pacemaker.py | 90 + .../STORM/1.0.1.3.0/package/scripts/params.py | 28 + .../1.0.1.3.0/package/scripts/params_linux.py | 424 + .../1.0.1.3.0/package/scripts/params_windows.py | 60 + .../STORM/1.0.1.3.0/package/scripts/rest_api.py | 85 + .../STORM/1.0.1.3.0/package/scripts/service.py | 95 + .../1.0.1.3.0/package/scripts/service_check.py | 79 + .../package/scripts/setup_ranger_storm.py | 133 + .../1.0.1.3.0/package/scripts/status_params.py | 83 + .../STORM/1.0.1.3.0/package/scripts/storm.py | 182 + .../1.0.1.3.0/package/scripts/storm_upgrade.py | 177 + .../package/scripts/storm_yaml_utils.py | 53 + .../1.0.1.3.0/package/scripts/supervisor.py | 117 + .../package/scripts/supervisor_prod.py | 84 + .../package/scripts/supervisord_service.py | 33 + .../1.0.1.3.0/package/scripts/ui_server.py | 137 + .../package/templates/client_jaas.conf.j2 | 33 + .../1.0.1.3.0/package/templates/config.yaml.j2 | 72 + .../templates/input.config-storm.json.j2 | 78 + .../templates/storm-metrics2.properties.j2 | 32 + .../1.0.1.3.0/package/templates/storm.conf.j2 | 35 + .../package/templates/storm_jaas.conf.j2 | 65 + .../package/templates/worker-launcher.cfg.j2 | 19 + .../STORM/1.0.1.3.0/quicklinks/quicklinks.json | 45 + .../STORM/1.0.1.3.0/role_command_order.json | 13 + .../STORM/1.0.1.3.0/service_advisor.py | 387 + .../STORM/1.0.1.3.0/widgets.json | 127 + .../STORM/1.1.0/configuration/storm-site.xml | 44 + .../common-services/STORM/1.1.0/kerberos.json | 138 + .../common-services/STORM/1.1.0/metainfo.xml | 44 + .../ZEPPELIN/0.6.0.3.0/alerts.json | 18 + .../0.6.0.3.0/configuration/zeppelin-config.xml | 189 + .../0.6.0.3.0/configuration/zeppelin-env.xml | 185 + .../configuration/zeppelin-log4j-properties.xml | 37 + .../configuration/zeppelin-shiro-ini.xml | 90 + .../ZEPPELIN/0.6.0.3.0/kerberos.json | 53 + .../ZEPPELIN/0.6.0.3.0/metainfo.xml | 111 + .../package/scripts/alert_check_zeppelin.py | 47 + .../package/scripts/livy2_config_template.py | 107 + .../0.6.0.3.0/package/scripts/master.py | 448 + .../0.6.0.3.0/package/scripts/params.py | 228 + .../0.6.0.3.0/package/scripts/service_check.py | 39 + .../package/scripts/spark2_config_template.py | 84 + .../0.6.0.3.0/package/scripts/status_params.py | 29 + .../templates/input.config-zeppelin.json.j2 | 48 + .../0.6.0.3.0/quicklinks/quicklinks.json | 35 + .../ZEPPELIN/0.6.0.3.0/role_command_order.json | 7 + .../src/main/resources/properties.json | 1 + .../templates/hadoop-metrics2.properties.j2 | 2 - .../services/YARN/configuration/yarn-site.xml | 8 +- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 8 - .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 - .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 - .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 6 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 - .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 - .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 10 +- .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 - .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 4 - .../hadoop-metrics2.properties.xml | 2 - .../HIVE/configuration/tez-interactive-site.xml | 12 + .../stacks/HDP/2.6/services/STORM/metainfo.xml | 4 + .../services/YARN/configuration/yarn-site.xml | 13 +- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 5 +- .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 6 +- .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 2 +- .../templates/hadoop-metrics2.properties.j2 | 2 - .../stacks/HDP/3.0/services/OOZIE/metainfo.xml | 27 + .../stacks/HDP/3.0/services/STORM/metainfo.xml | 27 + .../HDP/3.0/services/ZEPPELIN/metainfo.xml | 27 + .../ExecutionCommandWrapperTest.java | 4 +- .../ambari/server/actionmanager/StageTest.java | 2 +- .../actionmanager/TestActionDBAccessorImpl.java | 34 +- .../server/actionmanager/TestActionManager.java | 8 +- .../actionmanager/TestActionScheduler.java | 43 +- .../ambari/server/actionmanager/TestStage.java | 5 +- .../server/agent/HeartbeatProcessorTest.java | 4 +- .../server/agent/HeartbeatTestHelper.java | 4 +- .../server/agent/TestHeartbeatHandler.java | 4 +- .../services/ActiveWidgetLayoutServiceTest.java | 75 - .../server/api/services/ClusterServiceTest.java | 30 +- .../api/services/GroupPrivilegeServiceTest.java | 111 - .../server/api/services/GroupServiceTest.java | 1 + .../server/api/services/HostServiceTest.java | 2 +- .../server/api/services/MemberServiceTest.java | 110 - .../api/services/RootServiceServiceTest.java | 11 +- .../server/api/services/SettingServiceTest.java | 2 +- .../services/UserAuthorizationServiceTest.java | 100 - .../api/services/UserPrivilegeServiceTest.java | 124 - .../services/ViewDataMigrationServiceTest.java | 81 - .../ViewExternalSubResourceServiceTest.java | 50 - .../api/services/ViewPermissionServiceTest.java | 101 - .../services/ViewSubResourceServiceTest.java | 1 + .../views/ViewDataMigrationServiceTest.java | 81 + .../ViewExternalSubResourceServiceTest.java | 50 + .../request/creator/HostEventCreatorTest.java | 4 +- .../AmbariManagementControllerTest.java | 157 +- .../server/controller/ClusterRequestTest.java | 16 - .../server/controller/ClusterResponseTest.java | 11 +- .../server/controller/KerberosHelperTest.java | 93 +- .../RootServiceResponseFactoryTest.java | 9 +- .../internal/AbstractResourceProviderTest.java | 5 +- .../internal/CalculatedStatusTest.java | 2 +- .../internal/ClusterResourceProviderTest.java | 20 +- ...ClusterStackVersionResourceProviderTest.java | 10 +- .../GroupPrivilegeResourceProviderTest.java | 13 +- .../internal/HostResourceProviderTest.java | 74 +- .../internal/ProvisionClusterRequestTest.java | 6 +- .../internal/RequestStageContainerTest.java | 2 +- ...ootServiceComponentResourceProviderTest.java | 21 +- ...erviceHostComponentResourceProviderTest.java | 11 +- .../internal/ScaleClusterRequestTest.java | 14 +- .../UserPrivilegeResourceProviderTest.java | 13 +- .../LogSearchDataRetrievalServiceTest.java | 1 - .../credentialapi/CredentialUtilTest.java | 1 - .../server/hooks/users/UserHookServiceTest.java | 4 +- .../AmbariPamAuthenticationProviderTest.java | 1 - .../serveraction/ServerActionExecutorTest.java | 9 +- .../server/stageplanner/TestStagePlanner.java | 2 +- .../server/state/cluster/ClusterTest.java | 6 +- .../ClusterDeployWithStartOnlyTest.java | 5 +- ...InstallWithoutStartOnComponentLevelTest.java | 5 +- .../ClusterInstallWithoutStartTest.java | 7 +- .../ambari/server/topology/SettingTest.java | 18 + .../server/topology/TopologyManagerTest.java | 9 +- .../server/upgrade/UpgradeCatalog251Test.java | 5 + .../ambari/server/utils/StageUtilsTest.java | 2 +- ambari-web/api-docs/css/api-explorer.css | 2423 ++ ambari-web/api-docs/css/index.css | 17430 +++++++++++++ ambari-web/api-docs/css/print.css | 1167 + ambari-web/api-docs/css/reset.css | 125 + ambari-web/api-docs/css/screen.css | 9 + ambari-web/api-docs/css/standalone.css | 293 + ambari-web/api-docs/css/typography.css | 26 + .../api-docs/fonts/droid-sans-v6-latin-700.eot | Bin 0 -> 22922 bytes .../api-docs/fonts/droid-sans-v6-latin-700.svg | 411 + .../api-docs/fonts/droid-sans-v6-latin-700.ttf | Bin 0 -> 40513 bytes .../api-docs/fonts/droid-sans-v6-latin-700.woff | Bin 0 -> 25992 bytes .../fonts/droid-sans-v6-latin-700.woff2 | Bin 0 -> 11480 bytes .../fonts/droid-sans-v6-latin-regular.eot | Bin 0 -> 22008 bytes .../fonts/droid-sans-v6-latin-regular.svg | 403 + .../fonts/droid-sans-v6-latin-regular.ttf | Bin 0 -> 39069 bytes .../fonts/droid-sans-v6-latin-regular.woff | Bin 0 -> 24868 bytes .../fonts/droid-sans-v6-latin-regular.woff2 | Bin 0 -> 11304 bytes ambari-web/api-docs/images/Swagger_explorer.png | Bin 0 -> 108087 bytes .../api-docs/images/Swagger_explorer_min.png | Bin 0 -> 46646 bytes ambari-web/api-docs/images/explorer_icons.png | Bin 0 -> 5763 bytes ambari-web/api-docs/images/favicon-16x16.png | Bin 0 -> 645 bytes ambari-web/api-docs/images/favicon-32x32.png | Bin 0 -> 1654 bytes ambari-web/api-docs/images/favicon.ico | Bin 0 -> 5430 bytes .../api-docs/images/json_editor_integration.png | Bin 0 -> 63019 bytes ambari-web/api-docs/images/logo_small.png | Bin 0 -> 770 bytes ambari-web/api-docs/images/pet_store_api.png | Bin 0 -> 824 bytes ambari-web/api-docs/images/senodio.png | Bin 0 -> 22838 bytes ambari-web/api-docs/images/throbber.gif | Bin 0 -> 9257 bytes ambari-web/api-docs/images/wordnik_api.png | Bin 0 -> 980 bytes ambari-web/api-docs/index.html | 241 + ambari-web/api-docs/lib/backbone-min.js | 15 + ambari-web/api-docs/lib/bootstrap.min.js | 6 + ambari-web/api-docs/lib/handlebars-2.0.0.js | 28 + ambari-web/api-docs/lib/highlight.7.3.pack.js | 1 + ambari-web/api-docs/lib/jquery-1.8.0.min.js | 2 + ambari-web/api-docs/lib/jquery.ba-bbq.min.js | 18 + ambari-web/api-docs/lib/jquery.slideto.min.js | 1 + ambari-web/api-docs/lib/jquery.wiggle.min.js | 8 + ambari-web/api-docs/lib/jsoneditor.js | 7287 ++++++ ambari-web/api-docs/lib/marked.js | 1272 + ambari-web/api-docs/lib/swagger-oauth.js | 286 + ambari-web/api-docs/lib/underscore-min.js | 6 + ambari-web/api-docs/lib/underscore-min.map | 1 + ambari-web/api-docs/o2c.html | 20 + ambari-web/api-docs/swagger-ui.js | 22644 +++++++++++++++++ ambari-web/api-docs/swagger-ui.min.js | 12 + .../main/admin/stack_and_upgrade_controller.js | 7 +- ambari-web/app/messages.js | 6 +- ambari-web/app/styles/application.less | 11 +- .../wizard/step3/step3_host_warnings_popup.hbs | 4 +- ambari-web/app/templates/wizard/step4.hbs | 16 +- ambari-web/app/utils/ajax/ajax.js | 2 +- ambari-web/app/views/wizard/step4_view.js | 7 +- ambari-web/brunch-config.js | 3 +- ambari-web/pom.xml | 1 + .../admin/stack_and_upgrade_controller_test.js | 6 - .../view/filebrowser/DownloadService.java | 4 +- .../src/main/resources/ui/hive-web/Brocfile.js | 1 + .../ui/hive-web/vendor/browser-pollyfills.js | 213 + .../ambari/storm/StormDetailsServlet.java | 81 + .../storm/src/main/resources/WEB-INF/web.xml | 8 + .../resources/scripts/components/SearchLogs.jsx | 38 +- .../ui/app/components/search-create-new-bar.js | 12 +- .../components/search-create-new-bar.hbs | 4 + .../config-utils/diff_stack_properties.py | 154 + utility/checkstyle.xml | 38 + utility/pom.xml | 5 +- .../apache/ambari/annotations/ApiIgnore.java | 29 + .../UndocumentedRestApiOperationCheck.java | 76 + ...dTransactionalOnPrivateMethodsCheckTest.java | 4 +- .../UndocumentedRestApiOperationCheckTest.java | 53 + .../checkstyle/InputRestApiOperation.java | 138 + 599 files changed, 102767 insertions(+), 5685 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java index 562024b,5295536..f17c739 --- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java @@@ -197,11 -193,8 +193,10 @@@ public class Stage stageEntity.setRequestContext(requestContext); stageEntity.setHostRoleCommands(new ArrayList<HostRoleCommandEntity>()); stageEntity.setRoleSuccessCriterias(new ArrayList<RoleSuccessCriteriaEntity>()); - stageEntity.setClusterHostInfo(clusterHostInfo); stageEntity.setCommandParamsStage(commandParamsStage); - stageEntity.setHostParamsStage(hostParamsStage); + if (null != hostParamsStage) { + stageEntity.setHostParamsStage(hostParamsStage); + } stageEntity.setCommandExecutionType(commandExecutionType); stageEntity.setStatus(status); stageEntity.setDisplayStatus(displayStatus); http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java index 31a34fe,520dcab..0b507fb --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java @@@ -76,7 -73,10 +76,8 @@@ import org.apache.ambari.server.control import org.apache.ambari.server.controller.internal.RequestResourceFilter; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.metadata.ActionMetadata; -import org.apache.ambari.server.orm.dao.ClusterVersionDAO; import org.apache.ambari.server.orm.dao.HostRoleCommandDAO; + import org.apache.ambari.server.orm.dao.RequestDAO; -import org.apache.ambari.server.orm.entities.ClusterVersionEntity; import org.apache.ambari.server.orm.entities.OperatingSystemEntity; import org.apache.ambari.server.orm.entities.RepositoryEntity; import org.apache.ambari.server.orm.entities.RepositoryVersionEntity; @@@ -174,6 -175,12 +176,9 @@@ public class AmbariCustomCommandExecuti private OsFamily os_family; @Inject - private ClusterVersionDAO clusterVersionDAO; - - @Inject + private RequestDAO requestDAO; + + @Inject private HostRoleCommandDAO hostRoleCommandDAO; private Map<String, Map<String, Map<String, String>>> configCredentialsForService = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java index 3a5a4e6,9bc7f4a..dcd8048 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java @@@ -3049,16 -3066,10 +3050,13 @@@ public class AmbariManagementController RoleCommand roleCommand) throws AmbariException { Map<String, Set<String>> clusterHostInfo = StageUtils.getClusterHostInfo(cluster); String clusterHostInfoJson = StageUtils.getGson().toJson(clusterHostInfo); - Map<String, String> hostParamsCmd = customCommandExecutionHelper.createDefaultHostParams(cluster); - Stage stage = createNewStage(0, cluster,1, "","{}", ""); + Map<String, String> hostParamsCmd = customCommandExecutionHelper.createDefaultHostParams( + cluster, scHost.getServiceComponent().getDesiredRepositoryVersion()); + - Stage stage = createNewStage(0, cluster, - 1, "", - clusterHostInfoJson, "{}", ""); - ++ Stage stage = createNewStage(0, cluster, 1, "", clusterHostInfoJson, "{}", ""); + Map<String, Map<String, String>> configTags = configHelper.getEffectiveDesiredTags(cluster, scHost.getHostName()); Map<String, Map<String, String>> configurations = configHelper.getEffectiveConfigProperties(cluster, configTags); http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java index 7a5abbb,5ac6251..5d7d9bc --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java @@@ -17,8 -17,9 +17,10 @@@ */ package org.apache.ambari.server.controller; +import org.apache.ambari.server.orm.entities.RepositoryVersionEntity; + import io.swagger.annotations.ApiModelProperty; + public class ServiceRequest { private String clusterName; // REF http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java index a16b688,44bdfc7..00c6c2b --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java @@@ -18,9 -18,9 +18,11 @@@ package org.apache.ambari.server.controller; +import org.apache.ambari.server.state.RepositoryVersionState; +import org.apache.ambari.server.state.StackId; + import io.swagger.annotations.ApiModelProperty; + public class ServiceResponse { private Long clusterId; @@@ -108,19 -108,11 +114,21 @@@ } /** - * @return the desiredStackVersion + * @return the desired stack ID. */ + @ApiModelProperty(hidden = true) - public String getDesiredStackVersion() { - return desiredStackVersion; + public String getDesiredStackId() { + return desiredStackId.getStackId(); ++ + } + + /** + * Gets the desired repository version. + * + * @return the desired repository version. + */ + public String getDesiredRepositoryVersion() { + return desiredRepositoryVersion; } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java index de2386a,0ebf3aa..4e6fa61 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java @@@ -897,11 -1368,10 +897,10 @@@ public class UpgradeResourceProvider ex actionContext.setAutoSkipFailures(context.isComponentFailureAutoSkipped()); ExecuteCommandJson jsons = s_commandExecutionHelper.get().getCommandJson(actionContext, - cluster, context.getEffectiveStackId()); + cluster, effectiveRepositoryVersion); Stage stage = s_stageFactory.get().createNew(request.getId().longValue(), "/tmp/ambari", - cluster.getClusterName(), cluster.getClusterId(), entity.getText(), - jsons.getClusterHostInfo(), jsons.getCommandParamsForStage(), + cluster.getClusterName(), cluster.getClusterId(), entity.getText(), jsons.getCommandParamsForStage(), jsons.getHostParamsForStage()); stage.setSkippable(skippable); @@@ -980,11 -1450,10 +979,10 @@@ actionContext.setMaintenanceModeHostExcluded(true); ExecuteCommandJson jsons = s_commandExecutionHelper.get().getCommandJson(actionContext, - cluster, context.getEffectiveStackId()); + cluster, effectiveRepositoryVersion); Stage stage = s_stageFactory.get().createNew(request.getId().longValue(), "/tmp/ambari", - cluster.getClusterName(), cluster.getClusterId(), entity.getText(), - jsons.getClusterHostInfo(), jsons.getCommandParamsForStage(), + cluster.getClusterName(), cluster.getClusterId(), entity.getText(), jsons.getCommandParamsForStage(), jsons.getHostParamsForStage()); stage.setSkippable(skippable); @@@ -1042,11 -1511,10 +1040,10 @@@ actionContext.setMaintenanceModeHostExcluded(true); ExecuteCommandJson jsons = s_commandExecutionHelper.get().getCommandJson(actionContext, - cluster, context.getEffectiveStackId()); + cluster, effectiveRepositoryVersion); Stage stage = s_stageFactory.get().createNew(request.getId().longValue(), "/tmp/ambari", - cluster.getClusterName(), cluster.getClusterId(), entity.getText(), - jsons.getClusterHostInfo(), jsons.getCommandParamsForStage(), + cluster.getClusterName(), cluster.getClusterId(), entity.getText(), jsons.getCommandParamsForStage(), jsons.getHostParamsForStage()); stage.setSkippable(skippable); @@@ -1173,14 -1642,14 +1170,14 @@@ actionContext.setMaintenanceModeHostExcluded(true); ExecuteCommandJson jsons = s_commandExecutionHelper.get().getCommandJson(actionContext, - cluster, context.getEffectiveStackId()); + cluster, context.getRepositoryVersion()); Stage stage = s_stageFactory.get().createNew(request.getId().longValue(), "/tmp/ambari", - cluster.getClusterName(), cluster.getClusterId(), stageText, jsons.getClusterHostInfo(), - jsons.getCommandParamsForStage(), jsons.getHostParamsForStage()); + cluster.getClusterName(), cluster.getClusterId(), stageText, jsons.getCommandParamsForStage(), + jsons.getHostParamsForStage()); - stage.setSkippable(skippable); - stage.setAutoSkipFailureSupported(supportsAutoSkipOnFailure); + stage.setSkippable(group.skippable); + stage.setAutoSkipFailureSupported(group.supportsAutoSkipOnFailure); long stageId = request.getLastStageId() + 1; if (0L == stageId) { http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/main/resources/properties.json ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java ---------------------------------------------------------------------- diff --cc ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java index 5fa3e41,ceda927..b960b29 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java @@@ -885,8 -982,12 +885,8 @@@ public class HeartbeatProcessorTest serviceComponentHost1.setState(State.UPGRADING); serviceComponentHost2.setState(State.INSTALLING); - serviceComponentHost1.setStackVersion(stack120); - serviceComponentHost1.setDesiredStackVersion(stack130); - serviceComponentHost2.setStackVersion(stack120); - Stage s = stageFactory.createNew(requestId, "/a/b", "cluster1", 1L, "action manager test", - "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); s.setStageId(stageId); s.addHostRoleExecutionCommand(DummyHostname1, Role.DATANODE, RoleCommand.UPGRADE, new ServiceComponentHostUpgradeEvent(Role.DATANODE.toString(), http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatTestHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ---------------------------------------------------------------------- diff --cc ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java index a12e834,83ba0bb..eb82ba3 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java @@@ -676,45 -630,34 +676,29 @@@ public class AmbariManagementController Assert.assertNotNull(clusters.getCluster(cluster1)); } -- @Test - public void testCreateClusterWithInvalidRequest() { - public void testCreateClusterWithDesiredClusterConfigs() { - // TODO implement after configs integration - } - + @Test(expected = IllegalArgumentException.class) + public void testCreateClusterWithInvalidRequest1() throws Exception { ClusterRequest r = new ClusterRequest(null, null, null, null); - r.toString(); - - try { - controller.createCluster(r); - fail("Expected create cluster for invalid request"); - } catch (Exception e) { - // Expected - } - - r.setClusterId(1L); - try { - controller.createCluster(r); - fail("Expected create cluster for invalid request"); - } catch (Exception e) { - // Expected - } - r.setClusterId(null); + controller.createCluster(r); + } - r.setClusterName(getUniqueName()); - try { - controller.createCluster(r); - fail("Expected create cluster for invalid request - no stack version"); - } catch (Exception e) { - // Expected - } + @Test(expected = IllegalArgumentException.class) + public void testCreateClusterWithInvalidRequest2() throws Exception { + ClusterRequest r = new ClusterRequest(1L, null, null, null); + controller.createCluster(r); + } - r.setStackVersion("HDP-1.2.0"); - r.setProvisioningState(State.INSTALLING.name()); - try { - controller.createCluster(r); - controller.updateClusters(Collections.singleton(r), null); + @Test(expected = IllegalArgumentException.class) + public void testCreateClusterWithInvalidRequest3() throws Exception { + ClusterRequest r = new ClusterRequest(null, getUniqueName(), null, null); + controller.createCluster(r); + } - fail("Expected create cluster for invalid request - invalid provisioning state"); - } catch (Exception e) { - // Expected - } + @Test(expected = IllegalArgumentException.class) + public void testCreateClusterWithInvalidRequest4() throws Exception { + ClusterRequest r = new ClusterRequest(null, null, State.INSTALLING.name(), null, "HDP-1.2.0", null); + controller.createCluster(r); + controller.updateClusters(Collections.singleton(r), null); } @Test @@@ -1942,16 -1905,15 +1926,16 @@@ } catch (Exception e) { // Expected } -- ++ clusters.addCluster(cluster1, new StackId("HDP-0.1")); -- ++ try { set1.clear(); HostRequest rInvalid1 = - new HostRequest(host1, cluster1, null); + new HostRequest(host1, cluster1); + rInvalid1.setRackInfo(UUID.randomUUID().toString()); HostRequest rInvalid2 = - new HostRequest(host1, cluster1, null); + new HostRequest(host1, cluster1); set1.add(rInvalid1); set1.add(rInvalid2); HostResourceProviderTest.createHosts(controller, set1); @@@ -1959,7 -1921,7 +1943,6 @@@ } catch (Exception e) { // Expected } -- } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java ---------------------------------------------------------------------- diff --cc ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java index 4138e3e,78752dc..a4cc6fc --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java @@@ -1318,14 -1306,10 +1300,14 @@@ public class HostResourceProviderTest e for (HostRequest request : requests) { Map<String, Object> requestProperties = new HashMap<>(); - requestProperties.put(HostResourceProvider.HOST_NAME_PROPERTY_ID, request.getHostname()); + requestProperties.put(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID, request.getHostname()); requestProperties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, request.getClusterName()); + if (null != request.getRackInfo()) { + requestProperties.put(HostResourceProvider.HOST_RACK_INFO_PROPERTY_ID, UUID.randomUUID().toString()); + } properties.add(requestProperties); } + provider.createHosts(PropertyHelper.getCreateRequest(properties, Collections.<String, String>emptyMap())); } http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java ---------------------------------------------------------------------- diff --cc ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java index 3a67b6c,3e592b2..0b251ef --- a/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java @@@ -136,19 -122,11 +136,19 @@@ public class TestStagePlanner public void testRestartStagePlan() { ClusterImpl cluster = mock(ClusterImpl.class); when(cluster.getCurrentStackVersion()).thenReturn(new StackId("HDP-2.0.6")); + + Service hiveService = mock(Service.class); + when(hiveService.getDesiredStackId()).thenReturn(new StackId("HDP-2.0.6")); + + when(cluster.getServices()).thenReturn(ImmutableMap.<String, Service>builder() + .put("HIVE", hiveService) + .build()); + RoleCommandOrder rco = roleCommandOrderProvider.getRoleCommandOrder(cluster); RoleGraph rg = roleGraphFactory.createNew(rco); - long now = System.currentTimeMillis(); + Stage stage = stageFactory.createNew(1, "/tmp", "cluster1", 1L, "execution command wrapper test", - "clusterHostInfo", "commandParamsStage", "hostParamsStage"); + "commandParamsStage", "hostParamsStage"); stage.setStageId(1); stage.addServerActionCommand("RESTART", null, Role.HIVE_METASTORE, RoleCommand.CUSTOM_COMMAND, "cluster1", http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-server/src/test/java/org/apache/ambari/server/utils/StageUtilsTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js ---------------------------------------------------------------------- diff --cc ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js index a676f7429,0f2efb0..d6829d9 --- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js +++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js @@@ -734,9 -733,9 +733,8 @@@ App.MainAdminStackAndUpgradeController name: 'admin.downgrade.start', sender: this, data: { - from: App.RepositoryVersion.find().findProperty('displayName', this.get('upgradeVersion')).get('repositoryVersion'), value: currentVersion.repository_version, label: currentVersion.repository_name, - id: currentVersion.id, isDowngrade: true, upgradeType: this.get('upgradeType') }, http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-web/app/messages.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f266ed6/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js ---------------------------------------------------------------------- diff --cc ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js index 4585991,e696bb1..81be6af --- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js +++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js @@@ -1143,7 -1138,7 +1138,6 @@@ describe('App.MainAdminStackAndUpgradeC it('request-data is valid', function () { expect(this.callArgs.data).to.eql({ - id: '1', - from: '2.3', value: '2.2', label: 'HDP-2.2', isDowngrade: true,
