Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4DAC6200C00 for ; Wed, 18 Jan 2017 16:57:41 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4C3D8160B56; Wed, 18 Jan 2017 15:57:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 753E8160B53 for ; Wed, 18 Jan 2017 16:57:39 +0100 (CET) Received: (qmail 82580 invoked by uid 500); 18 Jan 2017 15:57:37 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 80685 invoked by uid 99); 18 Jan 2017 15:57:35 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jan 2017 15:57:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5420DFCAB; Wed, 18 Jan 2017 15:57:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Wed, 18 Jan 2017 15:58:23 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [50/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade archived-at: Wed, 18 Jan 2017 15:57:41 -0000 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/eb2c904e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eb2c904e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eb2c904e Branch: refs/heads/branch-dev-patch-upgrade Commit: eb2c904e1b526e1d581e8985e8e966e3d0ce1eb8 Parents: cd245c0 d7f1e8c Author: Nate Cole Authored: Wed Jan 18 10:57:13 2017 -0500 Committer: Nate Cole Committed: Wed Jan 18 10:57:13 2017 -0500 ---------------------------------------------------------------------- .../controllers/groups/GroupsEditCtrl.js | 6 +- .../ui/admin-web/app/scripts/i18n.config.js | 2 +- .../app/scripts/services/PermissionsSaver.js | 2 +- ambari-agent/pom.xml | 29 + .../java/org/apache/ambari/tools/zk/ZkAcl.java | 23 +- .../org/apache/ambari/tools/zk/ZkMigrator.java | 2 +- .../apache/ambari/tools/zk/ZkPathPattern.java | 114 + .../src/main/python/ambari_agent/ActionQueue.py | 15 +- .../src/main/python/ambari_agent/Controller.py | 51 +- .../src/main/python/ambari_agent/main.py | 17 +- ambari-agent/src/packages/tarball/all.xml | 49 +- .../apache/ambari/tools/zk/ZkMigratorTest.java | 45 +- .../test/python/ambari_agent/TestHeartbeat.py | 2 + .../src/test/python/ambari_agent/TestMain.py | 4 +- .../core/resources/zkmigrator.py | 2 +- .../libraries/functions/constants.py | 8 + .../libraries/functions/download_from_hdfs.py | 76 + .../libraries/functions/get_config.py | 45 + .../libraries/functions/security_commons.py | 37 + .../functions/setup_ranger_plugin_xml.py | 101 +- .../libraries/functions/solr_cloud_util.py | 18 +- .../libraries/providers/hdfs_resource.py | 177 +- .../libraries/resources/hdfs_resource.py | 11 +- .../libraries/script/script.py | 26 + .../org/apache/ambari/logfeeder/LogFeeder.java | 2 + .../apache/ambari/logfeeder/util/SSLUtil.java | 68 + .../src/main/scripts/run.sh | 2 +- .../main/webapp/libs/bower/select2/select2.js | 4 + .../other/daterangepicker/js/daterangepicker.js | 12 +- .../src/main/webapp/scripts/utils/Utils.js | 2255 +++++++++--------- .../troubleshoot/TroubleShootLayoutView.js | 748 +++--- .../logsearch/solr/AmbariSolrCloudCLI.java | 71 +- .../logsearch/solr/AmbariSolrCloudClient.java | 48 +- .../solr/AmbariSolrCloudClientBuilder.java | 6 - .../solr/commands/CopyZnodeZkCommand.java | 79 - .../solr/commands/CreateSaslUsersZkCommand.java | 3 +- .../solr/commands/SecureSolrZNodeZkCommand.java | 74 + .../solr/commands/SecureZNodeZkCommand.java | 19 +- .../ambari/logsearch/solr/util/AclUtils.java | 62 +- .../ambari-metrics/datasource.js | 36 +- ambari-server/conf/unix/ambari.properties | 2 + ambari-server/conf/unix/metrics.properties | 46 +- ambari-server/conf/windows/metrics.properties | 46 +- .../server/actionmanager/ActionScheduler.java | 18 +- .../actionmanager/ExecutionCommandWrapper.java | 2 +- .../apache/ambari/server/agent/ActionQueue.java | 31 +- .../resources/UpgradeResourceDefinition.java | 4 +- .../controller/AmbariActionExecutionHelper.java | 33 +- .../AmbariCustomCommandExecutionHelper.java | 8 +- .../controller/AmbariManagementController.java | 7 + .../AmbariManagementControllerImpl.java | 23 +- .../server/controller/ControllerModule.java | 2 + .../HostStackVersionResourceProvider.java | 117 +- .../QuickLinkArtifactResourceProvider.java | 22 + .../internal/UpgradeResourceProvider.java | 76 +- .../metrics/RestMetricsPropertyProvider.java | 2 +- .../controller/utilities/KerberosChecker.java | 51 +- .../utilities/LoginContextHelper.java | 56 + .../upgrade/HostVersionOutOfSyncListener.java | 101 +- .../CachedRoleCommandOrderProvider.java | 23 +- .../server/metadata/RoleCommandOrder.java | 171 +- .../server/metrics/system/MetricsService.java | 15 +- .../server/metrics/system/MetricsSource.java | 12 +- .../system/impl/AbstractMetricsSource.java | 10 +- .../system/impl/AmbariMetricSinkImpl.java | 18 +- .../system/impl/AmbariPerformanceMonitor.java | 141 ++ .../system/impl/DatabaseMetricsSource.java | 199 ++ .../metrics/system/impl/JvmMetricsSource.java | 38 +- .../system/impl/MetricsConfiguration.java | 38 + .../metrics/system/impl/MetricsServiceImpl.java | 59 +- .../dispatchers/AmbariSNMPDispatcher.java | 37 +- .../server/orm/entities/ArtifactEntity.java | 6 +- .../server/security/AmbariEntryPoint.java | 30 +- .../serveraction/upgrades/ConfigureAction.java | 142 +- .../upgrades/UpgradeUserKerberosDescriptor.java | 130 +- .../server/stack/ModuleFileUnmarshaller.java | 11 + .../ambari/server/stageplanner/RoleGraph.java | 120 +- .../org/apache/ambari/server/state/Cluster.java | 8 + .../ambari/server/state/ConfigHelper.java | 9 +- .../ambari/server/state/UpgradeContext.java | 43 +- .../server/state/UpgradeContextFactory.java | 47 + .../ambari/server/state/UpgradeHelper.java | 44 +- .../server/state/ValueAttributesInfo.java | 23 + .../server/state/cluster/ClusterImpl.java | 25 +- .../ambari/server/state/quicklinks/Link.java | 11 + .../DefaultQuickLinkVisibilityController.java | 213 ++ .../QuickLinkVisibilityController.java | 37 + .../QuickLinkVisibilityControllerFactory.java | 57 + .../quicklinksprofile/QuickLinksProfile.java | 10 +- .../QuickLinksProfileEvaluationException.java | 31 + .../QuickLinksProfileEvaluator.java | 202 -- .../QuickLinksProfileEvaluatorException.java | 27 - .../ShowAllLinksVisibilityController.java | 38 + .../state/stack/StackRoleCommandOrder.java | 21 +- .../ambari/server/state/stack/UpgradePack.java | 67 +- .../upgrade/ConfigUpgradeChangeDefinition.java | 268 ++- .../state/stack/upgrade/ConfigureTask.java | 50 +- .../state/stack/upgrade/HostOrderGrouping.java | 144 +- .../state/stack/upgrade/StageWrapper.java | 11 + .../stack/upgrade/StageWrapperBuilder.java | 6 +- .../server/state/stack/upgrade/TaskWrapper.java | 14 +- .../server/upgrade/SchemaUpgradeUtil.java | 76 + .../server/upgrade/UpgradeCatalog250.java | 330 +++ .../apache/ambari/server/view/ClusterImpl.java | 9 + .../ambari/server/view/RemoteAmbariCluster.java | 30 + .../apache/ambari/server/view/ViewRegistry.java | 29 +- .../python/ambari_server/serverConfiguration.py | 5 +- .../main/python/ambari_server/serverSetup.py | 6 + .../src/main/python/ambari_server/utils.py | 6 + .../package/scripts/accumulo_script.py | 14 +- .../configuration/infra-solr-client-log4j.xml | 4 +- .../0.1.0/configuration/infra-solr-log4j.xml | 18 +- .../0.1.0/properties/solr-log4j.properties.j2 | 4 +- .../0.1.0/configuration/ams-hbase-log4j.xml | 8 +- .../0.1.0/configuration/ams-log4j.xml | 4 +- .../0.1.0/configuration/ams-ssl-client.xml | 9 + .../HDP/grafana-hdfs-topn.json | 846 +++++++ .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 2 +- .../0.1.0/package/scripts/metrics_grafana.py | 2 +- .../0.1.0/package/scripts/params.py | 3 + .../ATLAS/0.1.0.2.3/package/scripts/metadata.py | 13 + .../ATLAS/0.1.0.2.3/package/scripts/params.py | 81 +- .../0.1.0.2.3/package/scripts/service_check.py | 20 +- .../package/scripts/setup_ranger_atlas.py | 4 +- .../0.9.2/configuration/druid-historical.xml | 4 +- .../0.9.2/configuration/druid-logrotate.xml | 24 +- .../0.9.2/configuration/druid-middlemanager.xml | 2 +- .../DRUID/0.9.2/package/scripts/druid.py | 36 +- .../DRUID/0.9.2/package/scripts/params.py | 5 + .../0.5.0.2.1/configuration/falcon-log4j.xml | 46 + .../FALCON/0.5.0.2.1/package/scripts/falcon.py | 17 +- .../0.5.0.2.1/package/scripts/params_linux.py | 8 + .../0.96.0.2.0/package/scripts/params_linux.py | 165 +- .../package/scripts/setup_ranger_hbase.py | 4 +- .../common-services/HDFS/2.1.0.2.0/metainfo.xml | 3 + .../HDFS/2.1.0.2.0/package/scripts/datanode.py | 5 +- .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 59 +- .../2.1.0.2.0/package/scripts/journalnode.py | 5 +- .../HDFS/2.1.0.2.0/package/scripts/namenode.py | 32 +- .../2.1.0.2.0/package/scripts/params_linux.py | 166 +- .../2.1.0.2.0/package/scripts/service_check.py | 24 +- .../package/scripts/setup_ranger_hdfs.py | 44 +- .../configuration/ranger-hdfs-audit.xml | 94 - .../ranger-hdfs-plugin-properties.xml | 18 +- .../3.0.0.3.0/package/scripts/hdfs_namenode.py | 58 +- .../3.0.0.3.0/package/scripts/journalnode.py | 5 +- .../HDFS/3.0.0.3.0/package/scripts/namenode.py | 36 +- .../3.0.0.3.0/package/scripts/service_check.py | 24 +- .../HDFS/3.0.0.3.0/service_advisor.py | 602 +++++ .../0.12.0.2.0/configuration/hive-log4j.xml | 25 +- .../0.12.0.2.0/configuration/webhcat-log4j.xml | 23 + .../package/alerts/alert_hive_metastore.py | 2 +- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 32 +- .../package/scripts/hive_interactive.py | 15 +- .../0.12.0.2.0/package/scripts/hive_server.py | 20 + .../package/scripts/hive_server_interactive.py | 4 + .../0.12.0.2.0/package/scripts/params_linux.py | 175 +- .../package/scripts/setup_ranger_hive.py | 6 +- .../HIVE/0.12.0.2.0/package/scripts/webhcat.py | 2 +- .../package/templates/zkmigrator_jaas.conf.j2 | 26 + .../KAFKA/0.8.1/package/scripts/params.py | 127 +- .../0.8.1/package/scripts/setup_ranger_kafka.py | 10 +- .../0.9.0/configuration/ranger-kafka-audit.xml | 32 +- .../ranger-kafka-plugin-properties.xml | 14 +- .../ranger-kafka-policymgr-ssl.xml | 12 +- .../configuration/ranger-kafka-security.xml | 18 +- .../ranger-knox-plugin-properties.xml | 12 +- .../KNOX/0.5.0.2.2/package/scripts/knox.py | 35 +- .../0.5.0.2.2/package/scripts/params_linux.py | 182 +- .../0.5.0.2.2/package/scripts/params_windows.py | 2 +- .../package/scripts/setup_ranger_knox.py | 14 +- .../configuration/logfeeder-ambari-config.xml | 2 +- .../logfeeder-custom-logsearch-conf.xml | 6 +- .../0.5.0/configuration/logfeeder-env.xml | 38 +- .../0.5.0/configuration/logfeeder-log4j.xml | 28 +- .../configuration/logfeeder-output-config.xml | 4 +- .../configuration/logfeeder-properties.xml | 8 +- .../configuration/logfeeder-system_log-env.xml | 2 + .../logsearch-audit_logs-solrconfig.xml | 2 +- .../0.5.0/configuration/logsearch-log4j.xml | 58 +- .../LOGSEARCH/0.5.0/metainfo.xml | 22 + .../LOGSEARCH/0.5.0/package/scripts/params.py | 1 + .../0.5.0/package/scripts/setup_logfeeder.py | 20 + .../0.5.0/package/scripts/setup_logsearch.py | 6 +- .../properties/input.config-ambari.json.j2 | 10 +- .../0.5.0/properties/logfeeder-env.sh.j2 | 2 - .../0.5.0/properties/logsearch-log4j.xml.j2 | 18 +- .../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 24 +- .../4.0.0.2.0/package/scripts/oozie_server.py | 11 +- .../4.0.0.2.0/package/scripts/params_linux.py | 19 +- .../package/templates/zkmigrator_jaas.conf.j2 | 26 + .../4.2.0.2.3/configuration/oozie-site.xml | 1 + .../OOZIE/4.2.0.2.3/kerberos.json | 3 +- .../OOZIE/4.2.0.2.3/metainfo.xml | 1 + .../4.2.0.2.5/configuration/oozie-site.xml | 2 +- .../RANGER/0.4.0/package/scripts/params.py | 9 +- .../0.4.0/package/scripts/setup_ranger_xml.py | 6 +- .../0.5.0/configuration/ranger-ugsync-site.xml | 10 +- .../RANGER/0.6.0/configuration/admin-log4j.xml | 24 + .../0.6.0/configuration/tagsync-log4j.xml | 23 + .../0.6.0/configuration/usersync-log4j.xml | 23 + .../RANGER/0.7.0/configuration/ranger-env.xml | 28 + .../0.5.0.2.3/configuration/kms-log4j.xml | 46 + .../configuration/ranger-kms-security.xml | 6 + .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 2 +- .../0.5.0.2.3/package/scripts/params.py | 7 +- .../2.0.0/package/scripts/livy2_server.py | 149 ++ .../2.0.0/package/scripts/livy2_service.py | 48 + .../SPARK2/2.0.0/package/scripts/params.py | 70 +- .../2.0.0/package/scripts/service_check.py | 31 +- .../SPARK2/2.0.0/package/scripts/setup_livy2.py | 80 + .../2.0.0/package/scripts/status_params.py | 6 + .../SQOOP/1.4.4.2.0/package/scripts/sqoop.py | 21 +- .../0.10.0/configuration/ranger-storm-audit.xml | 32 +- .../ranger-storm-policymgr-ssl.xml | 12 +- .../configuration/ranger-storm-security.xml | 18 +- .../configuration/storm-cluster-log4j.xml | 25 +- .../0.10.0/configuration/storm-worker-log4j.xml | 75 +- .../STORM/0.9.1/package/scripts/params_linux.py | 171 +- .../0.9.1/package/scripts/setup_ranger_storm.py | 39 +- .../ranger-storm-plugin-properties.xml | 71 + .../1.0.1/configuration/storm-cluster-log4j.xml | 25 +- .../1.0.1/configuration/storm-worker-log4j.xml | 75 +- .../YARN/2.1.0.2.0/kerberos.json | 13 +- .../2.1.0.2.0/package/scripts/params_linux.py | 219 +- .../package/scripts/resourcemanager.py | 4 +- .../package/scripts/setup_ranger_yarn.py | 4 +- .../YARN/3.0.0.3.0/configuration/yarn-site.xml | 12 - .../YARN/3.0.0.3.0/kerberos.json | 17 +- .../3.0.0.3.0/package/scripts/params_linux.py | 4 +- .../package/scripts/resourcemanager.py | 2 - .../0.6.0.2.5/configuration/zeppelin-env.xml | 87 - .../configuration/zeppelin-log4j-properties.xml | 37 + .../configuration/zeppelin-shiro-ini.xml | 63 + .../ZEPPELIN/0.6.0.2.5/metainfo.xml | 2 + .../0.6.0.2.5/package/scripts/master.py | 2 +- .../0.6.0.2.5/package/scripts/params.py | 4 +- .../3.4.5/package/scripts/zookeeper_server.py | 9 +- .../ZOOKEEPER/3.4.9/service_advisor.py | 168 ++ .../src/main/resources/configuration-schema.xsd | 8 + .../custom_actions/scripts/ru_execute_tasks.py | 2 +- .../src/main/resources/scripts/stack_advisor.py | 14 +- .../HDFS/package/scripts/hdfs_namenode.py | 3 +- .../stacks/BIGTOP/0.8/services/stack_advisor.py | 184 +- .../2.0.6/hooks/after-INSTALL/scripts/params.py | 3 +- .../HDP/2.0.6/properties/stack_features.json | 45 +- .../stacks/HDP/2.0.6/services/stack_advisor.py | 819 ++----- .../stacks/HDP/2.1/services/OOZIE/metainfo.xml | 1 + .../stacks/HDP/2.1/services/stack_advisor.py | 94 +- .../ranger-hbase-plugin-properties.xml | 10 +- .../ranger-hdfs-plugin-properties.xml | 12 +- .../services/HIVE/configuration/hive-site.xml | 1 + .../ranger-hive-plugin-properties.xml | 10 +- .../ranger-knox-plugin-properties.xml | 2 +- .../stacks/HDP/2.2/services/YARN/kerberos.json | 17 +- .../stacks/HDP/2.2/services/stack_advisor.py | 176 +- .../HDP/2.3.ECS/services/YARN/kerberos.json | 17 +- .../HBASE/configuration/ranger-hbase-audit.xml | 32 +- .../ranger-hbase-policymgr-ssl.xml | 12 +- .../configuration/ranger-hbase-security.xml | 20 +- .../configuration/ranger-hdfs-policymgr-ssl.xml | 12 +- .../HDFS/configuration/ranger-hdfs-security.xml | 20 +- .../HIVE/configuration/ranger-hive-audit.xml | 32 +- .../configuration/ranger-hive-policymgr-ssl.xml | 12 +- .../HIVE/configuration/ranger-hive-security.xml | 20 +- .../ranger-kafka-policymgr-ssl.xml | 4 +- .../KNOX/configuration/ranger-knox-audit.xml | 32 +- .../configuration/ranger-knox-policymgr-ssl.xml | 12 +- .../KNOX/configuration/ranger-knox-security.xml | 18 +- .../ranger-storm-policymgr-ssl.xml | 4 +- .../configuration/ranger-storm-security.xml | 2 +- .../YARN/configuration/ranger-yarn-audit.xml | 32 +- .../ranger-yarn-plugin-properties.xml | 12 +- .../configuration/ranger-yarn-policymgr-ssl.xml | 12 +- .../YARN/configuration/ranger-yarn-security.xml | 18 +- .../stacks/HDP/2.3/services/YARN/kerberos.json | 17 +- .../stacks/HDP/2.3/services/stack_advisor.py | 36 +- .../stacks/HDP/2.3/upgrades/config-upgrade.xml | 153 ++ .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml | 2 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 99 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 96 +- .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 104 +- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 13 + .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 58 +- .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 57 +- .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 13 + .../stacks/HDP/2.4/upgrades/config-upgrade.xml | 179 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml | 2 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 105 +- .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 99 +- .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 9 + .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 49 +- .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 50 +- .../stacks/HDP/2.5/role_command_order.json | 6 + .../ATLAS/configuration/ranger-atlas-audit.xml | 6 +- .../ranger-atlas-plugin-properties.xml | 58 +- .../ranger-atlas-policymgr-ssl.xml | 12 +- .../configuration/ranger-atlas-security.xml | 20 +- .../ranger-hbase-plugin-properties.xml | 71 + .../ranger-hdfs-plugin-properties.xml | 50 +- .../HIVE/configuration/hive-interactive-env.xml | 22 +- .../configuration/hive-interactive-site.xml | 15 +- .../HIVE/configuration/hivemetastore-site.xml | 7 +- .../hiveserver2-interactive-site.xml | 7 +- .../HIVE/configuration/hiveserver2-site.xml | 7 +- .../HIVE/configuration/llap-daemon-log4j.xml | 25 +- .../ranger-hive-plugin-properties.xml | 71 + .../HIVE/configuration/ranger-hive-security.xml | 2 +- .../HIVE/configuration/tez-interactive-site.xml | 2 +- .../ranger-kafka-plugin-properties.xml | 71 + .../ranger-knox-plugin-properties.xml | 71 + .../ranger-storm-policymgr-ssl.xml | 4 +- .../configuration/ranger-storm-security.xml | 2 +- .../ranger-yarn-plugin-properties.xml | 71 + .../stacks/HDP/2.5/services/YARN/kerberos.json | 17 +- .../stacks/HDP/2.5/services/stack_advisor.py | 1498 ++++++------ .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 227 ++ .../HDP/2.5/upgrades/host-ordered-upgrade.xml | 597 ----- .../HDP/2.5/upgrades/host-upgrade-2.5.xml | 593 +++++ .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 2 + .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 123 +- .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 9 + .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 68 + .../stacks/HDP/2.6/services/ATLAS/metainfo.xml | 4 +- .../HIVE/configuration/hive-interactive-env.xml | 22 + .../configuration/hive-interactive-site.xml | 19 +- .../services/KNOX/configuration/topology.xml | 164 ++ .../stacks/HDP/2.6/services/OOZIE/metainfo.xml | 3 + .../stacks/HDP/2.6/services/SLIDER/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/SPARK/metainfo.xml | 2 +- .../SPARK2/configuration/livy2-conf.xml | 82 + .../services/SPARK2/configuration/livy2-env.xml | 95 + .../configuration/livy2-log4j-properties.xml | 42 + .../configuration/livy2-spark-blacklist.xml | 52 + .../HDP/2.6/services/SPARK2/kerberos.json | 126 + .../stacks/HDP/2.6/services/SPARK2/metainfo.xml | 95 +- .../stacks/HDP/2.6/services/SQOOP/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/STORM/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/TEZ/metainfo.xml | 2 +- .../stacks/HDP/2.6/services/YARN/metainfo.xml | 2 +- .../ZEPPELIN/configuration/zeppelin-env.xml | 182 ++ .../HDP/2.6/services/ZEPPELIN/metainfo.xml | 2 +- .../HDP/2.6/services/ZOOKEEPER/metainfo.xml | 2 +- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 34 + .../HDP/2.6/upgrades/host-ordered-upgrade.xml | 573 ----- .../HDP/2.6/upgrades/host-upgrade-2.6.xml | 562 +++++ .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 2 + .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 7 + .../3.0/hooks/after-INSTALL/scripts/params.py | 3 +- .../HDP/3.0/properties/stack_features.json | 3 +- .../stacks/HDP/3.0/role_command_order.json | 149 ++ .../stacks/HDPWIN/2.1/services/stack_advisor.py | 113 +- .../stacks/HDPWIN/2.2/services/stack_advisor.py | 99 +- .../stacks/PERF/1.0/services/YARN/kerberos.json | 13 +- .../main/resources/stacks/service_advisor.py | 65 +- .../src/main/resources/stacks/stack_advisor.py | 1075 ++++++++- .../src/main/resources/upgrade-config.xsd | 30 +- .../src/main/resources/upgrade-pack.xsd | 14 +- .../webapp/WEB-INF/spring-security.xml | 1 + .../actionmanager/TestActionScheduler.java | 5 +- .../ambari/server/agent/AgentResourceTest.java | 3 + .../UpgradeResourceDefinitionTest.java | 7 +- .../AmbariManagementControllerTest.java | 2 +- .../server/controller/KerberosHelperTest.java | 6 + .../ActiveWidgetLayoutResourceProviderTest.java | 3 + .../HostStackVersionResourceProviderTest.java | 96 + .../QuickLinkArtifactResourceProviderTest.java | 198 ++ .../StackUpgradeConfigurationMergeTest.java | 6 +- .../UpgradeResourceProviderHDP22Test.java | 2 + .../internal/UpgradeResourceProviderTest.java | 147 +- .../UserAuthorizationResourceProviderTest.java | 3 + .../internal/UserResourceProviderTest.java | 3 + .../metrics/JMXPropertyProviderTest.java | 7 +- .../utilities/KerberosCheckerTest.java | 43 +- .../HostVersionOutOfSyncListenerTest.java | 121 +- .../server/metadata/RoleCommandOrderTest.java | 64 + .../ambari/server/metadata/RoleGraphTest.java | 73 + .../system/impl/JvmMetricsSourceTest.java | 36 - .../metric/system/impl/MetricsServiceTest.java | 20 +- .../metric/system/impl/MetricsSourceTest.java | 171 ++ .../system/impl/TestAmbariMetricsSinkImpl.java | 1 + .../metric/system/impl/TestMetricsSource.java | 13 +- .../dispatchers/AmbariSNMPDispatcherTest.java | 13 + .../server/security/AmbariEntryPointTest.java | 88 + .../AmbariBasicAuthenticationFilterTest.java | 37 +- .../upgrades/ConfigureActionTest.java | 147 +- .../UpgradeUserKerberosDescriptorTest.java | 205 ++ .../ambari/server/state/UpgradeHelperTest.java | 74 +- .../cluster/ClusterEffectiveVersionTest.java | 4 + .../server/state/cluster/ClusterTest.java | 5 +- .../state/quicklinksprofile/EvaluatorTest.java | 203 -- .../quicklinksprofile/FilterEvaluatorTest.java | 218 ++ ...uickLinkVisibilityControllerFactoryTest.java | 82 + .../QuickLinkVisibilityControllerTest.java | 181 ++ .../QuickLinksProfileEvaluatorTest.java | 168 -- .../QuickLinksProfileParserTest.java | 8 +- .../state/stack/UpgradePackParsingTest.java | 92 + .../server/state/stack/UpgradePackTest.java | 168 +- .../server/upgrade/UpgradeCatalog222Test.java | 4 +- .../server/upgrade/UpgradeCatalog250Test.java | 936 +++++++- .../view/persistence/DataStoreImplTest.java | 110 +- .../src/test/python/TestStackAdvisor.py | 52 +- .../AMBARI_METRICS/test_metrics_collector.py | 2 +- .../AMBARI_METRICS/test_metrics_grafana.py | 2 +- .../python/stacks/2.0.6/HDFS/test_namenode.py | 58 +- .../stacks/2.0.6/HDFS/test_service_check.py | 16 +- .../stacks/2.0.6/HIVE/test_hive_client.py | 9 +- .../stacks/2.0.6/HIVE/test_hive_metastore.py | 13 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 9 +- .../stacks/2.0.6/HIVE/test_webhcat_server.py | 7 +- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 13 +- .../stacks/2.0.6/common/test_stack_advisor.py | 425 +++- .../stacks/2.0.6/configs/altfs_plus_hdfs.json | 6 +- .../python/stacks/2.0.6/configs/default.json | 12 +- .../stacks/2.0.6/configs/default_client.json | 3 +- .../2.0.6/configs/default_hive_nn_ha.json | 5 +- .../2.0.6/configs/default_hive_nn_ha_2.json | 5 +- .../2.0.6/configs/default_hive_non_hdfs.json | 5 +- .../2.0.6/configs/default_no_install.json | 5 +- .../2.0.6/configs/default_with_bucket.json | 4 +- .../2.0.6/configs/ha_bootstrap_active_node.json | 2 +- .../configs/ha_bootstrap_standby_node.json | 2 +- ...ha_bootstrap_standby_node_initial_start.json | 2 +- ...dby_node_initial_start_dfs_nameservices.json | 2 +- .../python/stacks/2.0.6/configs/ha_default.json | 4 +- .../python/stacks/2.0.6/configs/ha_secured.json | 2 +- .../python/stacks/2.0.6/configs/hbase-2.2.json | 4 +- .../2.0.6/configs/hbase-rs-2.2-phoenix.json | 4 +- .../stacks/2.0.6/configs/hbase-rs-2.2.json | 4 +- .../test/python/stacks/2.0.6/configs/nn_eu.json | 2 +- .../python/stacks/2.0.6/configs/nn_ru_lzo.json | 2 +- .../python/stacks/2.0.6/configs/secured.json | 14 +- .../stacks/2.0.6/configs/secured_client.json | 3 +- .../stacks/2.1/FALCON/test_falcon_client.py | 6 + .../stacks/2.1/FALCON/test_falcon_server.py | 18 + .../stacks/2.1/HIVE/test_hive_metastore.py | 5 + .../stacks/2.1/common/test_stack_advisor.py | 7 +- .../stacks/2.1/configs/default-storm-start.json | 2 +- .../test/python/stacks/2.1/configs/default.json | 11 +- .../stacks/2.1/configs/secured-storm-start.json | 2 +- .../test/python/stacks/2.1/configs/secured.json | 5 +- .../stacks/2.2/common/test_stack_advisor.py | 140 +- .../2.2/common/test_stack_advisor_perf.py | 22 +- .../test/python/stacks/2.2/configs/default.json | 6 +- .../stacks/2.2/configs/falcon-upgrade.json | 7 +- .../python/stacks/2.2/configs/hive-upgrade.json | 3 +- .../2.2/configs/pig-service-check-secure.json | 15 +- .../stacks/2.3/ATLAS/test_metadata_server.py | 8 + .../stacks/2.3/common/test_stack_advisor.py | 38 +- .../stacks/2.4/LOGSEARCH/test_logfeeder.py | 20 + .../test/python/stacks/2.4/configs/default.json | 4 +- .../stacks/2.5/ATLAS/test_atlas_server.py | 2 + .../stacks/2.5/RANGER/test_ranger_admin.py | 6 +- .../stacks/2.5/RANGER/test_ranger_tagsync.py | 2 +- .../stacks/2.5/RANGER/test_ranger_usersync.py | 2 +- .../stacks/2.5/RANGER_KMS/test_kms_server.py | 4 +- .../stacks/2.5/ZEPPELIN/test_zeppelin_master.py | 26 +- .../stacks/2.5/common/test_stack_advisor.py | 89 +- .../test/python/stacks/2.5/configs/default.json | 26 +- .../python/stacks/2.5/configs/hsi_default.json | 3 +- .../test/python/stacks/2.5/configs/hsi_ha.json | 3 +- .../test/python/stacks/2.5/configs/secured.json | 18 +- .../test/python/stacks/2.6/DRUID/test_druid.py | 101 +- .../stacks/2.6/RANGER/test_ranger_admin.py | 6 +- .../stacks/2.6/RANGER/test_ranger_tagsync.py | 2 +- .../stacks/2.6/SPARK2/test_spark_livy2.py | 120 + .../test/python/stacks/2.6/configs/default.json | 38 +- .../resources/example_quicklinks_profile.json | 9 + .../inconsistent_quicklinks_profile_2.json | 13 + .../test_kerberos_descriptor_2_1_3.json | 13 +- .../src/test/resources/metrics.properties | 5 +- .../HDP/2.1.1/services/HBASE/metainfo.xml | 44 + .../HDP/2.1.1/services/STORM/metainfo.xml | 1 + .../HDP/2.1.1/upgrades/upgrade_bucket_test.xml | 4 + .../upgrades/upgrade_component_tasks_test.xml | 133 ++ .../HDP/2.1.1/upgrades/upgrade_direction.xml | 5 + .../upgrades/upgrade_nonrolling_new_stack.xml | 6 + .../stacks/HDP/2.1.1/upgrades/upgrade_test.xml | 8 + .../HDP/2.1.1/upgrades/upgrade_test_checks.xml | 6 + .../HDP/2.1.1/upgrades/upgrade_test_partial.xml | 8 + .../HDP/2.1.1/upgrades/upgrade_to_new_stack.xml | 10 +- .../stacks/HDP/2.2.0/role_command_order.json | 5 + .../HDP/2.2.0/services/STORM/metainfo.xml | 37 + .../stacks/HDP/2.2.0/upgrades/upgrade_test.xml | 7 + .../HDP/2.2.0/upgrades/upgrade_test_15388.xml | 7 + .../HDP/2.2.0/upgrades/upgrade_test_checks.xml | 6 + .../upgrades/upgrade_test_host_ordered.xml | 2 + .../upgrades/upgrade_test_skip_failures.xml | 2 + .../HDP/2.2.0/upgrades/upgrade_test_15388.xml | 7 + .../org/apache/ambari/view/cluster/Cluster.java | 6 + .../data/stacks/HDP-2.1/service_components.json | 13 +- ambari-web/app/assets/test/tests.js | 2 + ambari-web/app/controllers/experimental.js | 2 + .../rangerAdmin/step3_controller.js | 43 +- .../rangerAdmin/step4_controller.js | 2 +- .../rangerAdmin/wizard_controller.js | 2 + .../main/admin/stack_and_upgrade_controller.js | 7 +- .../alerts/definition_details_controller.js | 24 +- .../alerts/manage_alert_groups_controller.js | 194 +- .../manage_alert_notifications_controller.js | 106 +- ambari-web/app/controllers/main/host/details.js | 29 +- .../controllers/main/service/info/configs.js | 10 +- .../controllers/main/service/info/summary.js | 9 +- ambari-web/app/controllers/main/service/item.js | 28 +- .../main/service/reassign/step1_controller.js | 78 +- .../main/service/reassign/step3_controller.js | 663 +++++ .../main/service/reassign/step4_controller.js | 629 +---- .../main/service/reassign_controller.js | 47 +- ambari-web/app/controllers/wizard.js | 2 +- .../app/controllers/wizard/step0_controller.js | 3 + .../app/controllers/wizard/step4_controller.js | 22 +- .../app/controllers/wizard/step7_controller.js | 8 +- .../app/controllers/wizard/step8_controller.js | 93 +- .../configs/services/ambari_infra_properties.js | 28 + .../configs/services/logsearch_properties.js | 84 + .../app/data/configs/wizards/secure_mapping.js | 12 +- .../app/mappers/alert_definitions_mapper.js | 16 +- ambari-web/app/mappers/stack_service_mapper.js | 3 - ambari-web/app/messages.js | 30 +- .../mixins/common/configs/enhanced_configs.js | 8 +- .../configs/component_actions_by_configs.js | 19 +- .../wizard/wizardDeployProgressController.js | 2 +- ambari-web/app/models/alerts/alert_config.js | 4 +- ambari-web/app/models/alerts/alert_group.js | 2 +- .../app/models/alerts/alert_notification.js | 4 +- .../models/configs/objects/service_config.js | 1 + .../configs/objects/service_config_property.js | 8 +- .../app/models/configs/theme/config_action.js | 2 + ambari-web/app/models/configs/theme/tab.js | 9 +- ambari-web/app/routes/main.js | 5 + .../app/routes/ra_high_availability_routes.js | 4 + ambari-web/app/routes/reassign_master_routes.js | 24 +- ambari-web/app/styles/application.less | 26 +- .../app/styles/theme/bootstrap-ambari.css | 43 +- ambari-web/app/styles/wizard.less | 113 +- .../common/configs/widgets/controls.hbs | 8 +- .../modal_popups/dependent_configs_list.hbs | 17 +- .../common/modal_popups/select_groups_popup.hbs | 2 +- .../highAvailability/journalNode/step2.hbs | 65 +- .../highAvailability/rangerAdmin/step1.hbs | 6 +- .../highAvailability/rangerAdmin/step3.hbs | 8 +- .../templates/main/service/add_host_popup.hbs | 17 +- .../templates/main/service/reassign/step3.hbs | 36 +- ambari-web/app/templates/wizard/step0.hbs | 4 +- ambari-web/app/templates/wizard/step1.hbs | 326 ++- ambari-web/app/templates/wizard/step2.hbs | 120 +- ambari-web/app/templates/wizard/step3.hbs | 45 +- ambari-web/app/utils/ajax/ajax.js | 15 +- ambari-web/app/utils/configs/theme/theme.js | 6 +- ambari-web/app/utils/ember_computed.js | 82 + ambari-web/app/views/common/controls_view.js | 1 + .../highAvailability/rangerAdmin/step3_view.js | 6 +- .../admin/stack_upgrade/upgrade_history_view.js | 4 +- .../main/alerts/definition_details_view.js | 4 +- .../main/host/details/host_component_view.js | 12 +- ambari-web/app/views/main/service/menu.js | 4 +- .../views/main/service/reassign/step3_view.js | 4 +- .../views/main/service/reassign/step5_view.js | 4 +- ambari-web/app/views/wizard/step2_view.js | 7 +- .../test/aliases/computed/existsInByKey.js | 59 + ambari-web/test/aliases/computed/filterBy.js | 2 +- .../test/aliases/computed/ifThenElseByKeys.js | 65 + .../test/aliases/computed/notExistsInByKey.js | 59 + ambari-web/test/app_test.js | 8 +- .../journalNode/step4_controller_test.js | 2 +- .../rangerAdmin/step3_controller_test.js | 114 + .../resourceManager/step3_controller_test.js | 22 +- .../admin/stack_and_upgrade_controller_test.js | 4 - .../manage_alert_groups_controller_test.js | 57 + ...anage_alert_notifications_controller_test.js | 10 + .../test/controllers/main/host/details_test.js | 50 +- .../main/service/info/config_test.js | 15 +- .../test/controllers/main/service/item_test.js | 36 + .../service/reassign/step1_controller_test.js | 17 +- .../service/reassign/step3_controller_test.js | 634 +++++ .../service/reassign/step4_controller_test.js | 646 +---- .../test/controllers/wizard/step4_test.js | 90 +- .../test/controllers/wizard/step8_test.js | 28 +- ambari-web/test/init_computed_aliases.js | 3 + .../common/configs/enhanced_configs_test.js | 22 + .../test/models/alerts/alert_config_test.js | 21 + .../test/models/alerts/alert_group_test.js | 25 + .../models/alerts/alert_notification_test.js | 50 + .../objects/service_config_property_test.js | 55 +- .../models/configs/theme/sub_section_test.js | 2 + .../test/models/configs/theme/tab_test.js | 2 + ambari-web/test/utils/config_test.js | 10 +- .../test/utils/configs/theme/theme_test.js | 48 +- ambari-web/test/utils/ember_computed_test.js | 114 +- .../main/alerts/definition_details_view_test.js | 32 +- .../host/details/host_component_view_test.js | 40 +- ambari-web/test/views/main/service/menu_test.js | 15 + .../ambari/fast_hdfs_resource/Resource.java | 63 +- .../ambari/fast_hdfs_resource/Runner.java | 20 +- .../HDF/2.0/properties/stack_features.json | 3 +- .../ui/app/components/capacityInput.js | 25 +- .../resources/ui/app/components/pathInput.js | 3 +- .../src/main/resources/ui/app/serializers.js | 8 +- .../resources/ui/app/styles/application.less | 10 +- .../ui/app/templates/capacityEditForm.hbs | 8 +- .../templates/components/editLabelCapacity.hbs | 4 +- .../templates/components/editQueueCapacity.hbs | 4 +- .../app/templates/components/queueContainer.hbs | 2 +- contrib/views/commons/pom.xml | 20 + .../view/commons/hdfs/FileOperationService.java | 36 +- .../ambari/view/commons/hdfs/HdfsService.java | 21 +- .../ambari/view/commons/hdfs/UploadService.java | 43 +- .../ambari/view/commons/hdfs/UserService.java | 20 +- .../view/commons/hdfs/ViewPropertyHelper.java | 55 + contrib/views/files/pom.xml | 44 +- .../view/filebrowser/DownloadService.java | 77 +- .../view/filebrowser/FileBrowserService.java | 29 +- .../view/filebrowser/FilePreviewService.java | 16 +- .../ambari/view/filebrowser/HelpService.java | 17 +- contrib/views/files/src/main/resources/view.xml | 7 + contrib/views/hive-next/pom.xml | 64 +- .../apache/ambari/view/hive2/HelpService.java | 2 +- .../view/hive2/internal/HdfsApiSupplier.java | 10 +- .../view/hive2/resources/files/FileService.java | 21 +- .../jobs/atsJobs/ATSParserFactory.java | 13 +- .../view/hive2/utils/SharedObjectsFactory.java | 14 +- .../views/hive-next/src/main/resources/view.xml | 6 + contrib/views/hive20/pom.xml | 64 +- .../apache/ambari/view/hive20/AuthParams.java | 2 + .../ambari/view/hive20/ConnectionSystem.java | 4 + .../apache/ambari/view/hive20/HelpService.java | 2 +- .../view/hive20/actor/DatabaseManager.java | 44 +- .../ambari/view/hive20/actor/JdbcConnector.java | 6 + .../view/hive20/actor/MetaDataManager.java | 9 +- .../view/hive20/actor/MetaDataRetriever.java | 12 +- .../ambari/view/hive20/actor/message/Ping.java | 10 + .../view/hive20/internal/HdfsApiSupplier.java | 10 +- .../view/hive20/internal/dto/ColumnInfo.java | 1 - .../view/hive20/internal/dto/ColumnStats.java | 170 ++ .../view/hive20/internal/dto/TableMeta.java | 9 + .../view/hive20/internal/dto/TableStats.java | 88 + .../internal/parsers/TableMetaParserImpl.java | 41 +- .../generators/AnalyzeTableQueryGenerator.java | 40 + .../DeleteDatabaseQueryGenerator.java | 48 + .../FetchColumnStatsQueryGenerator.java | 40 + .../generators/RenameTableQueryGenerator.java | 85 + .../view/hive20/resources/browser/DDLProxy.java | 218 +- .../hive20/resources/browser/DDLService.java | 102 +- .../hive20/resources/browser/FileService.java | 12 +- .../hive20/resources/files/FileService.java | 20 +- .../view/hive20/resources/jobs/JobService.java | 28 +- .../jobs/ResultsPaginationController.java | 251 +- .../jobs/atsJobs/ATSParserFactory.java | 9 +- .../hive20/resources/jobs/viewJobs/JobImpl.java | 4 + .../hive20/resources/system/SystemService.java | 29 + .../system/ranger/RangerException.java | 56 + .../resources/system/ranger/RangerService.java | 317 +++ .../view/hive20/utils/AuthorizationChecker.java | 74 + .../utils/MetaDataManagerEventSubmitter.java | 43 + .../view/hive20/utils/SharedObjectsFactory.java | 14 +- .../resources/ui/app/adapters/application.js | 1 + .../main/resources/ui/app/adapters/database.js | 4 + .../src/main/resources/ui/app/adapters/job.js | 11 + .../src/main/resources/ui/app/adapters/ping.js | 5 + .../resources/ui/app/adapters/saved-query.js | 26 + .../src/main/resources/ui/app/adapters/table.js | 7 +- .../ui/app/components/confirm-dialog.js | 46 + .../ui/app/components/database-drop-confirm.js | 32 - .../ui/app/components/database-not-empty.js | 29 - .../ui/app/components/export-result.js | 54 + .../resources/ui/app/components/info-dialog.js | 38 + .../components/multiple-database-search-bar.js | 30 +- .../resources/ui/app/components/query-editor.js | 5 + .../ui/app/components/query-result-table.js | 52 +- .../app/components/table-advanced-settings.js | 1 - .../ui/app/configs/table-level-tabs.js | 6 + .../resources/ui/app/configs/top-level-tabs.js | 2 +- .../ui/app/helpers/format-column-size.js | 39 + .../main/resources/ui/app/models/saved-query.js | 29 + .../main/resources/ui/app/models/worksheet.js | 37 + .../hive20/src/main/resources/ui/app/router.js | 5 +- .../main/resources/ui/app/routes/databases.js | 43 +- .../ui/app/routes/databases/database/tables.js | 5 + .../app/routes/databases/database/tables/new.js | 25 +- .../routes/databases/database/tables/table.js | 53 +- .../databases/database/tables/table/auth.js | 27 + .../databases/database/tables/table/columns.js | 10 + .../resources/ui/app/routes/databases/index.js | 1 + .../src/main/resources/ui/app/routes/queries.js | 75 + .../resources/ui/app/routes/queries/index.js | 29 + .../resources/ui/app/routes/queries/query.js | 387 +++ .../src/main/resources/ui/app/routes/query.js | 2 +- .../resources/ui/app/routes/savedqueries.js | 79 + .../resources/ui/app/services/create-table.js | 182 -- .../src/main/resources/ui/app/services/jobs.js | 26 + .../src/main/resources/ui/app/services/query.js | 20 + .../resources/ui/app/services/saved-queries.js | 52 + .../ui/app/services/table-operations.js | 204 ++ .../src/main/resources/ui/app/styles/app.scss | 29 + .../ui/app/templates/components/column-item.hbs | 2 +- .../app/templates/components/confirm-dialog.hbs | 39 + .../components/database-drop-confirm.hbs | 37 - .../templates/components/database-not-empty.hbs | 38 - .../app/templates/components/export-result.hbs | 46 + .../ui/app/templates/components/info-dialog.hbs | 38 + .../app/templates/components/jobs-browser.hbs | 2 +- .../components/multiple-database-search-bar.hbs | 3 +- .../templates/components/query-result-table.hbs | 48 +- .../templates/components/table-properties.hbs | 2 +- .../resources/ui/app/templates/databases.hbs | 41 +- .../databases/database/tables/table.hbs | 20 +- .../database/tables/table/auth-error.hbs | 35 + .../database/tables/table/auth-loading.hbs | 23 + .../databases/database/tables/table/auth.hbs | 53 + .../databases/database/tables/table/columns.hbs | 14 +- .../databases/database/tables/table/details.hbs | 2 +- .../database/tables/table/partitions.hbs | 2 +- .../databases/database/tables/table/storage.hbs | 2 +- .../main/resources/ui/app/templates/queries.hbs | 32 + .../ui/app/templates/queries/query.hbs | 128 + .../main/resources/ui/app/templates/query.hbs | 19 +- .../resources/ui/app/templates/savedqueries.hbs | 52 + .../views/hive20/src/main/resources/view.xml | 42 + .../DeleteDatabaseQueryGeneratorSpecTest.groovy | 65 + .../RenameTableQueryGeneratorSpecTest.groovy | 104 + .../HIVE20_ENVIRONMENT.postman_environment.json | 16 + .../rest/postman/hive2.postman_collection.json | 107 - .../rest/postman/hive20.postman_collection.json | 566 +++++ contrib/views/hueambarimigration/pom.xml | 5 - .../HiveSavedQueryMigrationImplementation.java | 40 +- .../PigScriptMigrationImplementation.java | 15 +- .../src/main/resources/view.xml | 2 + .../views/jobs/src/main/resources/ui/.gitignore | 3 +- contrib/views/pig/pom.xml | 34 +- .../view/pig/resources/files/FileService.java | 22 +- .../ambari/view/pig/utils/UserLocalObjects.java | 16 +- contrib/views/pig/src/main/resources/view.xml | 7 + contrib/views/pom.xml | 3 +- contrib/views/utils/pom.xml | 82 +- .../view/utils/hdfs/ConfigurationBuilder.java | 159 +- .../apache/ambari/view/utils/hdfs/HdfsApi.java | 29 +- .../apache/ambari/view/utils/hdfs/HdfsUtil.java | 67 +- contrib/views/wfmanager/pom.xml | 20 + .../apache/oozie/ambari/view/AmbariIOUtil.java | 7 +- .../apache/oozie/ambari/view/FileServices.java | 20 +- .../apache/oozie/ambari/view/HDFSFileUtils.java | 21 +- .../apache/oozie/ambari/view/OozieDelegate.java | 13 +- .../ambari/view/OozieProxyImpersonator.java | 4 +- .../WorkflowsManagerResource.java | 2 +- .../resources/ui/app/adapters/application.js | 27 + .../resources/ui/app/components/asset-list.js | 15 +- .../ui/app/components/bundle-config.js | 61 +- .../resources/ui/app/components/coord-config.js | 83 +- .../app/components/design/proj-manager-tabs.js | 21 + .../ui/app/components/designer-workspace.js | 51 +- .../resources/ui/app/components/drafts-wf.js | 69 + .../resources/ui/app/components/file-picker.js | 32 + .../resources/ui/app/components/file-upload.js | 19 +- .../ui/app/components/flow-designer.js | 54 +- .../resources/ui/app/components/hdfs-browser.js | 2 + .../resources/ui/app/components/job-config.js | 72 +- .../resources/ui/app/components/job-details.js | 29 +- .../main/resources/ui/app/components/save-wf.js | 41 +- .../ui/app/components/search-create-new-bar.js | 3 + .../resources/ui/app/components/sla-info.js | 1 + .../ui/app/components/workflow-action-editor.js | 9 + .../ui/app/components/workflow-job-details.js | 3 + .../ui/app/domain/actionjob_hanlder.js | 35 +- .../coordinator/coordinator-xml-importer.js | 12 + .../ui/app/domain/custom-mapping-handler.js | 28 + .../ui/app/domain/cytoscape-flow-renderer.js | 7 +- .../resources/ui/app/domain/mapping-utils.js | 16 +- .../ui/app/domain/workflow-json-importer.js | 3 + .../ui/app/domain/workflow-path-util.js | 2 +- .../ui/app/domain/workflow-xml-generator.js | 5 + .../ui/app/helpers/format-unicode-date.js | 24 + .../main/resources/ui/app/models/wfproject.js | 25 + .../src/main/resources/ui/app/router.js | 1 + .../src/main/resources/ui/app/routes/design.js | 15 +- .../ui/app/routes/design/dashboardtab.js | 2 +- .../ui/app/routes/design/proj-manager-tab.js | 29 + .../ui/app/services/hdfs-file-uploader.js | 20 + .../ui/app/services/property-extractor.js | 4 + .../src/main/resources/ui/app/styles/app.less | 48 +- .../ui/app/templates/components/arg-config.hbs | 13 +- .../app/templates/components/asset-config.hbs | 3 +- .../ui/app/templates/components/asset-list.hbs | 9 +- .../app/templates/components/asset-manager.hbs | 5 +- .../app/templates/components/bundle-config.hbs | 16 +- .../app/templates/components/coord-config.hbs | 55 +- .../components/design/proj-manager-tabs.hbs | 18 + .../templates/components/designer-workspace.hbs | 18 +- .../ui/app/templates/components/drafts-wf.hbs | 121 + .../ui/app/templates/components/file-config.hbs | 8 +- .../app/templates/components/flow-designer.hbs | 69 +- .../app/templates/components/hdfs-browser.hbs | 13 +- .../ui/app/templates/components/java-action.hbs | 4 +- .../ui/app/templates/components/job-config.hbs | 137 +- .../ui/app/templates/components/job-details.hbs | 20 +- .../templates/components/name-value-config.hbs | 16 +- .../app/templates/components/prepare-config.hbs | 8 +- .../ui/app/templates/components/save-wf.hbs | 2 +- .../components/search-create-new-bar.hbs | 2 +- .../app/templates/components/spark-action.hbs | 4 +- .../ui/app/templates/components/ssh-action.hbs | 2 +- .../components/workflow-action-editor.hbs | 11 + .../templates/components/workflow-actions.hbs | 4 +- .../components/workflow-job-action-info.hbs | 8 - .../components/workflow-job-details.hbs | 14 + .../main/resources/ui/app/templates/design.hbs | 4 +- .../app/templates/design/proj-manager-tab.hbs | 19 + .../main/resources/ui/app/utils/constants.js | 1 + .../addon/components/directory-viewer.js | 17 +- .../components/design/proj-manager-tabs-test.js | 41 + .../integration/components/drafts-wf-test.js | 41 + .../ui/tests/unit/adapters/application-test.js | 29 + .../unit/helpers/format-unicode-date-test.js | 27 + .../ui/tests/unit/models/wfproject-test.js | 29 + .../unit/routes/design/proj-manager-tab-test.js | 28 + .../unit/services/hdfs-file-uploader-test.js | 28 + .../views/wfmanager/src/main/resources/view.xml | 27 +- docs/pom.xml | 12 + 817 files changed, 31584 insertions(+), 11494 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/eb2c904e/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 71162e4,2ec43cf..9ebb6e8 --- 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 @@@ -100,9 -98,9 +99,10 @@@ import org.apache.ambari.server.state.S import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.UpgradeContext; + import org.apache.ambari.server.state.UpgradeContextFactory; import org.apache.ambari.server.state.UpgradeHelper; import org.apache.ambari.server.state.UpgradeHelper.UpgradeGroupHolder; +import org.apache.ambari.server.state.repository.VersionDefinitionXml; import org.apache.ambari.server.state.stack.ConfigUpgradePack; import org.apache.ambari.server.state.stack.PrereqCheckStatus; import org.apache.ambari.server.state.stack.UpgradePack; @@@ -872,20 -858,22 +880,25 @@@ public class UpgradeResourceProvider ex // HDP 2.2 to 2.4 should start with HDP 2.2 and merge in HDP 2.3's config-upgrade.xml ConfigUpgradePack configUpgradePack = ConfigurationPackBuilder.build(pack, sourceStackId); + // TODO: for now, all service components are transitioned to upgrading state + // TODO: When performing patch upgrade, we should only target supported services/components + // from upgrade pack + @Experimental(feature=ExperimentalFeature.PATCH_UPGRADES) Set services = new HashSet<>(cluster.getServices().values()); + + @Experimental(feature=ExperimentalFeature.PATCH_UPGRADES) Map> targetComponents = new HashMap<>(); for (Service service: services) { - Set serviceComponents = - new HashSet<>(service.getServiceComponents().values()); - targetComponents.put(service, serviceComponents); + if (upgradeContext.isServiceSupported(service.getName())) { + Set serviceComponents = new HashSet<>(service.getServiceComponents().values()); + targetComponents.put(service, serviceComponents); + } } - // TODO: is there any extreme case when we need to set component upgrade state back to NONE - // from IN_PROGRESS (e.g. canceled downgrade) - s_upgradeHelper.putComponentsToUpgradingState(version, targetComponents); + // !!! determine which stack to check for component isAdvertised + StackId componentStack = upgradeContext.getDirection() == Direction.UPGRADE ? + upgradeContext.getTargetStackId() : upgradeContext.getOriginalStackId(); + s_upgradeHelper.putComponentsToUpgradingState(version, targetComponents, componentStack); for (UpgradeGroupHolder group : groups) { boolean skippable = group.skippable; http://git-wip-us.apache.org/repos/asf/ambari/blob/eb2c904e/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/eb2c904e/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java ----------------------------------------------------------------------