You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/12/01 19:20:40 UTC
[50/50] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
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/6ae63efd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ae63efd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ae63efd
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 6ae63efd6fdb52aa42795b78a4105e82a2ab96f4
Parents: 47a1bcf 108fc44
Author: Nate Cole <nc...@hortonworks.com>
Authored: Tue Dec 1 13:19:24 2015 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Tue Dec 1 13:19:24 2015 -0500
----------------------------------------------------------------------
.../main/resources/ui/admin-web/app/index.html | 1 +
.../clusters/ClustersManageAccessCtrl.js | 6 +-
.../controllers/clusters/UserAccessListCtrl.js | 131 +
.../controllers/groups/GroupsEditCtrl.js | 4 +-
.../scripts/controllers/users/UsersShowCtrl.js | 4 +-
.../ui/admin-web/app/scripts/routes.js | 5 +
.../admin-web/app/scripts/services/Cluster.js | 32 +-
.../ui/admin-web/app/scripts/services/User.js | 4 +-
.../resources/ui/admin-web/app/styles/main.css | 18 +
.../app/views/clusters/manageAccess.html | 14 +-
.../app/views/clusters/userAccessList.html | 83 +
.../ui/admin-web/app/views/groups/edit.html | 14 +-
.../ui/admin-web/app/views/leftNavbar.html | 2 +-
.../ui/admin-web/app/views/users/show.html | 16 +-
ambari-agent/conf/unix/ambari-agent | 14 +-
ambari-agent/conf/unix/ambari-env.sh | 3 +
.../ambari_agent/AlertSchedulerHandler.py | 8 +-
.../src/main/python/ambari_agent/Controller.py | 11 +-
.../src/main/python/ambari_agent/FileCache.py | 3 +
.../main/python/ambari_agent/RecoveryManager.py | 76 +-
.../ambari_agent/alerts/recovery_alert.py | 103 +
.../python/ambari_agent/alerts/script_alert.py | 32 +-
.../src/main/python/ambari_agent/main.py | 2 +-
.../test/python/ambari_agent/TestActionQueue.py | 6 +-
.../ambari_agent/TestAlertSchedulerHandler.py | 22 +-
.../src/test/python/ambari_agent/TestAlerts.py | 109 +-
.../test/python/ambari_agent/TestHeartbeat.py | 7 +-
.../src/test/python/ambari_agent/TestMain.py | 2 +-
.../python/ambari_agent/TestRecoveryManager.py | 32 +-
.../resource_management/TestPackageResource.py | 10 +-
.../core/providers/package/__init__.py | 35 +
.../core/providers/package/apt.py | 18 +-
.../core/providers/package/zypper.py | 34 +-
.../core/resources/packaging.py | 7 +
.../libraries/functions/conf_select.py | 25 +-
.../libraries/functions/hive_check.py | 2 +-
.../libraries/functions/tar_archive.py | 13 +-
.../libraries/script/script.py | 12 +-
ambari-common/src/main/unix/ambari-python-wrap | 3 -
ambari-metrics/ambari-metrics-common/pom.xml | 20 +-
.../timeline/AbstractTimelineMetricsSink.java | 38 +-
.../metrics2/sink/timeline/Precision.java | 16 +
.../PrecisionLimitExceededException.java | 36 +
.../cache/HandleConnectExceptionTest.java | 48 +-
.../flume/FlumeTimelineMetricsSinkTest.java | 5 +-
.../ambari-metrics-hadoop-sink/pom.xml | 16 +-
.../timeline/HadoopTimelineMetricsSink.java | 4 -
.../timeline/HadoopTimelineMetricsSinkTest.java | 19 +-
.../ambari-metrics-kafka-sink/pom.xml | 2 +-
.../kafka/KafkaTimelineMetricsReporter.java | 6 -
.../kafka/KafkaTimelineMetricsReporterTest.java | 14 +-
.../ambari-metrics-storm-sink/pom.xml | 5 -
.../sink/storm/StormTimelineMetricsSink.java | 3 -
.../storm/StormTimelineMetricsSinkTest.java | 15 +-
.../conf/unix/ambari-metrics-collector | 24 +-
.../ambari-metrics-timelineservice/pom.xml | 6 +-
.../metrics/timeline/PhoenixHBaseAccessor.java | 8 +-
.../timeline/query/PhoenixTransactSQL.java | 5 +-
.../webapp/TimelineWebServices.java | 3 +
ambari-metrics/pom.xml | 8 +-
ambari-project/pom.xml | 2 +-
ambari-server/conf/unix/ambari-env.sh | 4 +
ambari-server/conf/unix/ambari.properties | 5 +-
ambari-server/conf/windows/ambari.properties | 3 +-
ambari-server/pom.xml | 2 +-
ambari-server/sbin/ambari-server | 17 +-
.../server/actionmanager/ActionDBAccessor.java | 6 -
.../actionmanager/ActionDBAccessorImpl.java | 34 +-
.../server/actionmanager/ActionManager.java | 11 +-
.../server/actionmanager/HostRoleCommand.java | 8 +-
.../ambari/server/agent/HeartBeatHandler.java | 45 +-
.../server/api/handlers/CreateHandler.java | 7 +-
.../server/api/handlers/DeleteHandler.java | 3 +
.../server/api/handlers/QueryCreateHandler.java | 3 +
.../ambari/server/api/handlers/ReadHandler.java | 3 +
.../server/api/handlers/UpdateHandler.java | 3 +
.../ambari/server/api/query/QueryImpl.java | 4 +
.../api/services/RoleAuthorizationService.java | 6 +
.../api/services/UserAuthorizationService.java | 7 +
.../ambari/server/api/services/UserService.java | 1 +
.../StackAdvisorBlueprintProcessor.java | 14 +-
.../server/configuration/Configuration.java | 14 +-
.../controller/AmbariManagementController.java | 29 +-
.../AmbariManagementControllerImpl.java | 239 +-
.../ambari/server/controller/AmbariServer.java | 209 +-
.../server/controller/KerberosHelperImpl.java | 6 +-
.../server/controller/TaskStatusRequest.java | 48 -
.../server/controller/TaskStatusResponse.java | 140 -
.../AbstractAuthorizedResourceProvider.java | 524 +
.../AbstractControllerResourceProvider.java | 2 +-
.../internal/AbstractResourceProvider.java | 5 +-
.../ActiveWidgetLayoutResourceProvider.java | 43 +-
.../AmbariPrivilegeResourceProvider.java | 54 +-
.../BlueprintConfigurationProcessor.java | 2 +-
.../controller/internal/CalculatedStatus.java | 6 +
.../ClusterPrivilegeResourceProvider.java | 31 +-
.../internal/ConfigGroupResourceProvider.java | 2 +-
.../internal/PrivilegeResourceProvider.java | 13 +-
.../internal/RequestResourceProvider.java | 8 +-
.../RoleAuthorizationResourceProvider.java | 160 +-
.../internal/StackAdvisorResourceProvider.java | 8 +-
.../internal/StageResourceProvider.java | 8 +-
.../internal/TaskResourceProvider.java | 201 +-
.../UserAuthorizationResourceProvider.java | 176 +-
.../internal/UserPrivilegeResourceProvider.java | 115 +-
.../internal/UserResourceProvider.java | 14 +-
.../internal/ViewPrivilegeResourceProvider.java | 5 +-
.../metrics/MetricsPaddingMethod.java | 5 +
.../metrics/timeline/AMSPropertyProvider.java | 5 +-
.../timeline/AMSReportPropertyProvider.java | 5 +-
.../metrics/timeline/MetricsRequestHelper.java | 91 +-
.../cache/TimelineMetricCacheEntryFactory.java | 9 +-
.../listeners/alerts/AlertReceivedListener.java | 2 +-
.../ambari/server/orm/dao/ClusterDAO.java | 47 +-
.../server/orm/dao/ClusterVersionDAO.java | 17 +
.../apache/ambari/server/orm/dao/CrudDAO.java | 2 +-
.../server/orm/dao/HostRoleCommandDAO.java | 86 +
.../ambari/server/orm/dao/HostVersionDAO.java | 17 +
.../server/orm/dao/RepositoryVersionDAO.java | 12 +
.../server/orm/dao/RoleAuthorizationDAO.java | 67 +
.../apache/ambari/server/orm/dao/UserDAO.java | 6 +-
.../orm/entities/ClusterConfigEntity.java | 5 +-
.../server/orm/entities/ClusterEntity.java | 2 +-
.../ambari/server/orm/entities/HostEntity.java | 13 +-
.../ambari/server/orm/entities/HostEntity_.java | 44 +
.../orm/entities/HostRoleCommandEntity_.java | 68 +-
.../server/orm/entities/HostVersionEntity.java | 1 -
.../server/orm/entities/PermissionEntity.java | 44 +-
.../orm/entities/RepositoryVersionEntity.java | 23 +-
.../server/orm/entities/ResourceTypeEntity.java | 14 -
.../orm/entities/RoleAuthorizationEntity.java | 114 +
.../server/orm/entities/UpgradeEntity.java | 2 +-
.../AmbariAuthorizationFilter.java | 144 +-
.../AmbariLocalUserDetailsService.java | 4 +-
.../authorization/AuthorizationException.java | 53 +
.../authorization/AuthorizationHelper.java | 192 +-
.../authorization/LdapServerProperties.java | 6 +-
.../security/authorization/ResourceType.java | 82 +
.../authorization/RoleAuthorization.java | 118 +
.../internal/InternalAuthenticationToken.java | 32 +-
.../security/ldap/AmbariLdapDataPopulator.java | 99 +-
.../upgrades/FinalizeUpgradeAction.java | 3 +-
.../upgrades/UpdateDesiredStackAction.java | 14 +-
.../ambari/server/stack/MasterHostResolver.java | 4 +-
.../ambari/server/state/PropertyInfo.java | 11 +
.../server/state/ServiceComponentHost.java | 8 +
.../server/state/ServiceComponentImpl.java | 2 +-
.../apache/ambari/server/state/ServiceImpl.java | 2 +-
.../state/alert/AlertDefinitionFactory.java | 4 +
.../server/state/alert/RecoverySource.java | 32 +
.../ambari/server/state/alert/SourceType.java | 5 +
.../server/state/cluster/ClusterImpl.java | 79 +-
.../server/state/cluster/ClustersImpl.java | 76 +-
.../state/configgroup/ConfigGroupImpl.java | 3 +-
.../state/scheduler/RequestExecutionImpl.java | 6 +-
.../ambari/server/state/stack/UpgradePack.java | 11 +-
.../server/state/stack/upgrade/UpgradeType.java | 5 +
.../svccomphost/ServiceComponentHostImpl.java | 77 +-
.../server/topology/AsyncCallableService.java | 124 +
.../ambari/server/topology/TopologyManager.java | 72 +-
.../server/upgrade/AbstractUpgradeCatalog.java | 159 +-
.../server/upgrade/StackUpgradeHelper.java | 2 +-
.../server/upgrade/UpgradeCatalog150.java | 1 +
.../server/upgrade/UpgradeCatalog170.java | 4 +-
.../server/upgrade/UpgradeCatalog200.java | 29 +
.../server/upgrade/UpgradeCatalog210.java | 77 +-
.../server/upgrade/UpgradeCatalog213.java | 302 +-
.../server/upgrade/UpgradeCatalog220.java | 224 +-
.../apache/ambari/server/view/ViewRegistry.java | 7 +-
ambari-server/src/main/python/ambari-server.py | 15 +-
.../python/ambari_server/dbConfiguration.py | 8 +-
.../ambari_server/dbConfiguration_linux.py | 22 +
.../main/python/ambari_server/serverUpgrade.py | 8 +
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 234 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 234 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 234 +-
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 236 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 236 +-
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 250 +-
.../src/main/resources/META-INF/persistence.xml | 1 +
.../1.6.1.2.2.0/configuration/accumulo-env.xml | 13 +-
.../configuration/accumulo-log4j.xml | 2 +-
.../AMBARI_METRICS/0.1.0/alerts.json | 24 +
.../0.1.0/configuration/ams-env.xml | 16 +-
.../0.1.0/configuration/ams-hbase-env.xml | 36 +-
.../0.1.0/configuration/ams-hbase-log4j.xml | 2 +-
.../0.1.0/configuration/ams-hbase-site.xml | 6 +
.../0.1.0/configuration/ams-log4j.xml | 2 +-
.../0.1.0/configuration/ams-site.xml | 7 +-
.../0.1.0/package/scripts/ams_service.py | 8 +-
.../0.1.0/package/scripts/functions.py | 19 +-
.../0.1.0/package/scripts/metrics_collector.py | 2 +
.../0.1.0/package/scripts/params.py | 26 +-
.../ATLAS/0.1.0.2.3/configuration/atlas-env.xml | 2 +-
.../0.5.0.2.1/configuration/falcon-env.xml | 2 +-
.../1.4.0.2.0/configuration/flume-conf.xml | 2 +-
.../FLUME/1.4.0.2.0/configuration/flume-env.xml | 2 +-
.../GANGLIA/3.5.0/configuration/ganglia-env.xml | 2 +-
.../HAWQ/2.0.0/configuration/gpcheck-env.xml | 2 +-
.../2.0.0/configuration/hawq-limits-env.xml | 2 +-
.../HAWQ/2.0.0/configuration/hawq-site.xml | 24 +
.../common-services/HAWQ/2.0.0/metainfo.xml | 2 +-
.../0.96.0.2.0/configuration/hbase-env.xml | 15 +-
.../0.96.0.2.0/configuration/hbase-log4j.xml | 2 +-
.../0.96.0.2.0/package/scripts/params_linux.py | 7 +-
.../package/scripts/setup_ranger_hbase.py | 27 +
.../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 22 +-
.../HDFS/2.1.0.2.0/configuration/hdfs-log4j.xml | 2 +-
.../package/alerts/alert_checkpoint_time.py | 7 +-
.../package/alerts/alert_ha_namenode_health.py | 5 +-
.../package/alerts/alert_upgrade_finalized.py | 8 +-
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 40 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 7 +-
.../package/scripts/setup_ranger_hdfs.py | 29 +-
.../HIVE/0.12.0.2.0/configuration/hcat-env.xml | 2 +-
.../HIVE/0.12.0.2.0/configuration/hive-env.xml | 3 +-
.../configuration/hive-exec-log4j.xml | 2 +-
.../0.12.0.2.0/configuration/hive-log4j.xml | 2 +-
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 2 +
.../0.12.0.2.0/configuration/webhcat-env.xml | 2 +-
.../0.12.0.2.0/configuration/webhcat-log4j.xml | 2 +-
.../package/alerts/alert_hive_metastore.py | 20 +-
.../package/alerts/alert_hive_thrift_port.py | 22 +-
.../package/alerts/alert_webhcat_server.py | 23 +-
.../package/scripts/hive_metastore.py | 19 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 12 +-
.../package/scripts/setup_ranger_hive.py | 19 +
.../KAFKA/0.8.1.2.2/configuration/kafka-env.xml | 2 +-
.../0.8.1.2.2/configuration/kafka-log4j.xml | 2 +-
.../KAFKA/0.8.1.2.2/metainfo.xml | 2 +
.../KAFKA/0.8.1.2.2/package/scripts/kafka.py | 4 +-
.../KAFKA/0.8.1.2.2/package/scripts/params.py | 49 +-
.../package/scripts/setup_ranger_kafka.py | 20 +
.../KAFKA/0.8.1.2.2/package/scripts/upgrade.py | 12 +-
.../1.10.3-10/configuration/kerberos-env.xml | 2 +-
.../0.5.0.2.2/configuration/gateway-log4j.xml | 2 +-
.../KNOX/0.5.0.2.2/configuration/knox-env.xml | 13 +-
.../KNOX/0.5.0.2.2/configuration/ldap-log4j.xml | 2 +-
.../KNOX/0.5.0.2.2/package/scripts/knox.py | 20 +-
.../0.5.0.2.2/package/scripts/params_linux.py | 34 +-
.../package/scripts/setup_ranger_knox.py | 20 +
.../1.0.0.2.3/configuration/mahout-env.xml | 2 +-
.../1.0.0.2.3/configuration/mahout-log4j.xml | 2 +-
.../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 2 +-
.../4.0.0.2.0/configuration/oozie-log4j.xml | 2 +-
.../4.0.0.2.0/configuration/oozie-site.xml | 2 +
.../OOZIE/4.2.0.2.3/configuration/oozie-env.xml | 2 +-
.../4.2.0.2.3/configuration/oozie-site.xml | 2 +
.../PIG/0.12.0.2.0/configuration/pig-env.xml | 2 +-
.../PIG/0.12.0.2.0/configuration/pig-log4j.xml | 2 +-
.../0.12.0.2.0/configuration/pig-properties.xml | 2 +-
.../common-services/PXF/3.0.0/kerberos.json | 35 +
.../common-services/PXF/3.0.0/metainfo.xml | 2 +-
.../PXF/3.0.0/package/scripts/params.py | 4 +
.../PXF/3.0.0/package/scripts/pxf.py | 10 +-
.../0.4.0/configuration/admin-properties.xml | 4 +-
.../RANGER/0.4.0/configuration/ranger-env.xml | 2 +-
.../RANGER/0.4.0/package/scripts/params.py | 9 +-
.../0.5.0.2.3/configuration/kms-env.xml | 2 +-
.../0.5.0.2.3/configuration/kms-log4j.xml | 2 +-
.../0.5.0.2.3/package/scripts/params.py | 16 +-
.../0.60.0.2.2/configuration/slider-env.xml | 2 +-
.../0.60.0.2.2/configuration/slider-log4j.xml | 2 +-
.../SPARK/1.2.0.2.2/configuration/spark-env.xml | 8 +-
.../configuration/spark-log4j-properties.xml | 2 +-
.../SPARK/1.2.0.2.2/package/scripts/params.py | 7 +
.../1.2.0.2.2/package/scripts/setup_spark.py | 6 +-
.../1.2.0.2.2/package/scripts/spark_service.py | 10 +-
.../1.2.0.2.2/package/scripts/status_params.py | 7 +-
.../SPARK/1.4.1.2.3/kerberos.json | 3 +
.../SPARK/1.4.1.2.3/metainfo.xml | 11 +-
.../SQOOP/1.4.4.2.0/configuration/sqoop-env.xml | 2 +-
.../STORM/0.9.1.2.1/configuration/storm-env.xml | 38 +-
.../STORM/0.9.1.2.1/metainfo.xml | 2 +
.../0.9.1.2.1/package/scripts/params_linux.py | 42 +-
.../STORM/0.9.1.2.1/package/scripts/service.py | 4 +
.../package/scripts/setup_ranger_storm.py | 20 +
.../TEZ/0.4.0.2.1/configuration/tez-env.xml | 2 +-
.../configuration-mapred/mapred-env.xml | 2 +-
.../YARN/2.1.0.2.0/configuration/yarn-env.xml | 2 +-
.../YARN/2.1.0.2.0/configuration/yarn-log4j.xml | 2 +-
.../package/alerts/alert_nodemanager_health.py | 15 +-
.../alerts/alert_nodemanagers_summary.py | 13 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 7 +-
.../YARN/2.1.0.2.0/package/scripts/service.py | 19 +-
.../package/scripts/setup_ranger_yarn.py | 19 +
.../YARN/2.1.0.2.0/package/scripts/yarn.py | 1 +
.../3.4.5.2.0/configuration/zookeeper-env.xml | 12 +-
.../3.4.5.2.0/configuration/zookeeper-log4j.xml | 2 +-
.../custom_actions/scripts/check_host.py | 13 +-
.../services/FLUME/configuration/flume-conf.xml | 2 +-
.../services/FLUME/configuration/flume-env.xml | 2 +-
.../FLUME/configuration/flume-log4j.xml | 2 +-
.../GANGLIA/configuration/ganglia-env.xml | 2 +-
.../services/HBASE/configuration/hbase-env.xml | 8 +-
.../HBASE/configuration/hbase-log4j.xml | 2 +-
.../services/HBASE/configuration/hbase-site.xml | 3 +
.../services/HDFS/configuration/hadoop-env.xml | 2 +-
.../services/HDFS/configuration/hdfs-log4j.xml | 2 +-
.../services/HIVE/configuration/hcat-env.xml | 2 +-
.../services/HIVE/configuration/hive-env.xml | 5 +-
.../HIVE/configuration/hive-exec-log4j.xml | 2 +-
.../services/HIVE/configuration/hive-log4j.xml | 2 +-
.../services/HIVE/configuration/hive-site.xml | 3 +
.../services/HIVE/configuration/webhcat-env.xml | 2 +-
.../services/OOZIE/configuration/oozie-env.xml | 2 +-
.../OOZIE/configuration/oozie-log4j.xml | 2 +-
.../services/OOZIE/configuration/oozie-site.xml | 3 +
.../0.8/services/PIG/configuration/pig-env.xml | 2 +-
.../services/PIG/configuration/pig-log4j.xml | 2 +-
.../PIG/configuration/pig-properties.xml | 2 +-
.../YARN/configuration-mapred/mapred-env.xml | 2 +-
.../services/YARN/configuration/yarn-env.xml | 2 +-
.../services/YARN/configuration/yarn-log4j.xml | 2 +-
.../ZOOKEEPER/configuration/zookeeper-env.xml | 2 +-
.../ZOOKEEPER/configuration/zookeeper-log4j.xml | 2 +-
.../services/HBASE/configuration/hbase-site.xml | 3 +
.../PIG/configuration/pig-properties.xml | 2 +-
.../before-START/files/fast-hdfs-resource.jar | Bin 19285282 -> 19285353 bytes
.../stacks/HDP/2.0.6/services/stack_advisor.py | 148 +-
.../FALCON/configuration/falcon-env.xml | 2 +-
.../GLUSTERFS/configuration/hadoop-env.xml | 2 +-
.../services/HBASE/configuration/hbase-site.xml | 3 +
.../PIG/configuration/pig-properties.xml | 2 +-
.../services/STORM/configuration/storm-env.xml | 2 +-
.../services/TEZ/configuration/tez-env.xml | 2 +-
.../services/YARN/configuration/yarn-env.xml | 2 +-
.../services/HIVE/configuration/hive-site.xml | 1 +
.../services/OOZIE/configuration/oozie-site.xml | 1 +
.../PIG/configuration/pig-properties.xml | 2 +-
.../services/YARN/configuration/yarn-env.xml | 2 +-
.../HDP/2.1/upgrades/nonrolling-upgrade-2.3.xml | 53 +-
.../services/HBASE/configuration/hbase-env.xml | 4 +-
.../services/HDFS/configuration/hadoop-env.xml | 12 +-
.../services/HDFS/configuration/hdfs-log4j.xml | 2 +-
.../services/HIVE/configuration/hive-env.xml | 2 +-
.../services/HIVE/configuration/hive-site.xml | 14 +
.../services/OOZIE/configuration/oozie-env.xml | 2 +-
.../services/STORM/configuration/storm-env.xml | 2 +-
.../2.2/services/TEZ/configuration/tez-site.xml | 12 +
.../YARN/configuration-mapred/mapred-env.xml | 2 +-
.../YARN/configuration/capacity-scheduler.xml | 2 +-
.../services/YARN/configuration/yarn-env.xml | 2 +-
.../stacks/HDP/2.2/services/YARN/kerberos.json | 3 +-
.../stacks/HDP/2.2/services/stack_advisor.py | 76 +-
.../HDP/2.2/upgrades/nonrolling-upgrade-2.3.xml | 9 +-
.../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 3 +-
.../services/ECS/configuration/hadoop-env.xml | 2 +-
.../services/HBASE/configuration/hbase-env.xml | 2 +-
.../ACCUMULO/configuration/accumulo-log4j.xml | 2 +-
.../GLUSTERFS/configuration/hadoop-env.xml | 2 +-
.../services/HBASE/configuration/hbase-site.xml | 3 +
.../services/HIVE/configuration/hive-site.xml | 3 +
.../services/OOZIE/configuration/oozie-site.xml | 3 +
.../YARN/configuration/capacity-scheduler.xml | 2 +-
.../stacks/HDP/2.3/role_command_order.json | 8 +-
.../ACCUMULO/configuration/accumulo-log4j.xml | 2 +-
.../FALCON/configuration/falcon-env.xml | 2 +-
.../services/HBASE/configuration/hbase-env.xml | 2 +-
.../services/HDFS/configuration/hadoop-env.xml | 12 +-
.../services/HIVE/configuration/hive-env.xml | 2 +-
.../services/KAFKA/configuration/kafka-env.xml | 2 +-
.../KNOX/configuration/knoxsso-topology.xml | 94 +
.../PIG/configuration/pig-properties.xml | 2 +-
.../RANGER/configuration/admin-properties.xml | 23 -
.../RANGER/configuration/ranger-admin-site.xml | 58 +
.../RANGER/configuration/ranger-env.xml | 2 +-
.../configuration/spark-hive-site-override.xml | 4 +-
.../STORM/configuration/storm-cluster-log4j.xml | 2 +-
.../services/STORM/configuration/storm-env.xml | 2 +-
.../STORM/configuration/storm-worker-log4j.xml | 2 +-
.../services/YARN/configuration/yarn-env.xml | 2 +-
.../services/YARN/configuration/yarn-log4j.xml | 2 +-
.../services/YARN/configuration/yarn-site.xml | 3 +
.../stacks/HDP/2.3/services/stack_advisor.py | 54 +-
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 18 +-
.../KNOX/configuration/knoxsso-topology.xml | 94 -
.../AMBARI_METRICS/configuration/ams-env.xml | 14 +-
.../configuration/ams-hbase-env.xml | 2 +-
.../AMBARI_METRICS/configuration/ams-log4j.xml | 2 +-
.../FALCON/configuration/falcon-env.xml | 2 +-
.../services/FLUME/configuration/flume-conf.xml | 2 +-
.../services/FLUME/configuration/flume-env.xml | 2 +-
.../services/HBASE/configuration/hbase-env.xml | 2 +-
.../services/HDFS/configuration/hadoop-env.xml | 2 +-
.../services/HIVE/configuration/hcat-env.xml | 2 +-
.../services/HIVE/configuration/hive-env.xml | 2 +-
.../services/HIVE/configuration/webhcat-env.xml | 2 +-
.../services/OOZIE/configuration/oozie-env.xml | 2 +-
.../services/SQOOP/configuration/sqoop-env.xml | 2 +-
.../services/STORM/configuration/storm-env.xml | 2 +-
.../2.1/services/TEZ/configuration/tez-env.xml | 2 +-
.../YARN/configuration-mapred/mapred-env.xml | 2 +-
.../services/YARN/configuration/yarn-env.xml | 2 +-
.../ZOOKEEPER/configuration/zookeeper-env.xml | 2 +-
.../services/HBASE/configuration/hbase-env.xml | 2 +-
.../services/HDFS/configuration/hadoop-env.xml | 2 +-
.../services/HDFS/configuration/hdfs-log4j.xml | 2 +-
.../services/HIVE/configuration/hive-env.xml | 2 +-
.../services/HIVE/configuration/hive-site.xml | 2 +
.../services/KNOX/configuration/knox-env.xml | 2 +-
.../YARN/configuration/capacity-scheduler.xml | 2 +-
.../services/YARN/configuration/yarn-env.xml | 2 +-
.../services/OOZIE/configuration/oozie-env.xml | 2 +-
.../YARN/configuration/capacity-scheduler.xml | 2 +-
.../webapp/WEB-INF/spring-security.xml | 8 +-
.../ExecutionCommandWrapperTest.java | 2 -
.../server/agent/TestHeartbeatHandler.java | 5 +-
.../server/api/handlers/CreateHandlerTest.java | 32 +
.../server/api/handlers/DeleteHandlerTest.java | 30 +
.../api/handlers/QueryCreateHandlerTest.java | 102 +
.../server/api/handlers/ReadHandlerTest.java | 35 +
.../server/api/handlers/UpdateHandlerTest.java | 33 +
.../services/RoleAuthorizationServiceTest.java | 86 +
.../services/UserAuthorizationServiceTest.java | 87 +
.../services/ViewSubResourceServiceTest.java | 9 +-
.../serializers/JsonSerializerTest.java | 26 +-
.../StackAdvisorBlueprintProcessorTest.java | 2 +
.../AmbariManagementControllerImplTest.java | 101 +-
.../AmbariManagementControllerTest.java | 232 +-
.../server/controller/AmbariServerTest.java | 32 +-
.../controller/AuthToLocalBuilderTest.java | 35 +-
...hYarnCapacitySchedulerReleaseConfigTest.java | 2 +-
.../internal/AbstractResourceProviderTest.java | 76 +-
.../ActiveWidgetLayoutResourceProviderTest.java | 458 +-
.../AlertTargetResourceProviderTest.java | 11 +-
.../AmbariPrivilegeResourceProviderTest.java | 820 +-
.../BlueprintConfigurationProcessorTest.java | 33 +-
.../ClusterPrivilegeResourceProviderTest.java | 501 +-
...ClusterStackVersionResourceProviderTest.java | 13 +-
...leRepositoryVersionResourceProviderTest.java | 4 +-
.../internal/RequestResourceProviderTest.java | 78 +-
.../RoleAuthorizationResourceProviderTest.java | 202 +
.../StackAdvisorResourceProviderTest.java | 40 +
.../StackDependencyResourceProviderTest.java | 4 +-
.../internal/TaskResourceProviderTest.java | 54 +-
.../UserAuthorizationResourceProviderTest.java | 411 +
.../UserPrivilegeResourceProviderTest.java | 350 +-
.../internal/UserResourceProviderTest.java | 646 +-
.../ViewPrivilegeResourceProviderTest.java | 6 +
.../internal/WidgetResourceProviderTest.java | 4 +-
.../ganglia/GangliaPropertyProviderTest.java | 25 +-
.../timeline/MetricsRequestHelperTest.java | 118 +
.../timeline/cache/TimelineMetricCacheTest.java | 13 +-
.../api/AmbariHttpWebRequest.java | 393 +
.../api/ClusterConfigParams.java | 84 +
.../functionaltests/api/ConnectionParams.java | 89 +
.../server/functionaltests/api/WebRequest.java | 192 +
.../server/functionaltests/api/WebResponse.java | 57 +
.../AddDesiredConfigurationWebRequest.java | 108 +
.../api/cluster/CreateClusterWebRequest.java | 88 +
.../cluster/CreateConfigurationWebRequest.java | 87 +
.../api/cluster/GetAllClustersWebRequest.java | 53 +
.../api/cluster/GetClusterWebRequest.java | 49 +
.../api/cluster/GetRequestStatusWebRequest.java | 78 +
.../api/host/AddHostWebRequest.java | 63 +
.../api/host/GetHostWebRequest.java | 56 +
.../api/host/GetRegisteredHostWebRequest.java | 59 +
.../api/host/RegisterHostWebRequest.java | 59 +
.../api/service/AddServiceWebRequest.java | 98 +
.../api/service/DeleteServiceWebRequest.java | 67 +
.../api/service/GetServiceWebRequest.java | 67 +
.../api/service/InstallServiceWebRequest.java | 39 +
.../api/service/SetServiceStateWebRequest.java | 97 +
.../api/service/StartServiceWebRequest.java | 38 +
.../api/service/StopServiceWebRequest.java | 38 +
.../AddServiceComponentWebRequest.java | 69 +
.../GetServiceComponentWebRequest.java | 69 +
.../SetServiceComponentStateWebRequest.java | 87 +
.../AddServiceComponentHostWebRequest.java | 69 +
.../BulkAddServiceComponentHostsWebRequest.java | 127 +
...kSetServiceComponentHostStateWebRequest.java | 91 +
.../GetServiceComponentHostWebRequest.java | 69 +
.../SetServiceComponentHostStateWebRequest.java | 89 +
.../server/DeleteServiceTest.java | 197 +
.../server/LocalAmbariServer.java | 31 +-
.../functionaltests/server/ServerTestBase.java | 146 +
.../server/StartStopServerTest.java | 71 +-
.../functionaltests/utils/ClusterUtils.java | 247 +
.../functionaltests/utils/RestApiUtils.java | 52 +
.../server/metadata/RoleCommandOrderTest.java | 37 +-
.../apache/ambari/server/orm/OrmTestHelper.java | 9 +-
.../apache/ambari/server/orm/TestOrmImpl.java | 13 +-
.../server/orm/dao/ConfigGroupDAOTest.java | 7 +-
.../ambari/server/orm/dao/CrudDAOTest.java | 2 +-
.../server/orm/dao/HostVersionDAOTest.java | 5 +-
.../ambari/server/orm/dao/RequestDAOTest.java | 5 +-
.../server/orm/dao/RequestScheduleDAOTest.java | 7 +-
.../server/orm/dao/ServiceConfigDAOTest.java | 13 +-
.../scheduler/ExecutionScheduleManagerTest.java | 2 +-
.../security/TestAuthenticationFactory.java | 164 +
.../AmbariAuthorizationFilterTest.java | 77 +-
.../authorization/AuthorizationHelperTest.java | 186 +-
.../authorization/LdapServerPropertiesTest.java | 5 +-
.../authorization/ResourceTypeTest.java | 61 +
.../authorization/RoleAuthorizationTest.java | 35 +
.../security/authorization/TestUsers.java | 4 +-
.../ldap/AmbariLdapDataPopulatorTest.java | 66 +-
.../upgrades/UpgradeActionTest.java | 85 +-
.../ambari/server/stack/StackManagerTest.java | 2 +-
.../ambari/server/state/ConfigGroupTest.java | 2 +-
.../ambari/server/state/ConfigHelperTest.java | 2 +-
.../ambari/server/state/PropertyInfoTest.java | 42 +-
.../server/state/RequestExecutionTest.java | 2 +-
.../ambari/server/state/UpgradeHelperTest.java | 62 +-
.../server/state/cluster/ClusterTest.java | 40 +-
.../topology/AsyncCallableServiceTest.java | 166 +
.../topology/BlueprintValidatorImplTest.java | 3 +-
.../topology/ConfigureClusterTaskTest.java | 129 +
.../server/topology/TopologyManagerTest.java | 16 +-
.../server/update/HostUpdateHelperTest.java | 12 +-
.../server/upgrade/UpgradeCatalog200Test.java | 34 +-
.../server/upgrade/UpgradeCatalog210Test.java | 2 +-
.../server/upgrade/UpgradeCatalog213Test.java | 423 +-
.../server/upgrade/UpgradeCatalog220Test.java | 185 +-
.../server/upgrade/UpgradeCatalogHelper.java | 7 +-
.../utils/CollectionPresentationUtils.java | 73 +
.../ambari/server/view/ViewRegistryTest.java | 16 -
.../view/persistence/DataStoreImplTest.java | 2 +-
.../InstanceValidationResultImplTest.java | 3 +-
.../src/test/python/TestAmbariServer.py | 94 +-
.../test/python/custom_actions/TestCheckHost.py | 2 +-
.../AMBARI_METRICS/test_metrics_collector.py | 30 +
.../stacks/2.0.6/HBASE/test_hbase_client.py | 2 +-
.../stacks/2.0.6/HBASE/test_hbase_master.py | 2 +-
.../2.0.6/HBASE/test_hbase_regionserver.py | 2 +-
.../2.0.6/HBASE/test_phoenix_queryserver.py | 2 +-
.../python/stacks/2.0.6/HDFS/test_datanode.py | 2 +-
.../stacks/2.0.6/HDFS/test_hdfs_client.py | 2 +-
.../stacks/2.0.6/HDFS/test_journalnode.py | 2 +-
.../python/stacks/2.0.6/HDFS/test_namenode.py | 121 +-
.../python/stacks/2.0.6/HDFS/test_nfsgateway.py | 2 +-
.../stacks/2.0.6/HIVE/test_hive_client.py | 2 +-
.../stacks/2.0.6/HIVE/test_hive_server.py | 2 +-
.../2.0.6/HIVE/test_hive_service_check.py | 6 +-
.../stacks/2.0.6/HIVE/test_webhcat_server.py | 2 +-
.../stacks/2.0.6/OOZIE/test_oozie_client.py | 2 +-
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 4 +-
.../python/stacks/2.0.6/PIG/test_pig_client.py | 2 +-
.../python/stacks/2.0.6/SQOOP/test_sqoop.py | 2 +-
.../stacks/2.0.6/YARN/test_historyserver.py | 34 +-
.../stacks/2.0.6/YARN/test_mapreduce2_client.py | 4 +-
.../stacks/2.0.6/YARN/test_nodemanager.py | 34 +-
.../stacks/2.0.6/YARN/test_resourcemanager.py | 36 +-
.../stacks/2.0.6/YARN/test_yarn_client.py | 5 +-
.../2.0.6/ZOOKEEPER/test_zookeeper_client.py | 2 +-
.../2.0.6/ZOOKEEPER/test_zookeeper_server.py | 2 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 139 +-
.../stacks/2.1/FALCON/test_falcon_client.py | 2 +-
.../stacks/2.1/FALCON/test_falcon_server.py | 14 +-
.../stacks/2.1/HIVE/test_hive_metastore.py | 76 +-
.../stacks/2.1/STORM/test_storm_drpc_server.py | 2 +-
.../stacks/2.1/STORM/test_storm_nimbus.py | 2 +-
.../stacks/2.1/STORM/test_storm_nimbus_prod.py | 2 +-
.../stacks/2.1/STORM/test_storm_supervisor.py | 2 +-
.../2.1/STORM/test_storm_supervisor_prod.py | 2 +-
.../stacks/2.1/STORM/test_storm_ui_server.py | 2 +-
.../python/stacks/2.1/TEZ/test_tez_client.py | 2 +-
.../stacks/2.1/YARN/test_apptimelineserver.py | 31 +-
.../stacks/2.2/ACCUMULO/test_accumulo_client.py | 2 +-
.../stacks/2.2/KAFKA/test_kafka_broker.py | 2 +-
.../python/stacks/2.2/KNOX/test_knox_gateway.py | 26 +-
.../stacks/2.2/RANGER/test_ranger_admin.py | 2 +-
.../stacks/2.2/RANGER/test_ranger_usersync.py | 2 +-
.../stacks/2.2/SLIDER/test_slider_client.py | 2 +-
.../stacks/2.2/SPARK/test_job_history_server.py | 12 +-
.../stacks/2.2/SPARK/test_spark_client.py | 10 +-
.../stacks/2.2/common/test_stack_advisor.py | 169 +-
.../stacks/2.3/MAHOUT/test_mahout_client.py | 2 +-
.../2.3/SPARK/test_spark_thrift_server.py | 13 +-
.../test/python/stacks/2.3/YARN/test_ats_1_5.py | 1 +
.../stacks/2.3/common/services-hawq-1-host.json | 1 -
.../2.3/common/services-hawq-3-hosts.json | 1 -
.../services-master_ambari_colo-3-hosts.json | 1 -
.../services-master_standby_colo-3-hosts.json | 1 -
.../2.3/common/services-nohawq-3-hosts.json | 1 -
.../common/services-normal-hawq-3-hosts.json | 1 -
.../common/services-normal-nohawq-3-hosts.json | 1 -
.../2.3/common/services-sparkts-hive.json | 10043 +++++++++++++++++
.../stacks/2.3/common/services-sparkts.json | 5860 ++++++++++
.../services-standby_ambari_colo-3-hosts.json | 1 -
.../python/stacks/2.3/common/sparkts-host.json | 220 +
.../stacks/2.3/common/test_stack_advisor.py | 101 +-
.../stacks/2.3/configs/spark_default.json | 6 +-
.../test_kerberos_descriptor_2_1_3.json | 1316 +++
.../services/FLUME/configuration/flume-conf.xml | 2 +-
.../services/FLUME/configuration/flume-conf.xml | 2 +-
.../stacks/HDP/2.1.1/role_command_order.json | 2 +-
.../PIG/configuration/pig-properties.xml | 2 +-
.../stacks/HDP/2.2.0/role_command_order.json | 2 +-
ambari-web/app/app.js | 24 +-
ambari-web/app/assets/data/services/ambari.json | 1 -
ambari-web/app/assets/test/tests.js | 5 +-
.../controllers/global/cluster_controller.js | 18 +-
.../global/user_settings_controller.js | 65 +-
.../global/wizard_watcher_controller.js | 4 +-
ambari-web/app/controllers/main.js | 1 +
.../nameNode/step3_controller.js | 4 +-
.../rangerAdmin/step1_controller.js | 4 +-
.../app/controllers/main/admin/kerberos.js | 34 +-
.../main/admin/kerberos/step2_controller.js | 41 +-
.../main/admin/kerberos/step4_controller.js | 5 +-
.../main/admin/kerberos/step5_controller.js | 4 +-
.../main/admin/kerberos/step8_controller.js | 5 +-
.../main/admin/kerberos/wizard_controller.js | 58 +-
.../main/admin/serviceAccounts_controller.js | 28 +-
.../main/admin/stack_and_upgrade_controller.js | 42 +-
.../add_alert_definition/step1_controller.js | 7 +-
.../main/alerts/alert_instances_controller.js | 4 +-
.../alerts/definition_configs_controller.js | 9 +-
.../alerts/manage_alert_groups_controller.js | 4 +-
.../manage_alert_notifications_controller.js | 8 +-
.../app/controllers/main/charts/heatmap.js | 12 +-
ambari-web/app/controllers/main/dashboard.js | 4 +
ambari-web/app/controllers/main/host/details.js | 114 +-
ambari-web/app/controllers/main/service.js | 63 +-
.../controllers/main/service/add_controller.js | 9 +-
.../controllers/main/service/info/configs.js | 26 +-
.../controllers/main/service/info/summary.js | 12 +-
ambari-web/app/controllers/main/service/item.js | 32 +-
.../service/manage_config_groups_controller.js | 4 +-
.../service/widgets/create/step2_controller.js | 8 +-
.../service/widgets/create/step3_controller.js | 20 +-
.../wizard/slave_component_groups_controller.js | 10 +-
.../app/controllers/wizard/step2_controller.js | 8 +-
.../app/controllers/wizard/step3_controller.js | 2 +-
.../app/controllers/wizard/step6_controller.js | 21 +-
.../app/controllers/wizard/step7_controller.js | 351 +-
.../app/controllers/wizard/step8_controller.js | 97 +-
ambari-web/app/data/HDP2.3/site_properties.js | 44 +-
ambari-web/app/data/HDP2/site_properties.js | 2 +-
ambari-web/app/mappers.js | 3 +-
.../mappers/alert_definition_summary_mapper.js | 3 +-
.../app/mappers/alert_definitions_mapper.js | 4 +
.../app/mappers/alert_instances_mapper.js | 1 +
.../mappers/configs/config_versions_mapper.js | 143 -
.../configs/service_config_version_mapper.js | 117 +
.../configs/stack_config_properties_mapper.js | 4 +-
ambari-web/app/mappers/configs/themes_mapper.js | 1 +
ambari-web/app/mappers/hosts_mapper.js | 2 +
.../mappers/service_config_version_mapper.js | 116 -
ambari-web/app/mappers/service_mapper.js | 2 +
ambari-web/app/messages.js | 11 +-
.../app/mixins/common/configs/configs_loader.js | 17 +-
.../app/mixins/common/configs/configs_saver.js | 8 +-
.../mixins/common/configs/enhanced_configs.js | 8 +-
ambari-web/app/mixins/common/serverValidator.js | 8 +-
.../main/service/configs/config_overridable.js | 11 +-
.../unit_convert/base_unit_convert_mixin.js | 2 +-
ambari-web/app/models.js | 1 -
ambari-web/app/models/alerts/alert_config.js | 5 +-
.../app/models/alerts/alert_definition.js | 16 +-
ambari-web/app/models/alerts/alert_instance.js | 11 +-
ambari-web/app/models/cluster_states.js | 5 +-
ambari-web/app/models/configs/config_group.js | 4 +-
.../app/models/configs/config_property.js | 236 -
ambari-web/app/models/configs/config_version.js | 34 -
.../configs/objects/service_config_category.js | 13 +-
.../configs/objects/service_config_property.js | 18 +-
.../models/configs/service_config_version.js | 25 +-
.../app/models/configs/stack_config_property.js | 2 +-
ambari-web/app/models/configs/theme/section.js | 8 +-
.../app/models/configs/theme/sub_section.js | 20 +-
.../app/models/configs/theme/sub_section_tab.js | 10 +-
ambari-web/app/models/configs/theme/tab.js | 5 +-
ambari-web/app/models/host.js | 5 +-
ambari-web/app/models/host_component.js | 33 +-
ambari-web/app/models/host_stack_version.js | 4 +-
ambari-web/app/models/root_service.js | 8 +-
ambari-web/app/models/service.js | 4 +-
ambari-web/app/models/stack_service.js | 25 +-
.../app/models/stack_service_component.js | 4 +-
.../models/stack_version/repository_version.js | 8 +-
ambari-web/app/models/stack_version/version.js | 4 +-
ambari-web/app/models/widget_property.js | 4 +-
ambari-web/app/router.js | 82 +-
ambari-web/app/routes/add_kerberos_routes.js | 34 +-
ambari-web/app/routes/main.js | 9 +-
ambari-web/app/styles/application.less | 6 +-
.../modal_popups/cluster_check_dialog.hbs | 24 +-
ambari-web/app/templates/common/settings.hbs | 55 +
.../main/host/details/deleteComponentPopup.hbs | 19 +-
.../main/service/all_services_actions.hbs | 8 +
ambari-web/app/utils/ajax/ajax.js | 6 +-
ambari-web/app/utils/blueprint.js | 55 +-
ambari-web/app/utils/config.js | 104 +-
.../app/utils/configs/config_initializer.js | 21 +-
ambari-web/app/utils/credentials.js | 18 +-
ambari-web/app/utils/ember_computed.js | 681 +-
ambari-web/app/utils/validator.js | 10 +
.../common/ajax_default_error_popup_body.js | 8 +-
.../app/views/common/chart/linear_time.js | 4 +-
ambari-web/app/views/common/chart/pie.js | 4 +-
.../views/common/configs/config_history_flow.js | 28 +-
.../app/views/common/configs/controls_view.js | 14 +-
.../notification_configs_view.js | 4 +-
.../views/common/configs/service_config_view.js | 3 +-
.../configs/service_configs_by_category_view.js | 6 +-
.../configs/widgets/config_widget_view.js | 8 +-
.../configs/widgets/plain_config_text_field.js | 4 +-
.../widgets/slider_config_widget_view.js | 43 +-
.../widgets/test_db_connection_widget_view.js | 22 +-
ambari-web/app/views/common/controls_view.js | 32 +-
.../app/views/common/form/spinner_input_view.js | 4 +-
.../common/modal_popups/cluster_check_popup.js | 107 +-
.../common/modal_popups/invalid_KDC_popup.js | 5 +-
.../app/views/common/rolling_restart_view.js | 17 +-
ambari-web/app/views/common/table_view.js | 4 +-
ambari-web/app/views/common/time_range.js | 8 +-
.../highAvailability/nameNode/step1_view.js | 4 +-
.../stack_upgrade/failed_hosts_modal_view.js | 4 +-
.../main/admin/stack_upgrade/services_view.js | 12 +-
.../admin/stack_upgrade/upgrade_wizard_view.js | 15 +-
.../main/admin/stack_upgrade/versions_view.js | 4 +-
.../app/views/main/alert_definitions_view.js | 8 +-
.../main/alerts/definition_details_view.js | 4 +-
.../views/main/dashboard/config_history_view.js | 18 +-
.../dashboard/widgets/cluster_metrics_widget.js | 4 +-
.../main/dashboard/widgets/flume_agent_live.js | 4 +-
.../views/main/dashboard/widgets/hbase_links.js | 4 +-
.../views/main/dashboard/widgets/hdfs_links.js | 4 +-
ambari-web/app/views/main/host.js | 8 +-
.../main/host/details/host_component_view.js | 2 +-
.../host_component_views/datanode_view.js | 30 +-
.../app/views/main/host/host_alerts_view.js | 4 +-
.../app/views/main/host/stack_versions_view.js | 4 +-
ambari-web/app/views/main/host/summary.js | 8 +-
ambari-web/app/views/main/menu.js | 4 +-
ambari-web/app/views/main/service/menu.js | 12 +-
.../views/main/service/reassign/step4_view.js | 14 +-
.../views/main/service/reassign/step6_view.js | 14 +-
.../app/views/main/service/services/hbase.js | 4 +-
.../app/views/main/service/services/storm.js | 4 +-
.../service/widgets/create/expression_view.js | 8 +-
ambari-web/app/views/wizard/step1_view.js | 4 +-
ambari-web/app/views/wizard/step9_view.js | 4 +-
.../global/cluster_controller_test.js | 42 +-
.../admin/kerberos/step4_controller_test.js | 4 +-
.../controllers/main/admin/kerberos_test.js | 4 +-
.../admin/serviceAccounts_controller_test.js | 82 -
.../admin/stack_and_upgrade_controller_test.js | 2 +-
.../test/controllers/main/host/details_test.js | 68 +-
.../test/controllers/main/service_test.js | 103 +
.../test/controllers/wizard/step2_test.js | 10 +-
.../test/controllers/wizard/step6_test.js | 10 +-
.../test/controllers/wizard/step7_test.js | 233 +-
.../test/controllers/wizard/step8_test.js | 202 +-
.../test/data/HDP2.2/site_properties_test.js | 2 +-
.../test/data/HDP2.3/site_properties_test.js | 5 +-
.../test/data/HDP2/site_properties_test.js | 2 +-
.../configs/config_versions_mapper_test.js | 119 -
.../service_config_version_mapper_test.js | 119 +
.../test/mappers/configs/themes_mapper_test.js | 1 -
.../test/models/alerts/alert_definition_test.js | 4 +-
.../test/models/configs/config_property_test.js | 66 -
ambari-web/test/models/host_component_test.js | 25 +
ambari-web/test/models/stack_service_test.js | 15 +-
ambari-web/test/utils/blueprint_test.js | 39 +-
ambari-web/test/utils/config_test.js | 119 +-
ambari-web/test/utils/ember_computed_test.js | 958 +-
.../common/configs/service_config_view_test.js | 16 +-
.../widgets/slider_config_widget_view_test.js | 58 +-
.../widgets/time_interval_spinner_view_test.js | 4 +-
.../modal_popups/cluster_check_popup_test.js | 271 +
.../stack_upgrade/upgrade_wizard_view_test.js | 8 +
ambari-web/test/views/main/service/item_test.js | 77 +-
.../ambari-scom-server/conf/ambari.properties | 1 -
.../org/apache/ambari/scom/AmbariServer.java | 2 +-
.../src/test/resources/ambari.properties | 3 +-
.../ambari/fast_hdfs_resource/Resource.java | 2 +-
contrib/views/capacity-scheduler/pom.xml | 5 +
.../capacityscheduler/PropertyValidator.java | 28 +-
.../PropertyValidatorTest.java | 34 +
.../view/hive/resources/files/FileService.java | 9 +-
.../jobs/ResultsPaginationController.java | 16 +-
.../hive/resources/uploads/UploadService.java | 5 +-
.../ui/hive-web/app/components/query-editor.js | 16 +-
.../hive-web/app/components/typeahead-widget.js | 15 +
.../ui/hive-web/app/controllers/index.js | 10 +-
.../hive-web/app/helpers/format-column-type.js | 39 +
.../ui/hive-web/app/services/database.js | 12 +-
.../resources/ui/hive-web/app/styles/app.scss | 5 +
.../hive-web/app/templates/databases-tree.hbs | 2 +-
.../ui/hive-web/app/templates/settings.hbs | 21 +-
.../ui/hive-web/app/templates/upload-table.hbs | 8 +-
.../ui/hive-web/app/utils/constants.js | 5 +
.../src/main/resources/ui/hive-web/bower.json | 4 +-
.../tests/unit/controllers/index-test.js | 50 +
.../vendor/codemirror/codemirror-min.js | 2 +-
.../hive/resources/files/FileServiceTest.java | 54 +
.../resources/ui/app/models/config_property.js | 3 +
.../ui/app/templates/common/config.hbs | 2 +-
dev-support/docker/docker/Dockerfile | 3 +-
docs/pom.xml | 8 +
794 files changed, 38718 insertions(+), 6469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index 7abaa04,b1e54de..e12e118
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@@ -17,19 -17,13 +17,20 @@@
*/
package org.apache.ambari.server.orm.entities;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
+ import java.util.Set;
import javax.persistence.CascadeType;
+import javax.persistence.CollectionTable;
import javax.persistence.Column;
+import javax.persistence.ElementCollection;
+import javax.persistence.Embeddable;
import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
@@@ -101,20 -94,12 +102,20 @@@ public class RepositoryVersionEntity
@Column(name = "repositories")
private String operatingSystems;
+ @Column(name = "repo_type", nullable = false, insertable = true, updatable = true)
+ @Enumerated(value = EnumType.STRING)
+ private RepositoryType type = RepositoryType.STANDARD;
+
@OneToMany(cascade = CascadeType.REMOVE, mappedBy = "repositoryVersion")
- private Collection<ClusterVersionEntity> clusterVersionEntities;
+ private Set<ClusterVersionEntity> clusterVersionEntities;
@OneToMany(cascade = CascadeType.REMOVE, mappedBy = "repositoryVersion")
- private Collection<HostVersionEntity> hostVersionEntities;
+ private Set<HostVersionEntity> hostVersionEntities;
+ @ElementCollection(targetClass = Component.class)
+ @CollectionTable(name = "repo_version_component", joinColumns = @JoinColumn(name = "repo_version_id"))
+ private List<Component> components = new ArrayList<>();
+
// ----- RepositoryVersionEntity -------------------------------------------------------
public RepositoryVersionEntity() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index 92df281,7ced845..fc1e274
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@@ -1219,9 -1221,10 +1221,10 @@@ public class ClusterImpl implements Clu
* UPGRADE_FAILED: at least one host in UPGRADE_FAILED
* UPGRADED: all hosts are UPGRADED
* UPGRADING: at least one host is UPGRADING, and the rest in UPGRADING|INSTALLED
- * INSTALLED: all hosts in INSTALLED -OR- INSTALLED and NOT_REQUIRED
+ * UPGRADING: at least one host is UPGRADED, and the rest in UPGRADING|INSTALLED
+ * INSTALLED: all hosts in INSTALLED
* INSTALL_FAILED: at least one host in INSTALL_FAILED
- * INSTALLING: all hosts in INSTALLING. Notice that if one host is CURRENT and another is INSTALLING, then the
+ * INSTALLING: all hosts in INSTALLING -or- INSTALLING and NOT_REQUIRED. Notice that if one host is CURRENT and another is INSTALLING, then the
* effective version will be OUT_OF_SYNC.
* OUT_OF_SYNC: otherwise
* @param stateToHosts Map from state to the collection of hosts with that state
@@@ -1252,15 -1262,22 +1262,24 @@@
if (stateToHosts.containsKey(RepositoryVersionState.INSTALLED) && stateToHosts.get(RepositoryVersionState.INSTALLED).size() == totalHosts) {
return RepositoryVersionState.INSTALLED;
}
- if (stateToHosts.containsKey(RepositoryVersionState.INSTALL_FAILED) && !stateToHosts.get(RepositoryVersionState.INSTALL_FAILED).isEmpty()) {
- return RepositoryVersionState.INSTALL_FAILED;
+ if (stateToHosts.containsKey(RepositoryVersionState.INSTALL_FAILED) &&
+ !stateToHosts.get(RepositoryVersionState.INSTALL_FAILED).isEmpty()) {
+ // Installation failed on some host(s). But
+ // cluster version state should transition to Install Failed only after
+ // all hosts have finished installation. Otherwise, UI will misbehave
+ // (hide progress dialog before installation is finished)
+ if (! stateToHosts.containsKey(RepositoryVersionState.INSTALLING) ||
+ stateToHosts.get(RepositoryVersionState.INSTALLING).isEmpty()) {
+ return RepositoryVersionState.INSTALL_FAILED;
+ }
}
- final int totalINSTALLING = stateToHosts.containsKey(RepositoryVersionState.INSTALLING) ? stateToHosts.get(RepositoryVersionState.INSTALLING).size() : 0;
- final int totalINSTALLED = stateToHosts.containsKey(RepositoryVersionState.INSTALLED) ? stateToHosts.get(RepositoryVersionState.INSTALLED).size() : 0;
- final int totalINSTALL_FAILED = stateToHosts.containsKey(RepositoryVersionState.INSTALL_FAILED) ? stateToHosts.get(RepositoryVersionState.INSTALL_FAILED).size() : 0;
- if (totalINSTALLING + totalINSTALLED + totalINSTALL_FAILED== totalHosts) {
+ int totalInstalling = stateToHosts.containsKey(RepositoryVersionState.INSTALLING) ? stateToHosts.get(RepositoryVersionState.INSTALLING).size() : 0;
+ int totalInstalled = stateToHosts.containsKey(RepositoryVersionState.INSTALLED) ? stateToHosts.get(RepositoryVersionState.INSTALLED).size() : 0;
+ int totalNotRequired = stateToHosts.containsKey(RepositoryVersionState.NOT_REQUIRED) ? stateToHosts.get(RepositoryVersionState.NOT_REQUIRED).size() : 0;
++ int totalInstallFailed = stateToHosts.containsKey(RepositoryVersionState.INSTALL_FAILED) ? stateToHosts.get(RepositoryVersionState.INSTALL_FAILED).size() : 0;
+
- if (totalInstalling + totalInstalled == totalHosts) {
++ if (totalInstalling + totalInstalled + totalInstallFailed == totalHosts) {
return RepositoryVersionState.INSTALLING;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ae63efd/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
----------------------------------------------------------------------