You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/03 16:47:36 UTC
[53/53] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-12556
Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d84abbfd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d84abbfd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d84abbfd
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: d84abbfd303b8860c6f5f241d9c5e993b864c188
Parents: dcbd826 8d6a9cc
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Wed May 3 12:45:42 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Wed May 3 12:45:42 2017 -0400
----------------------------------------------------------------------
ambari-agent/conf/unix/install-helper.sh | 1 +
ambari-agent/pom.xml | 1 +
.../main/python/ambari_agent/AmbariConfig.py | 16 +-
.../ambari_agent/CustomServiceOrchestrator.py | 2 +-
.../src/main/python/ambari_agent/NetUtil.py | 2 +-
.../python/ambari_agent/alerts/web_alert.py | 2 +-
ambari-agent/src/packages/tarball/all.xml | 11 +-
.../src/main/python/ambari_commons/network.py | 20 +-
.../libraries/script/script.py | 57 +-
.../ambari-metrics/datasource.js | 162 +-
.../ambari-metrics/partials/query.editor.html | 14 +-
.../ambari-metrics/queryCtrl.js | 9 +-
.../ambari-metrics-storm-sink/pom.xml | 2 +-
.../TimelineMetricClusterAggregator.java | 11 +-
.../aggregators/ITClusterAggregator.java | 8 +-
ambari-server/conf/unix/install-helper.sh | 17 +
ambari-server/pom.xml | 13 +
ambari-server/src/main/assemblies/server.xml | 7 +
.../checks/DatabaseConsistencyCheckHelper.java | 79 +-
.../server/configuration/Configuration.java | 16 +
.../ambari/server/controller/AmbariServer.java | 6 +-
.../server/controller/RequestRequest.java | 11 +
.../ClusterStackVersionResourceProvider.java | 2 +-
.../internal/RequestResourceProvider.java | 89 +-
.../orm/entities/ClusterConfigEntity.java | 11 +
.../orm/entities/RepositoryVersionEntity.java | 4 +-
.../AmbariPamAuthenticationProvider.java | 18 +-
.../upgrades/AbstractUpgradeServerAction.java | 2 +-
.../apache/ambari/server/state/ServiceImpl.java | 2 +-
.../upgrade/ConfigUpgradeChangeDefinition.java | 3 +-
.../ambari/server/topology/LogicalRequest.java | 38 +-
.../ambari/server/topology/PersistedState.java | 7 +
.../server/topology/PersistedStateImpl.java | 10 +
.../ambari/server/topology/TopologyManager.java | 56 +-
.../server/upgrade/SchemaUpgradeHelper.java | 1 +
.../server/upgrade/UpgradeCatalog252.java | 94 +
.../apache/ambari/server/view/ViewRegistry.java | 2 +-
.../src/main/package/rpm/postinstall.sh | 18 -
.../python/ambari_server/serverConfiguration.py | 1 +
.../src/main/python/azuredb_create_generator.py | 81 +
ambari-server/src/main/resources/.gitignore | 1 +
.../main/resources/Ambari-DDL-Derby-CREATE.sql | 1 +
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 1 +
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 1 +
.../resources/Ambari-DDL-Postgres-CREATE.sql | 1 +
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 1 +
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 1 +
.../HDP/grafana-hbase-misc.json | 18 +-
.../HDP/grafana-hbase-regionservers.json | 17 +-
.../HDP/grafana-hdfs-datanodes.json | 18 +-
.../HDP/grafana-hdfs-home.json | 18 +-
.../HDP/grafana-hdfs-namenodes.json | 18 +-
.../HDP/grafana-hdfs-topn.json | 18 +-
.../HDP/grafana-hive-hivemetastore.json | 18 +-
.../HDP/grafana-hive-hiverserver2.json | 18 +-
.../HDP/grafana-kafka-hosts.json | 18 +-
.../HDP/grafana-llapdaemon-daemons.json | 17 +-
.../HDP/grafana-llapdaemon-heatmaps.json | 17 +-
.../HDP/grafana-solr-cores-dashboard.json | 18 +-
.../HDP/grafana-solr-hosts-dashboard.json | 18 +-
.../HDP/grafana-yarn-nodemanagers.json | 18 +-
.../HDP/grafana-yarn-resourcemanagers.json | 18 +-
.../default/grafana-ambari-server-database.json | 19 +-
.../default/grafana-ambari-server-topn.json | 18 +-
.../default/grafana-ambari-server.json | 18 +-
.../default/grafana-ams-hbase-misc.json | 18 +-
.../grafana-ams-hbase-regionservers.json | 17 +-
.../default/grafana-system-servers.json | 18 +-
.../package/scripts/metrics_grafana_util.py | 37 +-
.../0.1.0/package/scripts/service_check.py | 22 +-
.../package/alerts/alert_metrics_deviation.py | 10 +-
.../HDFS/2.1.0.2.0/package/scripts/params.py | 2 +-
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 2 +-
.../HDFS/3.0.0.3.0/configuration/hadoop-env.xml | 200 +-
.../HDFS/3.0.0.3.0/configuration/hdfs-log4j.xml | 382 +-
.../HIVE/0.12.0.2.0/configuration/hive-env.xml | 3 +-
.../HIVE/2.1.0.3.0/configuration/hcat-env.xml | 48 +-
.../HIVE/2.1.0.3.0/configuration/hive-env.xml | 79 +-
.../configuration/hive-interactive-env.xml | 63 +-
.../RANGER/0.5.0/role_command_order.json | 2 +-
.../RANGER_KMS/0.5.0.2.3/metainfo.xml | 9 +
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 20 +
.../0.5.0.2.3/package/scripts/params.py | 34 +-
.../0.5.0.2.3/role_command_order.json | 2 +-
.../common-services/SPARK/1.2.1/alerts.json | 48 +
.../scripts/alerts/alert_spark_livy_port.py | 146 +
.../scripts/alerts/alert_spark_thrift_port.py | 151 +
.../2.2.0/package/scripts/job_history_server.py | 108 +
.../SPARK/2.2.0/package/scripts/livy_server.py | 151 +
.../SPARK/2.2.0/package/scripts/livy_service.py | 48 +
.../SPARK/2.2.0/package/scripts/params.py | 268 +
.../2.2.0/package/scripts/service_check.py | 62 +
.../SPARK/2.2.0/package/scripts/setup_livy.py | 88 +
.../SPARK/2.2.0/package/scripts/setup_spark.py | 116 +
.../SPARK/2.2.0/package/scripts/spark_client.py | 62 +
.../2.2.0/package/scripts/spark_service.py | 146 +
.../package/scripts/spark_thrift_server.py | 91 +
.../2.2.0/package/scripts/status_params.py | 45 +
.../SPARK/2.2.0/scripts/job_history_server.py | 108 -
.../SPARK/2.2.0/scripts/livy_server.py | 151 -
.../SPARK/2.2.0/scripts/livy_service.py | 48 -
.../SPARK/2.2.0/scripts/params.py | 268 -
.../SPARK/2.2.0/scripts/service_check.py | 62 -
.../SPARK/2.2.0/scripts/setup_livy.py | 88 -
.../SPARK/2.2.0/scripts/setup_spark.py | 116 -
.../SPARK/2.2.0/scripts/spark_client.py | 62 -
.../SPARK/2.2.0/scripts/spark_service.py | 146 -
.../SPARK/2.2.0/scripts/spark_thrift_server.py | 91 -
.../SPARK/2.2.0/scripts/status_params.py | 45 -
.../common-services/SPARK2/2.0.0/alerts.json | 48 +
.../scripts/alerts/alert_spark2_livy_port.py | 146 +
.../scripts/alerts/alert_spark2_thrift_port.py | 152 +
.../YARN/3.0.0.3.0/configuration/yarn-env.xml | 206 +-
.../YARN/3.0.0.3.0/configuration/yarn-log4j.xml | 126 +-
.../YARN/3.0.0.3.0/configuration/yarn-site.xml | 7 +-
.../YARN/3.0.0.3.0/service_advisor.py | 28 +
.../0.6.0.2.5/package/scripts/master.py | 6 +
.../3.4.5/configuration/zookeeper-log4j.xml | 2 +-
.../src/main/resources/properties.json | 2 +
.../scripts/check_ambari_permissions.py | 13 +-
.../scripts/relocate_host_components.py | 489 --
.../0.8/services/HDFS/package/scripts/params.py | 2 +-
.../stacks/HDP/2.3/role_command_order.json | 4 +-
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 24 +-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 5 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 5 +
.../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 1 +
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 25 +-
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 5 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 5 +
.../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 1 +
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
.../services/ATLAS/configuration/atlas-env.xml | 2 +-
.../stacks/HDP/2.5/services/stack_advisor.py | 28 +
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 23 +-
.../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 12 +-
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 6 +
.../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 2 +-
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 4 +
.../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 4 +
.../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 1 +
.../src/main/sh/azuredb_create_generator.sh | 26 +
.../DatabaseConsistencyCheckHelperTest.java | 7 +-
.../internal/RequestResourceProviderTest.java | 68 +-
.../AmbariPamAuthenticationProviderTest.java | 45 +-
.../ambari/server/stack/StackManagerTest.java | 2 +-
.../server/topology/LogicalRequestTest.java | 64 +
.../server/topology/TopologyManagerTest.java | 9 +-
.../server/upgrade/UpgradeCatalog252Test.java | 166 +
.../stacks/2.5/RANGER_KMS/test_kms_server.py | 111 +-
.../stacks/2.5/common/test_stack_advisor.py | 408 ++
.../stacks/2.5/configs/ranger-kms-secured.json | 2 +-
.../controllers/main/service/add_controller.js | 3 +
ambari-web/app/styles/application.less | 6 +
ambari-web/app/styles/bootstrap_overrides.less | 5 +
ambari-web/pom.xml | 3 +-
contrib/views/capacity-scheduler/pom.xml | 32 +-
.../src/main/resources/ui/yarn.lock | 1374 ++++
contrib/views/files/pom.xml | 18 +-
.../files/src/main/resources/ui/package.json | 2 +-
.../views/files/src/main/resources/ui/yarn.lock | 6041 ++++++++++++++++
contrib/views/hawq/pom.xml | 20 +-
.../views/hawq/src/main/resources/ui/yarn.lock | 6665 ++++++++++++++++++
contrib/views/hive-next/pom.xml | 18 +-
.../src/main/resources/ui/hive-web/bower.json | 3 +-
.../src/main/resources/ui/hive-web/package.json | 9 +-
.../src/main/resources/ui/hive-web/yarn.lock | 5066 +++++++++++++
contrib/views/hive20/pom.xml | 18 +-
.../generators/InsertFromQueryGenerator.java | 2 +-
.../resources/system/ranger/RangerService.java | 26 +-
.../resources/ui/app/components/create-table.js | 32 +-
.../resources/ui/app/components/jobs-browser.js | 18 +-
.../resources/ui/app/components/setting-list.js | 9 +
.../ui/app/controllers/savedqueries.js | 24 +
.../main/resources/ui/app/controllers/udfs.js | 2 +
.../resources/ui/app/routes/savedqueries.js | 11 +-
.../src/main/resources/ui/app/routes/udfs.js | 10 +-
.../resources/ui/app/services/auto-refresh.js | 1 +
.../src/main/resources/ui/app/styles/app.scss | 8 +
.../app/templates/components/create-table.hbs | 4 +-
.../ui/app/templates/components/edit-table.hbs | 5 -
.../app/templates/components/jobs-browser.hbs | 42 +-
.../app/templates/components/setting-list.hbs | 8 +-
.../app/templates/components/visual-explain.hbs | 7 +-
.../resources/ui/app/templates/savedqueries.hbs | 46 +-
.../main/resources/ui/app/templates/udfs.hbs | 38 +-
.../ui/app/utils/hive-explainer/processor.js | 1 -
.../ui/app/utils/hive-explainer/renderer.js | 213 +-
.../hive20/src/main/resources/ui/package.json | 2 +-
.../hive20/src/main/resources/ui/yarn.lock | 6032 ++++++++++++++++
contrib/views/hueambarimigration/pom.xml | 18 +-
.../ui/hueambarimigration-view/package.json | 2 +-
.../ui/hueambarimigration-view/yarn.lock | 5553 +++++++++++++++
contrib/views/jobs/pom.xml | 18 +-
.../views/jobs/src/main/resources/ui/yarn.lock | 2537 +++++++
contrib/views/pig/pom.xml | 22 +-
.../pig/src/main/resources/ui/pig-web/yarn.lock | 2376 +++++++
contrib/views/pom.xml | 1 +
contrib/views/wfmanager/pom.xml | 18 +-
.../ui/app/components/distcp-action.js | 15 +-
.../ui/app/components/flow-designer.js | 1 -
.../ui/app/components/search-create-new-bar.js | 5 +-
.../ui/app/domain/jsplumb-flow-renderer.js | 194 -
.../resources/ui/app/domain/layout-manager1.js | 88 -
.../resources/ui/app/domain/layout-manager2.js | 87 -
.../app/templates/components/distcp-action.hbs | 7 +-
.../wfmanager/src/main/resources/ui/bower.json | 1 -
.../src/main/resources/ui/ember-cli-build.js | 2 +-
.../wfmanager/src/main/resources/ui/yarn.lock | 5629 +++++++++++++++
pom.xml | 1 +
212 files changed, 46478 insertions(+), 3134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-common/src/main/python/resource_management/libraries/script/script.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 5c89ced,a8bb696..fd52a3f
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@@ -83,10 -87,11 +83,10 @@@ import org.apache.ambari.server.utils.S
import org.apache.ambari.server.utils.VersionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
- import org.apache.hadoop.metrics2.sink.relocated.google.common.collect.Lists;
import com.google.common.collect.ImmutableMap;
+ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import com.google.gson.Gson;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/AbstractUpgradeServerAction.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d84abbfd/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------