Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fefcdf5d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fefcdf5d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fefcdf5d Branch: refs/heads/branch-dev-patch-upgrade Commit: fefcdf5db65d07c2f755e40d89823ad799fc6c30 Parents: ab031a3 7546f20 Author: Nate Cole <nc...@hortonworks.com> Authored: Wed Nov 4 08:36:05 2015 -0500 Committer: Nate Cole <nc...@hortonworks.com> Committed: Wed Nov 4 08:36:05 2015 -0500 ---------------------------------------------------------------------- .../main/resources/ui/admin-web/app/index.html | 4 +- .../admin-web/app/scripts/services/Cluster.js | 4 +- ambari-agent/conf/unix/ambari-agent | 3 + .../main/python/ambari_agent/AmbariConfig.py | 4 +- .../test/python/ambari_agent/TestActionQueue.py | 3 - .../python/ambari_agent/TestAmbariConfig.py | 47 + .../src/main/python/ambari_commons/constants.py | 9 +- .../GenerateStackDefinition.py | 10 +- .../pluggable_stack_definition/configs/PHD.json | 6 - .../core/providers/service.py | 4 +- .../libraries/functions/conf_select.py | 2 +- .../libraries/functions/copy_tarball.py | 2 +- .../libraries/functions/get_user_call_output.py | 20 +- .../libraries/functions/hdp_select.py | 6 +- .../libraries/functions/hive_check.py | 2 +- .../libraries/functions/ranger_functions.py | 14 +- .../libraries/functions/ranger_functions_v2.py | 10 +- .../libraries/providers/hdfs_resource.py | 10 +- .../libraries/script/script.py | 5 +- .../conf/unix/ambari-metrics-collector | 24 +- .../timeline/HBaseTimelineMetricStore.java | 13 +- .../metrics/timeline/PhoenixHBaseAccessor.java | 55 +- .../timeline/TimelineMetricConfiguration.java | 14 +- .../TimelineMetricAggregatorFactory.java | 79 +- .../TimelineMetricClusterAggregatorMinute.java | 248 -- .../TimelineMetricClusterAggregatorSecond.java | 248 ++ .../timeline/query/PhoenixTransactSQL.java | 29 +- .../metrics/timeline/ITClusterAggregator.java | 92 +- .../timeline/ITPhoenixHBaseAccessor.java | 7 +- .../timeline/PhoenixHBaseAccessorTest.java | 58 +- .../timeline/TestPhoenixTransactSQL.java | 24 + ambari-server/docs/api/v1/alerts.md | 4 +- ambari-server/sbin/ambari-server | 10 +- .../apache/ambari/annotations/Experimental.java | 7 + .../ambari/annotations/ExperimentalFeature.java | 39 + .../actionmanager/ActionDBAccessorImpl.java | 5 +- .../server/actionmanager/ActionScheduler.java | 92 +- .../ambari/server/actionmanager/Stage.java | 2 +- .../ambari/server/agent/rest/AgentResource.java | 7 + .../server/api/handlers/CreateHandler.java | 2 +- .../ambari/server/api/services/BaseService.java | 2 + .../api/services/PersistKeyValueService.java | 8 +- .../StackAdvisorBlueprintProcessor.java | 171 ++ .../ambari/server/checks/CheckDescription.java | 6 + .../server/checks/StormRestAPIDeletedCheck.java | 108 + .../ambari/server/checks/UpgradeCheckGroup.java | 13 +- .../server/configuration/Configuration.java | 246 +- .../controller/AmbariActionExecutionHelper.java | 4 + .../AmbariManagementControllerImpl.java | 132 +- .../ambari/server/controller/AmbariServer.java | 123 +- .../controller/ConfigurationResponse.java | 13 +- .../server/controller/ControllerModule.java | 7 +- .../server/controller/KerberosHelper.java | 39 +- .../server/controller/KerberosHelperImpl.java | 106 +- .../internal/AbstractResourceProvider.java | 34 +- .../controller/internal/BaseClusterRequest.java | 21 +- .../BlueprintConfigurationProcessor.java | 102 + .../internal/BlueprintResourceProvider.java | 103 +- .../controller/internal/CalculatedStatus.java | 1 + .../internal/ClusterResourceProvider.java | 75 +- .../ClusterStackVersionResourceProvider.java | 131 +- .../internal/CompatibleRepositoryVersion.java | 62 + ...atibleRepositoryVersionResourceProvider.java | 143 +- .../internal/ExportBlueprintRequest.java | 2 +- .../KerberosDescriptorResourceProvider.java | 6 + .../internal/ProvisionClusterRequest.java | 96 +- .../internal/UpgradeResourceProvider.java | 55 +- .../timeline/cache/TimelineMetricCache.java | 2 +- .../cache/TimelineMetricCacheEntryFactory.java | 88 +- .../cache/TimelineMetricCacheProvider.java | 8 +- .../cache/TimelineMetricsCacheSizeOfEngine.java | 17 +- .../cache/TimelineMetricsCacheValue.java | 16 +- .../listeners/alerts/AlertReceivedListener.java | 26 +- .../server/notifications/Notification.java | 14 + .../dispatchers/EmailDispatcher.java | 25 +- .../apache/ambari/server/orm/dao/AlertsDAO.java | 518 +++- .../server/orm/dao/ClusterVersionDAO.java | 39 +- .../orm/dao/HostComponentDesiredStateDAO.java | 19 +- .../server/orm/dao/HostComponentStateDAO.java | 31 + .../server/orm/dao/HostRoleCommandDAO.java | 72 +- .../ambari/server/orm/dao/HostVersionDAO.java | 33 + .../server/orm/entities/AlertCurrentEntity.java | 21 + .../server/orm/entities/BlueprintEntity.java | 34 +- .../AbstractPrepareKerberosServerAction.java | 13 + .../kerberos/KerberosServerAction.java | 5 + .../PrepareDisableKerberosServerAction.java | 2 +- .../PrepareKerberosIdentitiesServerAction.java | 12 +- .../upgrades/ComponentVersionCheckAction.java | 123 + .../upgrades/FinalizeUpgradeAction.java | 71 +- .../upgrades/UpdateDesiredStackAction.java | 49 +- .../org/apache/ambari/server/state/Cluster.java | 5 + .../apache/ambari/server/state/Clusters.java | 18 +- .../ambari/server/state/PropertyInfo.java | 4 +- .../apache/ambari/server/state/StackInfo.java | 24 + .../ambari/server/state/UpgradeContext.java | 2 +- .../ambari/server/state/UpgradeHelper.java | 34 +- .../server/state/cluster/ClusterImpl.java | 126 +- .../server/state/cluster/ClustersImpl.java | 45 +- .../state/services/CachedAlertFlushService.java | 97 + .../state/stack/upgrade/ClusterGrouping.java | 35 +- .../server/topology/AdvisedConfiguration.java | 41 + .../ambari/server/topology/AmbariContext.java | 26 +- .../ambari/server/topology/Blueprint.java | 2 + .../server/topology/BlueprintFactory.java | 6 +- .../ambari/server/topology/BlueprintImpl.java | 33 +- .../server/topology/BlueprintValidatorImpl.java | 27 + .../topology/ClusterConfigurationRequest.java | 11 +- .../ambari/server/topology/ClusterTopology.java | 6 + .../server/topology/ClusterTopologyImpl.java | 17 + .../topology/ConfigRecommendationStrategy.java | 37 + .../ambari/server/topology/Credential.java | 71 + .../server/topology/SecurityConfiguration.java | 67 + .../topology/SecurityConfigurationFactory.java | 175 ++ .../ambari/server/topology/TopologyManager.java | 243 +- .../server/topology/TopologyRequestFactory.java | 3 +- .../topology/TopologyRequestFactoryImpl.java | 5 +- .../ambari/server/update/HostUpdateHelper.java | 539 ++++ .../server/upgrade/AbstractUpgradeCatalog.java | 32 +- .../server/upgrade/UpgradeCatalog210.java | 57 +- .../server/upgrade/UpgradeCatalog2121.java | 25 + .../server/upgrade/UpgradeCatalog213.java | 174 +- .../apache/ambari/server/utils/RetryHelper.java | 85 + .../ambari/server/utils/SecretReference.java | 78 +- .../apache/ambari/server/view/ViewRegistry.java | 2 +- ambari-server/src/main/python/ambari-server.py | 33 +- .../main/python/ambari_server/enableStack.py | 94 + .../src/main/python/ambari_server/hostUpdate.py | 111 + .../main/python/ambari_server/serverUpgrade.py | 11 +- .../main/python/ambari_server/setupActions.py | 2 + .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 + .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 + .../resources/Ambari-DDL-Postgres-CREATE.sql | 2 + .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 2 + .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 + .../resources/Ambari-DDL-SQLServer-CREATE.sql | 2 + ambari-server/src/main/resources/alerts.json | 6 +- .../package/scripts/accumulo_client.py | 4 +- .../package/scripts/accumulo_script.py | 8 +- .../0.1.0/configuration/ams-hbase-site.xml | 42 +- .../0.1.0/configuration/ams-site.xml | 54 +- .../package/files/service-metrics/KAFKA.txt | 36 +- .../0.1.0/package/scripts/params.py | 2 +- .../0.1.0/package/scripts/split_points.py | 2 +- .../0.1.0.2.3/package/scripts/atlas_client.py | 11 +- .../package/scripts/metadata_server.py | 21 +- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 5 + .../FALCON/0.5.0.2.1/package/scripts/falcon.py | 4 +- .../0.5.0.2.1/package/scripts/falcon_client.py | 3 +- .../0.5.0.2.1/package/scripts/falcon_server.py | 21 +- .../1.4.0.2.0/package/scripts/flume_handler.py | 74 +- .../FLUME/1.4.0.2.0/package/scripts/params.py | 2 +- .../HAWQ/2.0.0.0/configuration/hawq-site.xml | 49 +- .../HAWQ/2.0.0.0/package/scripts/common.py | 10 +- .../0.96.0.2.0/package/scripts/hbase_client.py | 2 +- .../0.96.0.2.0/package/scripts/hbase_master.py | 8 +- .../package/scripts/hbase_regionserver.py | 10 +- .../0.96.0.2.0/package/scripts/hbase_service.py | 1 + .../package/scripts/phoenix_queryserver.py | 6 +- .../package/scripts/setup_ranger_hbase.py | 4 +- .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 1 + .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 16 +- .../HDFS/2.1.0.2.0/package/scripts/namenode.py | 4 +- .../HDFS/2.1.0.2.0/package/scripts/snamenode.py | 14 +- .../HDFS/2.1.0.2.0/package/scripts/utils.py | 24 +- .../2.1.0.2.0/package/scripts/zkfc_slave.py | 26 +- .../0.12.0.2.0/package/scripts/hive_client.py | 4 +- .../package/scripts/hive_metastore.py | 39 +- .../0.12.0.2.0/package/scripts/hive_server.py | 26 +- .../0.12.0.2.0/package/scripts/hive_service.py | 9 +- .../0.12.0.2.0/package/scripts/params_linux.py | 17 +- .../package/scripts/setup_ranger_hive.py | 5 +- .../package/scripts/webhcat_server.py | 10 +- .../package/scripts/webhcat_service.py | 4 +- .../0.8.1.2.2/configuration/kafka-broker.xml | 5 +- .../0.8.1.2.2/package/scripts/kafka_broker.py | 6 +- .../ranger-knox-plugin-properties.xml | 20 +- .../0.5.0.2.2/package/scripts/knox_gateway.py | 13 +- .../package/scripts/setup_ranger_knox.py | 4 +- .../KNOX/0.5.0.2.2/package/scripts/upgrade.py | 2 + .../1.0.0.2.3/package/scripts/mahout_client.py | 4 +- .../package/alerts/alert_check_oozie_server.py | 10 +- .../4.0.0.2.0/package/scripts/oozie_client.py | 4 +- .../4.0.0.2.0/package/scripts/oozie_server.py | 20 +- .../4.0.0.2.0/package/scripts/oozie_service.py | 8 +- .../0.12.0.2.0/package/scripts/pig_client.py | 2 +- .../PXF/3.0.0.0/configuration/pxf-site.xml | 19 + .../common-services/PXF/3.0.0.0/metainfo.xml | 2 +- .../PXF/3.0.0.0/package/scripts/params.py | 42 + .../PXF/3.0.0.0/package/scripts/pxf.py | 120 + .../PXF/3.0.0.0/package/scripts/pxfservice.py | 41 - .../PXF/3.0.0.0/package/templates/pxf-env.j2 | 34 + .../common-services/RANGER/0.4.0/alerts.json | 23 +- .../0.4.0/configuration/admin-properties.xml | 37 +- .../RANGER/0.4.0/configuration/ranger-env.xml | 84 +- .../RANGER/0.4.0/configuration/ranger-site.xml | 3 +- .../0.4.0/configuration/usersync-properties.xml | 47 +- .../0.4.0/package/scripts/ranger_admin.py | 18 +- .../0.4.0/package/scripts/ranger_usersync.py | 8 +- .../0.4.0/package/scripts/service_check.py | 2 +- .../0.4.0/package/scripts/setup_ranger_xml.py | 32 +- .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 4 +- .../0.5.0.2.3/package/scripts/kms_server.py | 6 +- .../SLIDER/0.60.0.2.2/package/scripts/params.py | 2 +- .../0.60.0.2.2/package/scripts/params_linux.py | 2 +- .../SLIDER/0.60.0.2.2/package/scripts/slider.py | 6 +- .../0.60.0.2.2/package/scripts/slider_client.py | 27 +- .../SPARK/1.2.0.2.2/configuration/spark-env.xml | 10 +- .../package/scripts/job_history_server.py | 7 +- .../SPARK/1.2.0.2.2/package/scripts/params.py | 5 +- .../1.2.0.2.2/package/scripts/spark_client.py | 3 +- .../1.2.0.2.2/package/scripts/spark_service.py | 2 +- .../package/scripts/spark_thrift_server.py | 7 +- .../1.4.4.2.0/package/scripts/sqoop_client.py | 2 +- .../0.9.1.2.1/package/scripts/drpc_server.py | 6 +- .../STORM/0.9.1.2.1/package/scripts/nimbus.py | 13 +- .../0.9.1.2.1/package/scripts/nimbus_prod.py | 6 +- .../STORM/0.9.1.2.1/package/scripts/rest_api.py | 17 +- .../STORM/0.9.1.2.1/package/scripts/service.py | 20 +- .../package/scripts/setup_ranger_storm.py | 7 +- .../STORM/0.9.1.2.1/package/scripts/storm.py | 7 + .../0.9.1.2.1/package/scripts/storm_upgrade.py | 41 +- .../0.9.1.2.1/package/scripts/supervisor.py | 11 +- .../package/scripts/supervisor_prod.py | 6 +- .../0.9.1.2.1/package/scripts/ui_server.py | 14 +- .../0.4.0.2.1/package/scripts/pre_upgrade.py | 4 +- .../TEZ/0.4.0.2.1/package/scripts/tez_client.py | 2 +- .../custom_actions/scripts/ru_set_all.py | 22 +- .../src/main/resources/properties.json | 1 + .../2.0.6/hooks/before-START/scripts/params.py | 34 + .../scripts/shared_initialization.py | 21 + .../stacks/HDP/2.0.6/services/stack_advisor.py | 168 +- .../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 400 ++- .../stacks/HDP/2.2/role_command_order.json | 20 +- .../ranger-hbase-plugin-properties.xml | 21 +- .../ranger-hdfs-plugin-properties.xml | 20 +- .../services/HIVE/configuration/hive-site.xml | 8 +- .../HIVE/configuration/hiveserver2-site.xml | 12 + .../ranger-hive-plugin-properties.xml | 22 +- .../services/RANGER/themes/theme_version_1.json | 534 ++++ .../ranger-storm-plugin-properties.xml | 20 +- .../stacks/HDP/2.2/services/stack_advisor.py | 109 +- .../HDP/2.2/upgrades/nonrolling-upgrade-2.2.xml | 359 ++- .../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 547 +++- .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml | 32 +- .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 54 +- .../stacks/HDP/2.3.ECS/repos/repoinfo.xml | 30 +- .../stacks/HDP/2.3.ECS/role_command_order.json | 3 +- .../services/ECS/configuration/core-site.xml | 197 +- .../HDP/2.3.ECS/services/ECS/kerberos.json | 53 + .../HDP/2.3.ECS/services/ECS/metainfo.xml | 4 +- .../services/ECS/package/scripts/ecs_client.py | 2 + .../services/ECS/package/scripts/params.py | 7 +- .../ECS/package/scripts/service_check.py | 19 +- .../HDP/2.3.ECS/services/HBASE/kerberos.json | 132 + .../HDP/2.3.ECS/services/YARN/kerberos.json | 215 ++ .../stacks/HDP/2.3/role_command_order.json | 4 +- .../services/HDFS/configuration/hdfs-site.xml | 1 - .../RANGER/configuration/admin-properties.xml | 26 +- .../RANGER/configuration/ranger-admin-site.xml | 12 +- .../RANGER/configuration/ranger-env.xml | 72 +- .../RANGER/configuration/ranger-ugsync-site.xml | 30 +- .../services/RANGER/themes/theme_version_2.json | 27 +- .../STORM/configuration/storm-cluster-log4j.xml | 112 + .../STORM/configuration/storm-worker-log4j.xml | 113 + .../services/YARN/configuration/yarn-site.xml | 1 - .../stacks/HDP/2.3/services/stack_advisor.py | 117 +- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 14 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 531 +++- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 59 +- .../services/HDFS/configuration/core-site.xml | 73 + .../services/HDFS/configuration/hdfs-site.xml | 116 + .../catalog/UpgradeCatalog_1.3_to_2.2.json | 2 +- .../catalog/UpgradeCatalog_2.0_to_2.2.2.json | 2 +- .../catalog/UpgradeCatalog_2.0_to_2.2.4.json | 2 +- .../catalog/UpgradeCatalog_2.0_to_2.2.json | 4 +- .../catalog/UpgradeCatalog_2.1_to_2.2.2.json | 2 +- .../catalog/UpgradeCatalog_2.1_to_2.2.4.json | 2 +- .../catalog/UpgradeCatalog_2.1_to_2.2.json | 4 +- .../catalog/UpgradeCatalog_2.1_to_2.3.json | 2 +- .../actionmanager/TestActionScheduler.java | 92 +- .../StackAdvisorBlueprintProcessorTest.java | 200 ++ .../server/configuration/ConfigurationTest.java | 38 +- .../AmbariManagementControllerTest.java | 26 +- .../server/controller/KerberosHelperTest.java | 146 +- .../internal/AlertResourceProviderTest.java | 54 +- .../BlueprintConfigurationProcessorTest.java | 233 +- .../internal/BlueprintResourceProviderTest.java | 190 +- .../internal/CalculatedStatusTest.java | 4 +- .../internal/ClusterResourceProviderTest.java | 128 +- ...ClusterStackVersionResourceProviderTest.java | 161 ++ ...leRepositoryVersionResourceProviderTest.java | 117 +- .../internal/ProvisionClusterRequestTest.java | 68 +- .../internal/UpgradeResourceProviderTest.java | 75 + .../internal/WidgetResourceProviderTest.java | 6 +- .../cache/TimelineMetricCacheSizingTest.java | 35 +- .../timeline/cache/TimelineMetricCacheTest.java | 74 +- .../server/orm/dao/HostRoleCommandDAOTest.java | 39 - .../scheduler/ExecutionSchedulerTest.java | 6 +- .../ComponentVersionCheckActionTest.java | 426 +++ .../ambari/server/stack/StackManagerTest.java | 15 +- .../ambari/server/state/UpgradeHelperTest.java | 97 +- .../server/state/cluster/ClustersTest.java | 45 +- .../server/state/stack/UpgradePackTest.java | 2 - .../server/topology/AmbariContextTest.java | 22 +- .../server/topology/BlueprintFactoryTest.java | 12 +- .../server/topology/BlueprintImplTest.java | 79 +- .../SecurityConfigurationFactoryTest.java | 163 ++ .../server/topology/TopologyManagerTest.java | 30 +- .../server/update/HostUpdateHelperTest.java | 501 ++++ .../server/upgrade/UpgradeCatalog2121Test.java | 70 +- .../server/upgrade/UpgradeCatalog213Test.java | 351 ++- .../ambari/server/utils/StageUtilsTest.java | 72 +- .../src/test/python/TestAmbariServer.py | 51 +- .../src/test/python/TestServerUpgrade.py | 55 +- .../python/custom_actions/test_ru_set_all.py | 43 +- .../python/stacks/2.0.6/FLUME/test_flume.py | 4 +- .../stacks/2.0.6/HBASE/test_hbase_master.py | 8 +- .../2.0.6/HBASE/test_hbase_regionserver.py | 10 +- .../2.0.6/HBASE/test_phoenix_queryserver.py | 2 +- .../python/stacks/2.0.6/HDFS/test_datanode.py | 49 +- .../stacks/2.0.6/HDFS/test_journalnode.py | 24 +- .../python/stacks/2.0.6/HDFS/test_namenode.py | 68 +- .../python/stacks/2.0.6/HDFS/test_nfsgateway.py | 24 +- .../python/stacks/2.0.6/HDFS/test_snamenode.py | 24 +- .../test/python/stacks/2.0.6/HDFS/test_zkfc.py | 24 +- .../stacks/2.0.6/HIVE/test_hive_client.py | 8 +- .../stacks/2.0.6/HIVE/test_hive_metastore.py | 4 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 8 +- .../2.0.6/HIVE/test_hive_service_check.py | 6 +- .../stacks/2.0.6/HIVE/test_webhcat_server.py | 8 +- .../stacks/2.0.6/OOZIE/test_oozie_client.py | 8 +- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 8 +- .../python/stacks/2.0.6/PIG/test_pig_client.py | 8 +- .../python/stacks/2.0.6/SQOOP/test_sqoop.py | 4 +- .../stacks/2.0.6/common/test_stack_advisor.py | 77 +- .../stacks/2.0.6/configs/nn_eu_standby.json | 293 ++ .../stacks/2.1/FALCON/test_falcon_client.py | 8 +- .../stacks/2.1/FALCON/test_falcon_server.py | 8 +- .../stacks/2.1/HIVE/test_hive_metastore.py | 83 +- .../stacks/2.1/STORM/test_storm_drpc_server.py | 27 +- .../stacks/2.1/STORM/test_storm_nimbus.py | 28 +- .../stacks/2.1/STORM/test_storm_nimbus_prod.py | 18 +- .../2.1/STORM/test_storm_rest_api_service.py | 59 +- .../stacks/2.1/STORM/test_storm_supervisor.py | 35 +- .../2.1/STORM/test_storm_supervisor_prod.py | 27 +- .../stacks/2.1/STORM/test_storm_ui_server.py | 28 +- .../python/stacks/2.1/TEZ/test_tez_client.py | 4 +- .../stacks/2.2/ACCUMULO/test_accumulo_client.py | 8 +- .../stacks/2.2/KAFKA/test_kafka_broker.py | 8 +- .../python/stacks/2.2/KNOX/test_knox_gateway.py | 16 +- .../stacks/2.2/RANGER/test_ranger_admin.py | 4 +- .../stacks/2.2/SLIDER/test_slider_client.py | 18 +- .../stacks/2.2/SPARK/test_job_history_server.py | 4 +- .../stacks/2.2/SPARK/test_spark_client.py | 4 +- .../stacks/2.2/common/test_stack_advisor.py | 105 +- .../python/stacks/2.2/configs/hive-upgrade.json | 2 +- .../journalnode-upgrade-hdfs-secure.json | 4 +- .../stacks/2.2/configs/journalnode-upgrade.json | 4 +- .../stacks/2.3/MAHOUT/test_mahout_client.py | 8 +- .../2.3/SPARK/test_spark_thrift_server.py | 6 +- .../python/stacks/2.3/common/hosts-1-host.json | 93 + .../python/stacks/2.3/common/hosts-3-hosts.json | 269 ++ .../stacks/2.3/common/services-hawq-1-host.json | 2564 ++++++++++++++++++ .../2.3/common/services-hawq-3-hosts.json | 2564 ++++++++++++++++++ .../services-master_ambari_colo-3-hosts.json | 2564 ++++++++++++++++++ .../services-master_standby_colo-3-hosts.json | 2564 ++++++++++++++++++ .../2.3/common/services-nohawq-3-hosts.json | 2214 +++++++++++++++ .../common/services-normal-hawq-3-hosts.json | 2564 ++++++++++++++++++ .../common/services-normal-nohawq-3-hosts.json | 2214 +++++++++++++++ .../services-standby_ambari_colo-3-hosts.json | 2564 ++++++++++++++++++ .../stacks/2.3/common/test_stack_advisor.py | 204 +- .../stacks/2.3/configs/spark_default.json | 5 +- .../src/test/python/stacks/utils/RMFTestCase.py | 27 +- .../services/YARN/configuration/yarn-site.xml | 6 + .../upgrades/upgrade_server_action_test.xml | 52 + .../2.1.1/upgrades/upgrade_test_nonrolling.xml | 2 + .../assets/data/alerts/alertDefinitions.json | 4 +- .../app/assets/data/alerts/alert_instances.json | 2 +- .../app/assets/data/alerts/alert_summary.json | 2 +- .../stack_versions/supported_upgrade_types.json | 18 + ambari-web/app/assets/test/tests.js | 10 +- ambari-web/app/config.js | 2 +- ambari-web/app/controllers.js | 1 + ambari-web/app/controllers/experimental.js | 1 - .../controllers/global/cluster_controller.js | 15 +- .../app/controllers/global/update_controller.js | 2 +- ambari-web/app/controllers/installer.js | 8 - ambari-web/app/controllers/login_controller.js | 2 - ambari-web/app/controllers/main.js | 1 - .../app/controllers/main/admin/advanced.js | 2 +- .../nameNode/rollback_controller.js | 38 - .../nameNode/step3_controller.js | 32 +- .../resourceManager/step4_controller.js | 2 +- .../main/admin/kerberos/step2_controller.js | 1 - .../main/admin/kerberos/step4_controller.js | 1 - .../main/admin/stack_and_upgrade_controller.js | 168 +- .../alert_definitions_actions_controller.js | 5 +- .../alerts/definition_configs_controller.js | 1 - .../alerts/definition_details_controller.js | 2 - .../alerts/manage_alert_groups_controller.js | 2 - ambari-web/app/controllers/main/host.js | 475 +--- .../app/controllers/main/host/add_controller.js | 3 - .../main/host/bulk_operations_controller.js | 745 +++++ ambari-web/app/controllers/main/host/details.js | 17 - .../controllers/main/service/add_controller.js | 7 - .../controllers/main/service/info/configs.js | 3 + .../controllers/main/service/info/summary.js | 1 - ambari-web/app/controllers/main/service/item.js | 20 - .../service/manage_config_groups_controller.js | 1 - .../main/service/reassign/step2_controller.js | 2 - .../main/service/reassign/step4_controller.js | 45 +- .../main/service/reassign/step5_controller.js | 2 +- .../main/service/reassign/step6_controller.js | 2 + .../main/service/reassign_controller.js | 9 +- ambari-web/app/controllers/wizard.js | 22 - .../app/controllers/wizard/step10_controller.js | 2 - .../app/controllers/wizard/step2_controller.js | 2 - .../app/controllers/wizard/step3_controller.js | 27 - .../app/controllers/wizard/step4_controller.js | 1 - .../app/controllers/wizard/step6_controller.js | 6 +- .../app/controllers/wizard/step7_controller.js | 40 +- .../app/controllers/wizard/step8_controller.js | 8 - .../app/controllers/wizard/step9_controller.js | 26 +- ambari-web/app/data/HDP2.2/site_properties.js | 81 - ambari-web/app/data/HDP2.3/site_properties.js | 9 +- ambari-web/app/data/HDP2/ha_properties.js | 17 +- ambari-web/app/mappers/configs/themes_mapper.js | 4 - ambari-web/app/mappers/server_data_mapper.js | 1 - ambari-web/app/messages.js | 7 +- .../mixins/common/chart/storm_linear_time.js | 17 +- .../app/mixins/common/configs/configs_saver.js | 13 +- .../mixins/common/configs/enhanced_configs.js | 6 +- ambari-web/app/mixins/common/reload_popup.js | 3 - ambari-web/app/mixins/common/serverValidator.js | 7 +- ambari-web/app/mixins/common/userPref.js | 1 - .../common/widgets/export_metrics_mixin.js | 85 +- .../app/mixins/common/widgets/widget_mixin.js | 2 - .../main/service/configs/config_overridable.js | 2 - .../app/mixins/main/service/themes_mapping.js | 2 +- .../mixins/wizard/assign_master_components.js | 6 - .../wizard/wizardDeployProgressController.js | 1 - .../app/mixins/wizard/wizardEnableDone.js | 7 +- .../wizard/wizardProgressPageController.js | 2 + ambari-web/app/models/alerts/alert_config.js | 1 - ambari-web/app/models/authentication.js | 1 - ambari-web/app/models/cluster_states.js | 2 - .../app/models/configs/theme/sub_section.js | 4 +- .../app/models/configs/theme/sub_section_tab.js | 4 +- ambari-web/app/models/form.js | 8 - ambari-web/app/models/stack_service.js | 1 - ambari-web/app/models/user.js | 3 - ambari-web/app/models/widget_property.js | 1 - ambari-web/app/router.js | 19 +- ambari-web/app/routes/add_host_routes.js | 13 +- ambari-web/app/routes/add_kerberos_routes.js | 8 - ambari-web/app/routes/add_service_routes.js | 14 +- ambari-web/app/routes/installer.js | 15 +- ambari-web/app/routes/main.js | 1 - ambari-web/app/routes/reassign_master_routes.js | 8 - ambari-web/app/routes/stack_upgrade_routes.js | 1 - ambari-web/app/styles/config_history_flow.less | 2 +- ambari-web/app/styles/stack_versions.less | 3 + .../configs/service_config_layout_tab.hbs | 2 +- .../common/form/manage_credentilas_form.hbs | 10 + .../config_recommendation_popup.hbs | 20 +- ambari-web/app/utils/action_sequence.js | 4 - ambari-web/app/utils/ajax/ajax.js | 36 +- .../app/utils/batch_scheduled_requests.js | 124 +- ambari-web/app/utils/blueprint.js | 2 - ambari-web/app/utils/config.js | 42 +- .../app/utils/configs/config_property_helper.js | 11 +- ambari-web/app/utils/credentials.js | 1 - ambari-web/app/utils/db.js | 685 +---- ambari-web/app/utils/ember_reopen.js | 16 +- ambari-web/app/utils/host_progress_popup.js | 1248 ++++----- ambari-web/app/utils/lazy_loading.js | 2 - ambari-web/app/utils/polling.js | 14 - ambari-web/app/views.js | 1 + .../app/views/common/chart/linear_time.js | 223 +- .../configs/widgets/config_widget_view.js | 29 +- .../widgets/test_db_connection_widget_view.js | 3 +- ambari-web/app/views/common/controls_view.js | 45 +- .../common/form/manage_credentials_form_view.js | 51 +- ambari-web/app/views/common/grid.js | 4 - .../common/host_progress_popup_body_view.js | 749 +++++ .../app/views/common/quick_view_link_view.js | 11 +- ambari-web/app/views/common/table_view.js | 2 - ambari-web/app/views/common/time_range.js | 1 - .../views/common/widget/graph_widget_view.js | 16 +- .../main/admin/stack_upgrade/services_view.js | 2 - .../admin/stack_upgrade/upgrade_wizard_view.js | 4 +- .../main/admin/stack_upgrade/versions_view.js | 1 - .../alerts/manage_alert_notifications_view.js | 4 +- .../views/main/dashboard/cluster_metrics/cpu.js | 33 +- .../main/dashboard/cluster_metrics/load.js | 15 +- .../main/dashboard/cluster_metrics/memory.js | 22 +- .../main/dashboard/cluster_metrics/network.js | 17 +- .../views/main/dashboard/config_history_view.js | 14 +- ambari-web/app/views/main/dashboard/widgets.js | 5 - .../dashboard/widgets/cluster_metrics_widget.js | 18 +- ambari-web/app/views/main/host.js | 200 -- .../app/views/main/host/configs_service_menu.js | 2 - .../views/main/host/hosts_table_menu_view.js | 134 +- ambari-web/app/views/main/host/metrics/cpu.js | 71 +- ambari-web/app/views/main/host/metrics/disk.js | 47 +- ambari-web/app/views/main/host/metrics/load.js | 33 +- .../app/views/main/host/metrics/memory.js | 51 +- .../app/views/main/host/metrics/network.js | 39 +- .../app/views/main/host/metrics/processes.js | 29 +- .../ambari_metrics/master_average_load.js | 25 +- .../metrics/ambari_metrics/regionserver_base.js | 27 +- .../regionserver_block_cache_hit_percent.js | 2 +- .../info/metrics/flume/channel_fill_pct.js | 34 +- .../service/info/metrics/flume/channel_size.js | 32 +- .../info/metrics/flume/channel_size_mma.js | 21 +- .../service/info/metrics/flume/channel_sum.js | 14 +- .../main/service/info/metrics/flume/cpu_user.js | 29 +- .../info/metrics/flume/flume_incoming_mma.js | 21 +- .../info/metrics/flume/flume_incoming_sum.js | 12 +- .../info/metrics/flume/flume_metric_graph.js | 27 +- .../info/metrics/flume/flume_outgoing_mma.js | 21 +- .../info/metrics/flume/flume_outgoing_sum.js | 12 +- .../views/main/service/info/metrics/flume/gc.js | 29 +- .../main/service/info/metrics/flume/jvm_heap.js | 37 +- .../info/metrics/flume/jvm_threads_runnable.js | 29 +- .../metrics/flume/sink_connection_failed.js | 32 +- .../info/metrics/flume/sink_drain_success.js | 32 +- .../info/metrics/flume/source_accepted.js | 32 +- .../service/info/metrics/kafka/broker_topic.js | 37 +- .../info/metrics/kafka/controller_status.js | 33 +- .../info/metrics/kafka/kafka_controller.js | 11 +- .../info/metrics/kafka/replica_fetcher.js | 11 +- .../info/metrics/kafka/replica_manager.js | 33 +- .../app/views/main/service/info/summary.js | 2 - ambari-web/app/views/main/service/item.js | 30 +- ambari-web/app/views/main/views/details.js | 4 - ambari-web/app/views/wizard/step9_view.js | 2 - .../resourceManager/step3_controller_test.js | 1 - .../admin/stack_and_upgrade_controller_test.js | 60 +- .../alerts/alert_instances_controller_test.js | 3 - .../host/bulk_operations_controller_test.js | 155 ++ ambari-web/test/controllers/main/host_test.js | 131 - .../service/reassign/step4_controller_test.js | 4 +- .../main/service/reassign_controller_test.js | 33 +- .../wizard/slave_component_groups_controller.js | 31 - .../test/controllers/wizard/step6_test.js | 5 - .../test/controllers/wizard/step7_test.js | 2 - .../test/controllers/wizard/step8_test.js | 5 - ambari-web/test/controllers/wizard_test.js | 2 +- ambari-web/test/init_router_test.js | 30 - .../test/mappers/alert_instances_mapper_test.js | 2 +- .../common/chart/storm_linear_time_test.js | 11 +- .../test/mixins/common/reload_popup_test.js | 3 - .../common/widgets/export_metrics_mixin_test.js | 225 +- .../test/mixins/wizard/wizardEnableDone_test.js | 17 +- ambari-web/test/models/configs/section_test.js | 19 +- .../test/models/configs/sub_section_test.js | 11 +- ambari-web/test/router_test.js | 8 +- ambari-web/test/utils/config_test.js | 3 +- ambari-web/test/utils/db_test.js | 97 + .../test/utils/host_progress_popup_test.js | 112 + .../test/views/common/chart/linear_time_test.js | 54 + .../form/manage_kdc_credentials_form_test.js | 24 + .../host_progress_popup_body_view_test.js | 58 + ambari-web/test/views/common/table_view_test.js | 2 + .../common/widget/graph_widget_view_test.js | 57 +- .../upgrade_version_box_view_test.js | 9 + .../stack_upgrade/upgrade_wizard_view_test.js | 2 + .../views/main/alert_definitions_view_test.js | 13 + .../main/alerts/definition_details_view_test.js | 4 +- .../select_definitions_popup_body_view_test.js | 11 + .../dashboard/cluster_metrics/memory_test.js | 80 - .../widgets/cluster_metrics_widget_test.js | 56 +- ambari-web/test/views/main/host/details_test.js | 1 - .../info/metrics/flume/channel_size_mma_test.js | 142 - .../info/metrics/flume/channel_sum_test.js | 108 - .../metrics/flume/flume_incoming_mma_test.js | 142 - .../metrics/flume/flume_incoming_sum_test.js | 108 - .../metrics/flume/flume_outgoing_mma_test.js | 142 - .../metrics/flume/flume_outgoing_sum_test.js | 108 - .../view/hive/resources/jobs/JobService.java | 8 + .../resources/jobs/viewJobs/JobController.java | 6 + .../jobs/viewJobs/JobControllerImpl.java | 6 + .../controllers/index/history-query/results.js | 31 +- .../app/controllers/visualization-ui.js | 10 +- contrib/views/hive/src/main/resources/view.xml | 6 +- .../view/pig/persistence/DataStoreStorage.java | 24 - .../view/pig/persistence/SmokeTestEntity.java | 45 + contrib/views/pig/src/main/resources/view.xml | 2 +- .../apache/ambari/view/tez/ViewController.java | 12 + .../ambari/view/tez/ViewControllerImpl.java | 26 +- .../tez/exceptions/ATSUrlFetchException.java | 32 + .../tez/exceptions/ActiveRMFetchException.java | 32 + .../view/tez/exceptions/ProxyException.java | 48 + .../ambari/view/tez/rest/AtsProxyResource.java | 47 + .../ambari/view/tez/rest/BaseProxyResource.java | 57 + .../ambari/view/tez/rest/RMProxyResource.java | 47 + .../ambari/view/tez/utils/ProxyHelper.java | 97 + .../resources/ui/scripts/init-ambari-view.js | 6 +- contrib/views/tez/src/main/resources/view.xml | 8 + .../view/utils/ambari/AmbariApiException.java | 13 + .../ambari/view/utils/ambari/Services.java | 67 +- .../ambari/view/utils/ambari/ServicesTest.java | 70 + 603 files changed, 39542 insertions(+), 8035 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fefcdf5d/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java ---------------------------------------------------------------------- diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java index 5f216db,22212bf..03094e1 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java @@@ -57,7 -57,10 +57,8 @@@ import org.apache.ambari.server.control import org.apache.ambari.server.controller.spi.SystemException; import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; import org.apache.ambari.server.controller.utilities.PropertyHelper; -import org.apache.ambari.server.events.ActionFinalReportReceivedEvent; -import org.apache.ambari.server.events.publishers.AmbariEventPublisher; import org.apache.ambari.server.orm.dao.ClusterVersionDAO; + import org.apache.ambari.server.orm.dao.HostComponentStateDAO; import org.apache.ambari.server.orm.dao.HostVersionDAO; import org.apache.ambari.server.orm.dao.RepositoryVersionDAO; import org.apache.ambari.server.orm.entities.ClusterVersionEntity; @@@ -181,8 -187,14 +185,11 @@@ public class ClusterStackVersionResourc private static Configuration configuration; @Inject - private static AmbariEventPublisher ambariEventPublisher; - - @Inject private static Injector injector; + @Inject + private static HostComponentStateDAO hostComponentStateDAO; + /** * We have to include such a hack here, because if we * make finalizeUpgradeAction field static and request injection http://git-wip-us.apache.org/repos/asf/ambari/blob/fefcdf5d/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fefcdf5d/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fefcdf5d/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fefcdf5d/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fefcdf5d/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fefcdf5d/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fefcdf5d/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fefcdf5d/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --cc ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index d3fa977,06ae045..ecb3d64 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java @@@ -60,7 -61,11 +60,10 @@@ import org.apache.ambari.server.control import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; -import org.apache.ambari.server.orm.dao.ClusterDAO; import org.apache.ambari.server.orm.dao.ClusterVersionDAO; + import org.apache.ambari.server.orm.dao.HostComponentStateDAO; + import org.apache.ambari.server.orm.dao.HostDAO; + import org.apache.ambari.server.orm.dao.HostVersionDAO; import org.apache.ambari.server.orm.dao.RepositoryVersionDAO; import org.apache.ambari.server.orm.dao.ResourceTypeDAO; import org.apache.ambari.server.orm.dao.StackDAO; @@@ -113,7 -118,12 +116,10 @@@ public class ClusterStackVersionResourc private ConfigHelper configHelper; private Configuration configuration; private StageFactory stageFactory; - private AmbariActionExecutionHelper actionExecutionHelper; + private HostVersionDAO hostVersionDAO; + private HostComponentStateDAO hostComponentStateDAO; + private String operatingSystemsJson = "[\n" + " {\n" + " \"repositories\":[\n" + @@@ -152,6 -165,9 +161,8 @@@ ambariMetaInfo = injector.getInstance(AmbariMetaInfo.class); resourceTypeDAO = injector.getInstance(ResourceTypeDAO.class); stackDAO = injector.getInstance(StackDAO.class); + clusterDAO = injector.getInstance(ClusterDAO.class); + hostDAO = injector.getInstance(HostDAO.class); - } @After
