date:20171006

[2/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

2017-10-06 Thread swapan

http://git-wip-us.apache.org/repos/asf/ambari/blob/e61556cc/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
new file mode 100644
index 000..fd1cde6
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
@@ -0,0 +1,200 @@
+#!/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+from ambari_commons import OSCheck
+from resource_management.libraries.functions.get_lzo_packages import 
get_lzo_packages
+from resource_management.libraries.functions import conf_select
+from resource_management.libraries.functions import stack_select
+from resource_management.libraries.resources.hdfs_resource import HdfsResource
+from resource_management.libraries.functions import get_kinit_path
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions import format
+from resource_management.libraries.functions.get_not_managed_resources import 
get_not_managed_resources
+from resource_management.libraries.functions.default import default
+from ambari_commons.constants import AMBARI_SUDO_BINARY
+
+import status_params
+
+# a map of the Ambari role to the component name
+# for use with /current/
+SERVER_ROLE_DIRECTORY_MAP = {
+  'DRUID_BROKER': 'druid-broker',
+  'DRUID_COORDINATOR': 'druid-coordinator',
+  'DRUID_HISTORICAL': 'druid-historical',
+  'DRUID_MIDDLEMANAGER': 'druid-middlemanager',
+  'DRUID_OVERLORD': 'druid-overlord',
+  'DRUID_ROUTER': 'druid-router'
+}
+
+# server configurations
+config = Script.get_config()
+stack_root = Script.get_stack_root()
+tmp_dir = Script.get_tmp_dir()
+
+stack_name = default("/hostLevelParams/stack_name", None)
+
+# stack version
+stack_version = default("/commandParams/version", None)
+
+# un-formatted stack version
+stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+
+# default role to coordinator needed for service checks
+component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "DRUID_COORDINATOR")
+
+hostname = config['hostname']
+sudo = AMBARI_SUDO_BINARY
+
+# default druid parameters
+druid_home = format("{stack_root}/current/{component_directory}")
+druid_conf_dir = format("{stack_root}/current/{component_directory}/conf")
+
+druid_common_conf_dir = druid_conf_dir + "/_common"
+druid_coordinator_conf_dir = druid_conf_dir + "/coordinator"
+druid_overlord_conf_dir = druid_conf_dir + "/overlord"
+druid_broker_conf_dir = druid_conf_dir + "/broker"
+druid_historical_conf_dir = druid_conf_dir + "/historical"
+druid_middlemanager_conf_dir = druid_conf_dir + "/middleManager"
+druid_router_conf_dir = druid_conf_dir + "/router"
+druid_extensions_dir = druid_home + "/extensions"
+druid_hadoop_dependencies_dir = druid_home + "/hadoop-dependencies"
+druid_segment_infoDir = 
config['configurations']['druid-historical']['druid.segmentCache.infoDir']
+druid_segment_cache_locations = 
config['configurations']['druid-historical']['druid.segmentCache.locations']
+druid_tasks_dir = 
config['configurations']['druid-middlemanager']['druid.indexer.task.baseTaskDir']
+druid_user = config['configurations']['druid-env']['druid_user']
+druid_log_dir = config['configurations']['druid-env']['druid_log_dir']
+druid_classpath = config['configurations']['druid-env']['druid_classpath']
+druid_extensions = 
config['configurations']['druid-common']['druid.extensions.pullList']
+druid_repo_list = 
config['configurations']['druid-common']['druid.extensions.repositoryList']
+druid_extensions_load_list = 
config['configurations']['druid-common']['druid.extensions.loadList']
+druid_security_extensions_load_list = 
config['configurations']['druid-common']['druid.security.extensions.loadList']
+
+
+# status params
+druid_pid_dir = status_params.druid_pid_dir
+user_group = config['configurations']['cluster-env']['user_group']
+java8_home = config['hostLevelParams']['java_home']
+druid_env_sh_template =

[3/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

2017-10-06 Thread swapan

AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim 
Bouguerra via Swapan Shridhar).


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e61556cc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e61556cc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e61556cc

Branch: refs/heads/trunk
Commit: e61556cc28c593ce9ab58274302b5de4982601d1
Parents: 2fb4649
Author: Swapan Shridhar 
Authored: Fri Oct 6 11:05:04 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Oct 6 11:05:04 2017 -0700

--
 .../DRUID/0.10.1/configuration/druid-broker.xml | 106 +++
 .../DRUID/0.10.1/configuration/druid-common.xml | 270 
 .../0.10.1/configuration/druid-coordinator.xml  |  43 +++
 .../DRUID/0.10.1/configuration/druid-env.xml| 248 +++
 .../0.10.1/configuration/druid-historical.xml   |  94 ++
 .../DRUID/0.10.1/configuration/druid-log4j.xml  |  84 +
 .../0.10.1/configuration/druid-logrotate.xml|  68 
 .../configuration/druid-middlemanager.xml   | 122 
 .../0.10.1/configuration/druid-overlord.xml |  52 
 .../DRUID/0.10.1/configuration/druid-router.xml |  59 
 .../common-services/DRUID/0.10.1/metainfo.xml   | 223 ++
 .../DRUID/0.10.1/package/scripts/broker.py  |  28 ++
 .../DRUID/0.10.1/package/scripts/coordinator.py |  28 ++
 .../DRUID/0.10.1/package/scripts/druid.py   | 307 +++
 .../DRUID/0.10.1/package/scripts/druid_node.py  | 114 +++
 .../DRUID/0.10.1/package/scripts/historical.py  |  28 ++
 .../0.10.1/package/scripts/middlemanager.py |  28 ++
 .../DRUID/0.10.1/package/scripts/overlord.py|  28 ++
 .../DRUID/0.10.1/package/scripts/params.py  | 200 
 .../DRUID/0.10.1/package/scripts/router.py  |  28 ++
 .../0.10.1/package/scripts/service_check.py |  44 +++
 .../0.10.1/package/scripts/status_params.py |  24 ++
 .../DRUID/0.10.1/quicklinks/quicklinks.json |  37 +++
 .../DRUID/0.10.1/role_command_order.json|  17 +
 .../DRUID/0.10.1/themes/theme.json  | 120 
 .../DRUID/0.9.2/configuration/druid-broker.xml  | 106 ---
 .../DRUID/0.9.2/configuration/druid-common.xml  | 270 
 .../0.9.2/configuration/druid-coordinator.xml   |  43 ---
 .../DRUID/0.9.2/configuration/druid-env.xml | 248 ---
 .../0.9.2/configuration/druid-historical.xml|  94 --
 .../DRUID/0.9.2/configuration/druid-log4j.xml   |  84 -
 .../0.9.2/configuration/druid-logrotate.xml |  68 
 .../0.9.2/configuration/druid-middlemanager.xml | 122 
 .../0.9.2/configuration/druid-overlord.xml  |  52 
 .../DRUID/0.9.2/configuration/druid-router.xml  |  59 
 .../common-services/DRUID/0.9.2/metainfo.xml| 223 --
 .../DRUID/0.9.2/package/scripts/broker.py   |  28 --
 .../DRUID/0.9.2/package/scripts/coordinator.py  |  28 --
 .../DRUID/0.9.2/package/scripts/druid.py| 307 ---
 .../DRUID/0.9.2/package/scripts/druid_node.py   | 114 ---
 .../DRUID/0.9.2/package/scripts/historical.py   |  28 --
 .../0.9.2/package/scripts/middlemanager.py  |  28 --
 .../DRUID/0.9.2/package/scripts/overlord.py |  28 --
 .../DRUID/0.9.2/package/scripts/params.py   | 200 
 .../DRUID/0.9.2/package/scripts/router.py   |  28 --
 .../0.9.2/package/scripts/service_check.py  |  44 ---
 .../0.9.2/package/scripts/status_params.py  |  24 --
 .../DRUID/0.9.2/quicklinks/quicklinks.json  |  37 ---
 .../DRUID/0.9.2/role_command_order.json |  17 -
 .../DRUID/0.9.2/themes/theme.json   | 120 
 .../stacks/HDP/2.6/services/DRUID/metainfo.xml  |   5 +-
 .../test/python/stacks/2.6/DRUID/test_druid.py  |   2 +-
 52 files changed, 2403 insertions(+), 2404 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e61556cc/ambari-server/src/main/resources/common-services/DRUID/0.10.1/configuration/druid-broker.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/configuration/druid-broker.xml
 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/configuration/druid-broker.xml
new file mode 100644
index 000..6146ca3
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/configuration/druid-broker.xml
@@ -0,0 +1,106 @@
+
+
+
+
+  
+druid.service
+druid/broker
+The druid.service name of broker node.
+
+  
+  
+druid.port
+8082
+The port on which the broker will accept 
connections.
+
+  
+  
+druid.broker.http.numConnections
+20
+Size of connection pool for the Broker to connect to

[1/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

2017-10-06 Thread swapan

Repository: ambari
Updated Branches:
  refs/heads/trunk 2fb4649e2 -> e61556cc2


http://git-wip-us.apache.org/repos/asf/ambari/blob/e61556cc/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
deleted file mode 100644
index ec98c3c..000
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ /dev/null
@@ -1,307 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-import json
-import os
-from resource_management import Fail
-from resource_management.libraries.resources.properties_file import 
PropertiesFile
-from resource_management.core.resources.system import Directory, Execute, File
-from resource_management.core.source import DownloadSource
-from resource_management.core.source import InlineTemplate
-from resource_management.libraries.functions import format
-from resource_management.libraries.functions.show_logs import show_logs
-from resource_management.core.logger import Logger
-
-
-def druid(upgrade_type=None, nodeType=None):
-  import params
-  ensure_base_directories()
-
-  # Environment Variables
-  File(format("{params.druid_conf_dir}/druid-env.sh"),
-   owner=params.druid_user,
-   content=InlineTemplate(params.druid_env_sh_template),
-   mode = 0700
-   )
-
-  # common config
-  druid_common_config = 
mutable_config_dict(params.config['configurations']['druid-common'])
-  # User cannot override below configs
-  druid_common_config['druid.host'] = params.hostname
-  druid_common_config['druid.extensions.directory'] = 
params.druid_extensions_dir
-  druid_common_config['druid.extensions.hadoopDependenciesDir'] = 
params.druid_hadoop_dependencies_dir
-  druid_common_config['druid.selectors.indexing.serviceName'] = 
params.config['configurations']['druid-overlord'][
-'druid.service']
-  druid_common_config['druid.selectors.coordinator.serviceName'] = \
-params.config['configurations']['druid-coordinator']['druid.service']
-  druid_common_config['druid.extensions.loadList'] = 
json.dumps(eval(params.druid_extensions_load_list) +
- 
eval(params.druid_security_extensions_load_list))
-
-  # delete the password and user if empty otherwiswe derby will fail.
-  if 'derby' == druid_common_config['druid.metadata.storage.type']:
-del druid_common_config['druid.metadata.storage.connector.user']
-del druid_common_config['druid.metadata.storage.connector.password']
-
-  druid_env_config = 
mutable_config_dict(params.config['configurations']['druid-env'])
-
-  PropertiesFile("common.runtime.properties",
- dir=params.druid_common_conf_dir,
- properties=druid_common_config,
- owner=params.druid_user,
- group=params.user_group,
- mode = 0600
- )
-  Logger.info("Created common.runtime.properties")
-
-  File(format("{params.druid_common_conf_dir}/druid-log4j.xml"),
-   mode=0644,
-   owner=params.druid_user,
-   group=params.user_group,
-   content=InlineTemplate(params.log4j_props)
-   )
-  Logger.info("Created log4j file")
-
-  File("/etc/logrotate.d/druid",
-   mode=0644,
-   owner='root',
-   group='root',
-   content=InlineTemplate(params.logrotate_props)
-   )
-
-  Logger.info("Created log rotate file")
-
-  # node specific configs
-  for node_type in ['coordinator', 'overlord', 'historical', 'broker', 
'middleManager', 'router']:
-node_config_dir = format('{params.druid_conf_dir}/{node_type}')
-node_type_lowercase = node_type.lower()
-
-# Write runtime.properties file
-node_config = 
mutable_config_dict(params.config['configurations'][format('druid-{node_type_lowercase}')])
-PropertiesFile("runtime.properties",
-   dir=node_config_dir,
-   properties=node_config,
-   owner=params.druid_user,
-   group=params.user_group,
-   mode = 0600

ambari git commit: AMBARI-22163 : Anomaly Storage: Design Metric anomalies schema. (avijayan)

2017-10-06 Thread avijayan

Repository: ambari
Updated Branches:
  refs/heads/branch-3.0-ams 4613b471e -> a9c6054fe


AMBARI-22163 : Anomaly Storage: Design Metric anomalies schema. (avijayan)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9c6054f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9c6054f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9c6054f

Branch: refs/heads/branch-3.0-ams
Commit: a9c6054fe3c2512f8021f3bb4fb9150e40238c5b
Parents: 4613b47
Author: Aravindan Vijayan 
Authored: Fri Oct 6 10:53:28 2017 -0700
Committer: Aravindan Vijayan 
Committed: Fri Oct 6 10:53:28 2017 -0700

--
 ambari-logsearch/ambari-logsearch-it/pom.xml|   2 +-
 .../pom.xml |  33 +-
 .../common/ADServiceConfiguration.scala |  74 +
 .../common/PhoenixQueryConstants.scala  | 109 +++
 .../db/PhoenixAnomalyStoreAccessor.scala|  67 
 .../spark/prototype/SparkPhoenixReader.scala|  92 
 .../common/ADManagerConfigurationTest.scala |  23 
 .../db/PhoenixAnomalyStoreAccessorTest.scala|  26 +
 ambari-metrics/ambari-metrics-common/pom.xml|  46 
 .../sink/timeline/query/ConnectionProvider.java |  32 ++
 .../query/DefaultPhoenixDataSource.java | 108 ++
 .../query/PhoenixConnectionProvider.java|  31 ++
 .../metrics/timeline/PhoenixHBaseAccessor.java  |  23 +---
 .../timeline/query/ConnectionProvider.java  |  29 -
 .../query/DefaultPhoenixDataSource.java |  90 ---
 .../query/PhoenixConnectionProvider.java|  31 --
 .../TestApplicationHistoryServer.java   |   2 +-
 .../timeline/AbstractMiniHBaseClusterTest.java  |   6 +-
 .../timeline/PhoenixHBaseAccessorTest.java  |   4 +-
 19 files changed, 601 insertions(+), 227 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9c6054f/ambari-logsearch/ambari-logsearch-it/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-it/pom.xml 
b/ambari-logsearch/ambari-logsearch-it/pom.xml
index db3e09f..b3a1d45 100644
--- a/ambari-logsearch/ambari-logsearch-it/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-it/pom.xml
@@ -122,7 +122,7 @@
   
 
   
-target/classes
+test/target/classes
 
   
 src/test/java/

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9c6054f/ambari-metrics/ambari-metrics-anomaly-detection-service/pom.xml
--
diff --git a/ambari-metrics/ambari-metrics-anomaly-detection-service/pom.xml 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/pom.xml
index 1a10f86..6f8f8c1 100644
--- a/ambari-metrics/ambari-metrics-anomaly-detection-service/pom.xml
+++ b/ambari-metrics/ambari-metrics-anomaly-detection-service/pom.xml
@@ -29,8 +29,9 @@
 ambari-metrics-anomaly-detection-service
 2.0.0.0-SNAPSHOT
 
-2.10.4
+2.11.1
 2.11
+2.7.3.2.6.0.3-8
 
 
 
@@ -201,5 +202,35 @@
 2.1.1
 provided
 
+
+org.apache.hadoop
+hadoop-common
+${hadoop.version}
+provided
+
+
+commons-el
+commons-el
+
+
+tomcat
+jasper-runtime
+
+
+tomcat
+jasper-compiler
+
+
+org.mortbay.jetty
+jsp-2.1-jetty
+
+
+
+
+org.scalatest
+scalatest_2.11
+3.0.1
+test
+
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9c6054f/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/ADServiceConfiguration.scala
--
diff --git 
a/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/ADServiceConfiguration.scala
 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/ADServiceConfiguration.scala
new file mode 100644
index 000..248c74e
--- /dev/null
+++ 
b/ambari-metrics/ambari-metrics-anomaly-detection-service/src/main/scala/org/apache/ambari/metrics/adservice/common/ADServiceConfiguration.scala
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation

[1/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

2017-10-06 Thread swapan

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 154ff06fb -> eaddb0f15


http://git-wip-us.apache.org/repos/asf/ambari/blob/eaddb0f1/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
deleted file mode 100644
index 42e6208..000
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ /dev/null
@@ -1,295 +0,0 @@
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-import json
-import os
-from resource_management.libraries.resources.properties_file import 
PropertiesFile
-from resource_management.core.resources.system import Directory, Execute, File
-from resource_management.core.source import DownloadSource
-from resource_management.core.source import InlineTemplate
-from resource_management.libraries.functions import format
-from resource_management.libraries.functions.show_logs import show_logs
-from resource_management.core.logger import Logger
-
-
-def druid(upgrade_type=None, nodeType=None):
-  import params
-  ensure_base_directories()
-
-  # Environment Variables
-  File(format("{params.druid_conf_dir}/druid-env.sh"),
-   owner=params.druid_user,
-   content=InlineTemplate(params.druid_env_sh_template),
-   mode = 0700
-   )
-
-  # common config
-  druid_common_config = 
mutable_config_dict(params.config['configurations']['druid-common'])
-  # User cannot override below configs
-  druid_common_config['druid.host'] = params.hostname
-  druid_common_config['druid.extensions.directory'] = 
params.druid_extensions_dir
-  druid_common_config['druid.extensions.hadoopDependenciesDir'] = 
params.druid_hadoop_dependencies_dir
-  druid_common_config['druid.selectors.indexing.serviceName'] = 
params.config['configurations']['druid-overlord'][
-'druid.service']
-  druid_common_config['druid.selectors.coordinator.serviceName'] = \
-params.config['configurations']['druid-coordinator']['druid.service']
-  druid_common_config['druid.extensions.loadList'] = 
json.dumps(eval(params.druid_extensions_load_list) +
- 
eval(params.druid_security_extensions_load_list))
-
-  # delete the password and user if empty otherwiswe derby will fail.
-  if 'derby' == druid_common_config['druid.metadata.storage.type']:
-del druid_common_config['druid.metadata.storage.connector.user']
-del druid_common_config['druid.metadata.storage.connector.password']
-
-  druid_env_config = 
mutable_config_dict(params.config['configurations']['druid-env'])
-
-  PropertiesFile("common.runtime.properties",
- dir=params.druid_common_conf_dir,
- properties=druid_common_config,
- owner=params.druid_user,
- group=params.user_group,
- mode = 0600
- )
-  Logger.info("Created common.runtime.properties")
-
-  File(format("{params.druid_common_conf_dir}/druid-log4j.xml"),
-   mode=0644,
-   owner=params.druid_user,
-   group=params.user_group,
-   content=InlineTemplate(params.log4j_props)
-   )
-  Logger.info("Created log4j file")
-
-  File("/etc/logrotate.d/druid",
-   mode=0644,
-   owner='root',
-   group='root',
-   content=InlineTemplate(params.logrotate_props)
-   )
-
-  Logger.info("Created log rotate file")
-
-  # node specific configs
-  for node_type in ['coordinator', 'overlord', 'historical', 'broker', 
'middleManager', 'router']:
-node_config_dir = format('{params.druid_conf_dir}/{node_type}')
-node_type_lowercase = node_type.lower()
-
-# Write runtime.properties file
-node_config = 
mutable_config_dict(params.config['configurations'][format('druid-{node_type_lowercase}')])
-PropertiesFile("runtime.properties",
-   dir=node_config_dir,
-   properties=node_config,
-   owner=params.druid_user,
-   group=params.user_group,
-   mode = 0600
-   )
-

[3/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

2017-10-06 Thread swapan

AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim 
Bouguerra via Swapan Shridhar).


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eaddb0f1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eaddb0f1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eaddb0f1

Branch: refs/heads/branch-2.6
Commit: eaddb0f15b51cdabd2943f64ba15bbe1ff358223
Parents: 154ff06
Author: Swapan Shridhar 
Authored: Fri Oct 6 10:48:20 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Oct 6 10:48:20 2017 -0700

--
 .../DRUID/0.10.1/configuration/druid-broker.xml | 106 +++
 .../DRUID/0.10.1/configuration/druid-common.xml | 270 +
 .../0.10.1/configuration/druid-coordinator.xml  |  43 +++
 .../DRUID/0.10.1/configuration/druid-env.xml| 242 +++
 .../0.10.1/configuration/druid-historical.xml   |  94 ++
 .../DRUID/0.10.1/configuration/druid-log4j.xml  |  84 ++
 .../0.10.1/configuration/druid-logrotate.xml|  68 +
 .../configuration/druid-middlemanager.xml   | 122 
 .../0.10.1/configuration/druid-overlord.xml |  52 
 .../DRUID/0.10.1/configuration/druid-router.xml |  59 
 .../common-services/DRUID/0.10.1/metainfo.xml   | 223 ++
 .../DRUID/0.10.1/package/scripts/broker.py  |  28 ++
 .../DRUID/0.10.1/package/scripts/coordinator.py |  28 ++
 .../DRUID/0.10.1/package/scripts/druid.py   | 295 +++
 .../DRUID/0.10.1/package/scripts/druid_node.py  | 114 +++
 .../DRUID/0.10.1/package/scripts/historical.py  |  28 ++
 .../0.10.1/package/scripts/middlemanager.py |  28 ++
 .../DRUID/0.10.1/package/scripts/overlord.py|  28 ++
 .../DRUID/0.10.1/package/scripts/params.py  | 187 
 .../DRUID/0.10.1/package/scripts/router.py  |  28 ++
 .../0.10.1/package/scripts/service_check.py |  44 +++
 .../0.10.1/package/scripts/status_params.py |  24 ++
 .../DRUID/0.10.1/quicklinks/quicklinks.json |  37 +++
 .../DRUID/0.10.1/role_command_order.json|  17 ++
 .../DRUID/0.10.1/themes/theme.json  | 120 
 .../DRUID/0.9.2/configuration/druid-broker.xml  | 106 ---
 .../DRUID/0.9.2/configuration/druid-common.xml  | 270 -
 .../0.9.2/configuration/druid-coordinator.xml   |  43 ---
 .../DRUID/0.9.2/configuration/druid-env.xml | 242 ---
 .../0.9.2/configuration/druid-historical.xml|  94 --
 .../DRUID/0.9.2/configuration/druid-log4j.xml   |  84 --
 .../0.9.2/configuration/druid-logrotate.xml |  68 -
 .../0.9.2/configuration/druid-middlemanager.xml | 122 
 .../0.9.2/configuration/druid-overlord.xml  |  52 
 .../DRUID/0.9.2/configuration/druid-router.xml  |  59 
 .../common-services/DRUID/0.9.2/metainfo.xml| 223 --
 .../DRUID/0.9.2/package/scripts/broker.py   |  28 --
 .../DRUID/0.9.2/package/scripts/coordinator.py  |  28 --
 .../DRUID/0.9.2/package/scripts/druid.py| 295 ---
 .../DRUID/0.9.2/package/scripts/druid_node.py   | 114 ---
 .../DRUID/0.9.2/package/scripts/historical.py   |  28 --
 .../0.9.2/package/scripts/middlemanager.py  |  28 --
 .../DRUID/0.9.2/package/scripts/overlord.py |  28 --
 .../DRUID/0.9.2/package/scripts/params.py   | 187 
 .../DRUID/0.9.2/package/scripts/router.py   |  28 --
 .../0.9.2/package/scripts/service_check.py  |  44 ---
 .../0.9.2/package/scripts/status_params.py  |  24 --
 .../DRUID/0.9.2/quicklinks/quicklinks.json  |  37 ---
 .../DRUID/0.9.2/role_command_order.json |  17 --
 .../DRUID/0.9.2/themes/theme.json   | 120 
 .../stacks/HDP/2.6/services/DRUID/metainfo.xml  |   5 +-
 .../test/python/stacks/2.6/DRUID/test_druid.py  |   2 +-
 52 files changed, 2372 insertions(+), 2373 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eaddb0f1/ambari-server/src/main/resources/common-services/DRUID/0.10.1/configuration/druid-broker.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/configuration/druid-broker.xml
 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/configuration/druid-broker.xml
new file mode 100644
index 000..6146ca3
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/configuration/druid-broker.xml
@@ -0,0 +1,106 @@
+
+
+
+
+  
+druid.service
+druid/broker
+The druid.service name of broker node.
+
+  
+  
+druid.port
+8082
+The port on which the broker will accept 
connections.
+
+  
+  
+druid.broker.http.numConnections
+20
+Size of connection pool for the Broker to connect

[2/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

2017-10-06 Thread swapan

http://git-wip-us.apache.org/repos/asf/ambari/blob/eaddb0f1/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
new file mode 100644
index 000..c78dbfd
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/params.py
@@ -0,0 +1,187 @@
+#!/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+from ambari_commons import OSCheck
+from resource_management.libraries.functions import conf_select
+from resource_management.libraries.functions import stack_select
+from resource_management.libraries.resources.hdfs_resource import HdfsResource
+from resource_management.libraries.functions import get_kinit_path
+from resource_management.libraries.script.script import Script
+from resource_management.libraries.functions import format
+from resource_management.libraries.functions.get_not_managed_resources import 
get_not_managed_resources
+from resource_management.libraries.functions.default import default
+
+import status_params
+
+# a map of the Ambari role to the component name
+# for use with /current/
+SERVER_ROLE_DIRECTORY_MAP = {
+  'DRUID_BROKER': 'druid-broker',
+  'DRUID_COORDINATOR': 'druid-coordinator',
+  'DRUID_HISTORICAL': 'druid-historical',
+  'DRUID_MIDDLEMANAGER': 'druid-middlemanager',
+  'DRUID_OVERLORD': 'druid-overlord',
+  'DRUID_ROUTER': 'druid-router'
+}
+
+# server configurations
+config = Script.get_config()
+stack_root = Script.get_stack_root()
+tmp_dir = Script.get_tmp_dir()
+
+stack_name = default("/hostLevelParams/stack_name", None)
+
+# stack version
+stack_version = default("/commandParams/version", None)
+
+# default role to coordinator needed for service checks
+component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "DRUID_COORDINATOR")
+
+hostname = config['hostname']
+
+# default druid parameters
+druid_home = format("{stack_root}/current/{component_directory}")
+druid_conf_dir = format("{stack_root}/current/{component_directory}/conf")
+
+druid_common_conf_dir = druid_conf_dir + "/_common"
+druid_coordinator_conf_dir = druid_conf_dir + "/coordinator"
+druid_overlord_conf_dir = druid_conf_dir + "/overlord"
+druid_broker_conf_dir = druid_conf_dir + "/broker"
+druid_historical_conf_dir = druid_conf_dir + "/historical"
+druid_middlemanager_conf_dir = druid_conf_dir + "/middleManager"
+druid_router_conf_dir = druid_conf_dir + "/router"
+druid_extensions_dir = druid_home + "/extensions"
+druid_hadoop_dependencies_dir = druid_home + "/hadoop-dependencies"
+druid_segment_infoDir = 
config['configurations']['druid-historical']['druid.segmentCache.infoDir']
+druid_segment_cache_locations = 
config['configurations']['druid-historical']['druid.segmentCache.locations']
+druid_tasks_dir = 
config['configurations']['druid-middlemanager']['druid.indexer.task.baseTaskDir']
+druid_user = config['configurations']['druid-env']['druid_user']
+druid_log_dir = config['configurations']['druid-env']['druid_log_dir']
+druid_classpath = config['configurations']['druid-env']['druid_classpath']
+druid_extensions = 
config['configurations']['druid-common']['druid.extensions.pullList']
+druid_repo_list = 
config['configurations']['druid-common']['druid.extensions.repositoryList']
+druid_extensions_load_list = 
config['configurations']['druid-common']['druid.extensions.loadList']
+druid_security_extensions_load_list = 
config['configurations']['druid-common']['druid.security.extensions.loadList']
+
+
+# status params
+druid_pid_dir = status_params.druid_pid_dir
+user_group = config['configurations']['cluster-env']['user_group']
+java8_home = config['hostLevelParams']['java_home']
+druid_env_sh_template = config['configurations']['druid-env']['content']
+
+# log4j params
+log4j_props = config['configurations']['druid-log4j']['content']
+druid_log_level = config['configurations']['druid-log4j']['druid_log_level']
+metamx_log_level = config['configurations']['druid-log4j']['metamx_log_level']
+root_log_level =

ambari git commit: AMBARI-14714. fix compiler errors (benyoka)

2017-10-06 Thread benyoka

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 1e90bd576 -> 5dad3


AMBARI-14714. fix compiler errors (benyoka)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5dad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5dad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5dad

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 5dad30611575f7c853a83e21b5dce0c85c7f
Parents: 1e90bd5
Author: Balazs Bence Sari 
Authored: Fri Oct 6 19:36:36 2017 +0200
Committer: Balazs Bence Sari 
Committed: Fri Oct 6 19:36:36 2017 +0200

--
 .../apache/ambari/server/controller/StackV2.java| 16 +---
 .../ambari/server/topology/BlueprintImplV2.java |  6 +++---
 .../apache/ambari/server/topology/BlueprintV2.java  |  6 +++---
 .../apache/ambari/server/topology/HostGroupV2.java  |  4 ++--
 .../org/apache/ambari/server/topology/Service.java  |  4 ++--
 5 files changed, 23 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5dad/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java
index 3e34951..8a2208d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java
@@ -18,14 +18,24 @@
 
 package org.apache.ambari.server.controller;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.orm.entities.StackEntity;
-import org.apache.ambari.server.state.*;
+import org.apache.ambari.server.state.AutoDeployInfo;
+import org.apache.ambari.server.state.ComponentInfo;
+import org.apache.ambari.server.state.DependencyInfo;
+import org.apache.ambari.server.state.PropertyDependencyInfo;
+import org.apache.ambari.server.state.PropertyInfo;
+import org.apache.ambari.server.state.ValueAttributesInfo;
 import org.apache.ambari.server.topology.Cardinality;
 import org.apache.ambari.server.topology.Configuration;
 
-import java.util.*;
-
 /**
  * Encapsulates stack information.
  */

http://git-wip-us.apache.org/repos/asf/ambari/blob/5dad/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImplV2.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImplV2.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImplV2.java
index fa893b3b..9bde795 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImplV2.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImplV2.java
@@ -19,13 +19,13 @@
 
 package org.apache.ambari.server.topology;
 
-import org.apache.ambari.server.controller.StackV2;
-import org.apache.ambari.server.orm.entities.BlueprintEntity;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ambari.server.controller.StackV2;
+import org.apache.ambari.server.orm.entities.BlueprintEntity;
+
 /**
  * Blueprint implementation.
  */

http://git-wip-us.apache.org/repos/asf/ambari/blob/5dad/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2.java
index 134a614..1fea966 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintV2.java
@@ -18,13 +18,13 @@
 
 package org.apache.ambari.server.topology;
 
-import org.apache.ambari.server.controller.StackV2;
-import org.apache.ambari.server.orm.entities.BlueprintEntity;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.ambari.server.controller.StackV2;
+import org.apache.ambari.server.orm.entities.BlueprintEntity;
+
 /**
  * Blueprint representation.
  */

http://git-wip-us.apache.org/repos/asf/ambari/blob/5dad/ambari-server/src/main/java/org/apache/ambari/server/topology/HostGroupV2.java
--
diff --git

ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

2017-10-06 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/trunk 01b79aae5 -> 2fb4649e2


AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2fb4649e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2fb4649e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2fb4649e

Branch: refs/heads/trunk
Commit: 2fb4649e2a9381b98c4867ac4a550f7c3ff7ed23
Parents: 01b79aa
Author: Dmytro Sen 
Authored: Fri Oct 6 19:39:24 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 6 19:39:24 2017 +0300

--
 .../server/api/services/AmbariMetaInfo.java | 54 +++--
 .../server/controller/StackVersionResponse.java | 29 ---
 .../internal/StackArtifactResourceProvider.java | 17 +
 .../ambari/server/stack/ServiceDirectory.java   |  3 +-
 .../ambari/server/stack/StackDirectory.java | 27 ---
 .../apache/ambari/server/stack/StackModule.java |  6 --
 .../apache/ambari/server/state/ServiceInfo.java |  2 +-
 .../apache/ambari/server/state/StackInfo.java   | 23 --
 ambari-server/src/main/resources/kerberos.json  | 79 
 .../resources/stacks/HDP/2.0.6/kerberos.json| 79 
 .../main/resources/stacks/HDP/3.0/kerberos.json | 79 
 .../server/api/services/AmbariMetaInfoTest.java | 19 +++--
 .../ambari/server/stack/StackManagerTest.java   |  8 --
 .../KerberosDescriptorUpdateHelperTest.java |  1 +
 ambari-server/src/test/resources/kerberos.json  | 42 +++
 .../resources/stacks/HDP/2.0.8/kerberos.json| 42 ---
 16 files changed, 170 insertions(+), 340 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2fb4649e/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 425d247..46ee65a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -21,7 +21,6 @@ package org.apache.ambari.server.api.services;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.Component;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.HostComponent;
 import static 
org.apache.ambari.server.controller.utilities.PropertyHelper.AGGREGATE_FUNCTION_IDENTIFIERS;
-import static 
org.apache.ambari.server.stack.StackDirectory.WIDGETS_DESCRIPTOR_FILE_NAME;
 
 import java.io.File;
 import java.io.FileReader;
@@ -106,6 +105,17 @@ public class AmbariMetaInfo {
* Version of XML files with support of custom services and custom commands
*/
   public static final String SCHEMA_VERSION_2 = "2.0";
+
+  /**
+   * The filename for a Kerberos descriptor file at either the stack or 
service level
+   */
+  public static final String KERBEROS_DESCRIPTOR_FILE_NAME = "kerberos.json";
+
+  /**
+   * The filename for a Widgets descriptor file at either the stack or service 
level
+   */
+  public static final String WIDGETS_DESCRIPTOR_FILE_NAME = "widgets.json";
+
   private final static Logger LOG = 
LoggerFactory.getLogger(AmbariMetaInfo.class);
 
 
@@ -128,6 +138,7 @@ public class AmbariMetaInfo {
   private File serverVersionFile;
   private File commonWidgetsDescriptorFile;
   private File customActionRoot;
+  private String commonKerberosDescriptorFileLocation;
   private Map versionDefinitions = null;
 
 
@@ -217,6 +228,7 @@ public class AmbariMetaInfo {
 
 customActionRoot = new File(conf.getCustomActionDefinitionPath());
 
+commonKerberosDescriptorFileLocation = new File(conf.getResourceDirPath(), 
KERBEROS_DESCRIPTOR_FILE_NAME).getAbsolutePath();
 commonWidgetsDescriptorFile = new File(conf.getResourceDirPath(), 
WIDGETS_DESCRIPTOR_FILE_NAME);
   }
 
@@ -1257,38 +1269,25 @@ public class AmbariMetaInfo {
   public KerberosDescriptor getKerberosDescriptor(String stackName, String 
stackVersion, boolean includePreconfigureData) throws AmbariException {
 StackInfo stackInfo = getStack(stackName, stackVersion);
 
-KerberosDescriptor kerberosDescriptor = null;
+KerberosDescriptor kerberosDescriptor = 
readKerberosDescriptorFromFile(getCommonKerberosDescriptorFileLocation());
 
+if (kerberosDescriptor == null) {
+  LOG.warn("Couldn't read common Kerberos descriptor with path {%s}", 
getCommonKerberosDescriptorFileLocation());
+  kerberosDescriptor = new KerberosDescriptor();
+}
 // Read in

ambari git commit: AMBARI-14714. add new blueprint schema elements (magyari_sandor)

2017-10-06 Thread magyari_sandor

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 9c8ed58d1 -> 1e90bd576


AMBARI-14714. add new blueprint schema elements (magyari_sandor)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1e90bd57
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e90bd57
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e90bd57

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 1e90bd576a228bea77e4c41f110775af99083c73
Parents: 9c8ed58
Author: Sandor Magyari 
Authored: Fri Oct 6 18:27:31 2017 +0200
Committer: Sandor Magyari 
Committed: Fri Oct 6 18:29:06 2017 +0200

--
 .../apache/ambari/server/topology/Service.java  | 81 
 .../ambari/server/topology/ServiceGroup.java| 67 
 2 files changed, 148 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1e90bd57/ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java
new file mode 100644
index 000..66c0dc3
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/Service.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.topology;
+
+
+import org.apache.ambari.server.controller.internal.Stack;
+
+import java.util.Set;
+
+public class Service {
+
+  private final String type;
+
+  private final String name;
+
+  private final Stack stack;
+
+  private final Configuration configuration;
+
+  private final Set dependentServices;
+
+  public Service(String type, Stack stack) {
+this(type, null, stack, null, null);
+  }
+
+  /**
+   * In case there's no name specified name will be set to type.
+   * @param type
+   * @param name
+   * @param stack
+   * @param configuration
+   */
+  public Service(String type, String name, Stack stack, Configuration 
configuration, Set dependentServices) {
+this.type = type;
+if (name == null) {
+  this.name = type;
+} else {
+  this.name = name;
+}
+this.stack = stack;
+this.configuration = configuration;
+this.dependentServices = dependentServices;
+  }
+
+  /**
+   * Gets the name of this service
+   *
+   * @return component name
+   */
+  public String getName() {
+return this.name;
+  }
+
+  public String getType() {
+return type;
+  }
+
+  public Stack getStack() {
+return stack;
+  }
+
+  public Configuration getConfiguration() {
+return configuration;
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e90bd57/ambari-server/src/main/java/org/apache/ambari/server/topology/ServiceGroup.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/ServiceGroup.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/ServiceGroup.java
new file mode 100644
index 000..8e66f02
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/ServiceGroup.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the

ambari git commit: AMBARI-21601 [addendum]. Pre-configure services when Kerberos is enabled to reduce number of core service restarts when services are added (Eugene Chekanskiy via rlevas)

2017-10-06 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 726912589 -> 154ff06fb


AMBARI-21601 [addendum]. Pre-configure services when Kerberos is enabled to 
reduce number of core service restarts when services are added (Eugene 
Chekanskiy via rlevas)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/154ff06f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/154ff06f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/154ff06f

Branch: refs/heads/branch-2.6
Commit: 154ff06fb1cdfe111c7dc023cc0009aa8ed5d888
Parents: 7269125
Author: Robert Levas 
Authored: Fri Oct 6 12:27:23 2017 -0400
Committer: Robert Levas 
Committed: Fri Oct 6 12:27:23 2017 -0400

--
 .../resources/stacks/HDP/2.6/kerberos_preconfigure.json | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/154ff06f/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json
index 9c29393..8460958 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json
@@ -16,6 +16,15 @@
 "local_username": "beacon"
   }
 }
+  ],
+  "configurations": [
+  {
+"core-site": {
+  "hadoop.proxyuser.beacon.groups": "*",
+  "hadoop.proxyuser.beacon.hosts": "*",
+  "hadoop.proxyuser.beacon.users": "*"
+}
+}
   ]
 }
   ]

ambari git commit: AMBARI-21601 [addendum]. Pre-configure services when Kerberos is enabled to reduce number of core service restarts when services are added (Eugene Chekanskiy via rlevas)

2017-10-06 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/trunk 8b83a0a53 -> 01b79aae5


AMBARI-21601 [addendum]. Pre-configure services when Kerberos is enabled to 
reduce number of core service restarts when services are added (Eugene 
Chekanskiy via rlevas)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01b79aae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01b79aae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01b79aae

Branch: refs/heads/trunk
Commit: 01b79aae5553dcd89464d8f6558bdba031417a3f
Parents: 8b83a0a
Author: Robert Levas 
Authored: Fri Oct 6 12:26:16 2017 -0400
Committer: Robert Levas 
Committed: Fri Oct 6 12:26:16 2017 -0400

--
 .../resources/stacks/HDP/2.6/kerberos_preconfigure.json | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/01b79aae/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json
index 9c29393..8460958 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/kerberos_preconfigure.json
@@ -16,6 +16,15 @@
 "local_username": "beacon"
   }
 }
+  ],
+  "configurations": [
+  {
+"core-site": {
+  "hadoop.proxyuser.beacon.groups": "*",
+  "hadoop.proxyuser.beacon.hosts": "*",
+  "hadoop.proxyuser.beacon.users": "*"
+}
+}
   ]
 }
   ]

ambari git commit: AMBARI-14714. add new v2 interfaces for blueprint

2017-10-06 Thread magyari_sandor

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 9306544e5 -> 9c8ed58d1


AMBARI-14714. add new v2 interfaces for blueprint


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c8ed58d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c8ed58d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c8ed58d

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 9c8ed58d11a904392bebb89b42049eed10932a17
Parents: 9306544
Author: Sandor Magyari 
Authored: Fri Oct 6 18:20:28 2017 +0200
Committer: Sandor Magyari 
Committed: Fri Oct 6 18:21:47 2017 +0200

--
 .../ambari/server/controller/StackV2.java   | 816 +++
 .../ambari/server/topology/BlueprintImplV2.java | 134 +++
 .../ambari/server/topology/BlueprintV2.java | 179 
 .../ambari/server/topology/ComponentV2.java |  72 ++
 .../ambari/server/topology/HostGroupV2.java | 124 +++
 5 files changed, 1325 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9c8ed58d/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java
new file mode 100644
index 000..3e34951
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackV2.java
@@ -0,0 +1,816 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.controller;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.orm.entities.StackEntity;
+import org.apache.ambari.server.state.*;
+import org.apache.ambari.server.topology.Cardinality;
+import org.apache.ambari.server.topology.Configuration;
+
+import java.util.*;
+
+/**
+ * Encapsulates stack information.
+ */
+public class StackV2 {
+  /**
+   * Stack name
+   */
+  private String name;
+
+  /**
+   * Stack version
+   */
+  private String version;
+
+/**
+ * Repo version
+   */
+  private String repoVersion;
+
+  /**
+   * Map of service name to components
+   */
+  private Map serviceComponents =
+new HashMap<>();
+
+  /**
+   * Map of component to service
+   */
+  private Map componentService = new HashMap<>();
+
+  /**
+   * Map of component to dependencies
+   */
+  private Map dependencies =
+new HashMap<>();
+
+  /**
+   * Map of dependency to conditional service
+   */
+  private Map dependencyConditionalServiceMap =
+new HashMap<>();
+
+  /**
+   * Map of database component name to configuration property which indicates 
whether
+   * the database in to be managed or if it is an external non-managed 
instance.
+   * If the value of the config property starts with 'New', the database is 
determined
+   * to be managed, otherwise it is non-managed.
+   */
+  private Map dbDependencyInfo = new HashMap<>();
+
+  /**
+   * Map of component to required cardinality
+   */
+  private Map cardinalityRequirements = new HashMap<>();
+
+  //todo: instead of all these maps from component -> * ,
+  //todo: we should use a Component object with all of these attributes
+  private Set masterComponents = new HashSet<>();
+
+  /**
+   * Map of component to auto-deploy information
+   */
+  private Map componentAutoDeployInfo =
+new HashMap<>();
+
+  /**
+   * Map of service to config type properties
+   */
+  private Map>> 
serviceConfigurations =
+new HashMap<>();
+
+  /**
+   * Map of service to required type properties
+   */
+  private Map>> 
requiredServiceConfigurations =
+new HashMap<>();
+
+  /**
+   * Map of service to config type properties
+   */
+

ambari git commit: AMBARI-22139 - CURRENT cluster Shows Upgrade If Component Didn't Report Version (jonathanhurley)

2017-10-06 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/trunk a9d26986d -> 8b83a0a53


AMBARI-22139 - CURRENT cluster Shows Upgrade If Component Didn't Report Version 
(jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8b83a0a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8b83a0a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8b83a0a5

Branch: refs/heads/trunk
Commit: 8b83a0a538358e54c5aa7f3c4eccc4a458296f9a
Parents: a9d2698
Author: Jonathan Hurley 
Authored: Thu Oct 5 16:06:06 2017 -0400
Committer: Jonathan Hurley 
Committed: Fri Oct 6 10:38:29 2017 -0400

--
 .../python/resource_management/TestScript.py| 26 -
 .../libraries/script/script.py  | 22 ++--
 .../0.4.0/package/scripts/ranger_admin.py   | 13 ++---
 .../configs/ranger_admin_default.json   | 55 
 .../src/test/python/stacks/utils/RMFTestCase.py |  9 ++--
 5 files changed, 110 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8b83a0a5/ambari-agent/src/test/python/resource_management/TestScript.py
--
diff --git a/ambari-agent/src/test/python/resource_management/TestScript.py 
b/ambari-agent/src/test/python/resource_management/TestScript.py
index 75726d6..79d0598 100644
--- a/ambari-agent/src/test/python/resource_management/TestScript.py
+++ b/ambari-agent/src/test/python/resource_management/TestScript.py
@@ -21,9 +21,9 @@ import StringIO
 import sys, pprint
 from resource_management.libraries.script import Script
 from resource_management.core.environment import Environment
+from resource_management.core.logger import Logger
 from mock.mock import patch, MagicMock
 from stacks.utils.RMFTestCase import *
-import logging
 
 class TestScript(RMFTestCase):
 
@@ -110,7 +110,7 @@ class TestScript(RMFTestCase):
   @patch("__builtin__.open")
   def test_status_commands_clear_structured_out(self, open_mock):
 """
-Tests that status commands will clear and stored structured output from 
prior status commands.
+Tests that status commands will clear any stored structured output from 
prior status commands.
 :param open_mock: 
 :return: 
 """
@@ -141,6 +141,28 @@ class TestScript(RMFTestCase):
 self.assertTrue(open_mock.called)
 self.assertEquals({}, Script.structuredOut)
 
+
+  @patch.object(Logger, "error", new = MagicMock())
+  @patch.object(Script, "put_structured_out")
+  
@patch("resource_management.libraries.functions.version_select_util.get_component_version_from_symlink",
 new = MagicMock(return_value=None))
+  
@patch("resource_management.libraries.functions.stack_select.get_package_name", 
new = MagicMock(return_value="foo-package"))
+  
@patch("resource_management.libraries.functions.stack_select.unsafe_get_stack_versions",
 new = MagicMock(return_value=("",0,["2.6.0.0-1234"])))
+  def test_save_version_structured_out_stack_select(self, pso_mock):
+"""
+Tests that when writing out the version of the component to the structure 
output,
+if all else fails, we'll invoke the stack-select tool to see if there are 
any versions
+reported.
+:param pso_mock:
+:return:
+"""
+script = Script()
+script.stroutfile = ''
+script.save_component_version_to_structured_out("start")
+
+self.assertEqual(pso_mock.call_count, 1)
+self.assertEquals(pso_mock.call_args[0][0], {'version':'2.6.0.0-1234'})
+
+
   def tearDown(self):
 # enable stdout
 sys.stdout = sys.__stdout__

http://git-wip-us.apache.org/repos/asf/ambari/blob/8b83a0a5/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index e612638..d5b4469 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -47,7 +47,7 @@ from resource_management.core.environment import Environment
 from resource_management.core.logger import Logger
 from resource_management.core.exceptions import Fail, 
ClientComponentHasNoStatus, ComponentIsNotRunning
 from resource_management.core.resources.packaging import Package
-from resource_management.libraries.functions.version_select_util import 
get_component_version_from_symlink
+from resource_management.libraries.functions import version_select_util
 from resource_management.libraries.functions.version import compare_versions
 from

ambari git commit: AMBARI-22161. Unable to ignore service check failures during Upgrade (alexantonenko)

2017-10-06 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/trunk 388cb4180 -> a9d26986d


AMBARI-22161. Unable to ignore service check failures during Upgrade 
(alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9d26986
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9d26986
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9d26986

Branch: refs/heads/trunk
Commit: a9d26986d615cee43de6bddca12fd0a23b6526b8
Parents: 388cb41
Author: Alex Antonenko 
Authored: Fri Oct 6 17:10:48 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Oct 6 17:10:48 2017 +0300

--
 .../admin/stack_upgrade/upgrade_wizard_view.js  |  2 +-
 .../stack_upgrade/upgrade_wizard_view_test.js   | 28 +++-
 2 files changed, 23 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9d26986/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
index e1689c2..87e2adf 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
@@ -126,7 +126,7 @@ App.upgradeWizardView = Em.View.extend({
 var associatedVersion = 
this.get('controller.upgradeData.Upgrade.associated_version');
 var version = associatedVersion && 
App.RepositoryVersion.find().findProperty('repositoryVersion', 
associatedVersion);
 var isPatchOrMaint = version && ( version.get('isPatch') || 
version.get('isMaint') );
-return failedItem && failedItem.get('skippable') && !isPatchOrMaint;
+return failedItem && failedItem.get('skippable') && 
!(this.get('isFinalizeItem') && isPatchOrMaint);
   }.property('failedItem'),
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9d26986/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
--
diff --git 
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js 
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
index 0107975..a739838 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
@@ -919,20 +919,36 @@ describe('App.upgradeWizardView', function () {
 beforeEach(function () {
   view.reopen({'failedItem': Em.Object.create({skippable: true}) });
   view.set('controller.upgradeData.Upgrade', {associated_version: 
'2.1.1'});
+  var findResult = [Em.Object.create({repositoryVersion: '2.1.1', isPatch: 
true})];
+  sinon.stub(App.RepositoryVersion, 'find', function(){
+return findResult;
+  });
+});
+
+afterEach(function () {
+  App.RepositoryVersion.find.restore();
 })
 it("Should return true if can not find upgrade", function () {
   view.propertyDidChange('canSkipFailedItem');
-  expect(view.get('canSkipFailedItem')).to.be.true
+  expect(view.get('canSkipFailedItem')).to.be.true;
 });
 
-it("Should return false if upgrade is patch or maint", function () {
-  var findResult = [Em.Object.create({repositoryVersion: '2.1.1', isPatch: 
true})];
-  sinon.stub(App.RepositoryVersion, 'find', function(){
-return findResult;
+it("Should return false if upgrade is patch or maint and item is final", 
function () {
+  view.reopen({
+isFinalizeItem: true
   });
   view.propertyDidChange('canSkipFailedItem');
   expect(view.get('canSkipFailedItem')).to.be.false;
-  App.RepositoryVersion.find.restore();
+});
+
+it("Should return true if upgrade is patch or maint and item is not 
final", function () {
+
+  view.reopen({
+isFinalizeItem: false
+  });
+  view.propertyDidChange('canSkipFailedItem');
+
+  expect(view.get('canSkipFailedItem')).to.be.true;
 });
 
   });

ambari git commit: AMBARI-22161. Unable to ignore service check failures during Upgrade (alexantonenko)

2017-10-06 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 5c09b19ae -> 726912589


AMBARI-22161. Unable to ignore service check failures during Upgrade 
(alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/72691258
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/72691258
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/72691258

Branch: refs/heads/branch-2.6
Commit: 726912589142b493de4e5387597342cbcfa6d2f9
Parents: 5c09b19
Author: Alex Antonenko 
Authored: Fri Oct 6 17:09:51 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Oct 6 17:09:51 2017 +0300

--
 .../admin/stack_upgrade/upgrade_wizard_view.js  |  2 +-
 .../stack_upgrade/upgrade_wizard_view_test.js   | 28 +++-
 2 files changed, 23 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/72691258/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
index e1689c2..87e2adf 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
@@ -126,7 +126,7 @@ App.upgradeWizardView = Em.View.extend({
 var associatedVersion = 
this.get('controller.upgradeData.Upgrade.associated_version');
 var version = associatedVersion && 
App.RepositoryVersion.find().findProperty('repositoryVersion', 
associatedVersion);
 var isPatchOrMaint = version && ( version.get('isPatch') || 
version.get('isMaint') );
-return failedItem && failedItem.get('skippable') && !isPatchOrMaint;
+return failedItem && failedItem.get('skippable') && 
!(this.get('isFinalizeItem') && isPatchOrMaint);
   }.property('failedItem'),
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/72691258/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
--
diff --git 
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js 
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
index 0107975..a739838 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_wizard_view_test.js
@@ -919,20 +919,36 @@ describe('App.upgradeWizardView', function () {
 beforeEach(function () {
   view.reopen({'failedItem': Em.Object.create({skippable: true}) });
   view.set('controller.upgradeData.Upgrade', {associated_version: 
'2.1.1'});
+  var findResult = [Em.Object.create({repositoryVersion: '2.1.1', isPatch: 
true})];
+  sinon.stub(App.RepositoryVersion, 'find', function(){
+return findResult;
+  });
+});
+
+afterEach(function () {
+  App.RepositoryVersion.find.restore();
 })
 it("Should return true if can not find upgrade", function () {
   view.propertyDidChange('canSkipFailedItem');
-  expect(view.get('canSkipFailedItem')).to.be.true
+  expect(view.get('canSkipFailedItem')).to.be.true;
 });
 
-it("Should return false if upgrade is patch or maint", function () {
-  var findResult = [Em.Object.create({repositoryVersion: '2.1.1', isPatch: 
true})];
-  sinon.stub(App.RepositoryVersion, 'find', function(){
-return findResult;
+it("Should return false if upgrade is patch or maint and item is final", 
function () {
+  view.reopen({
+isFinalizeItem: true
   });
   view.propertyDidChange('canSkipFailedItem');
   expect(view.get('canSkipFailedItem')).to.be.false;
-  App.RepositoryVersion.find.restore();
+});
+
+it("Should return true if upgrade is patch or maint and item is not 
final", function () {
+
+  view.reopen({
+isFinalizeItem: false
+  });
+  view.propertyDidChange('canSkipFailedItem');
+
+  expect(view.get('canSkipFailedItem')).to.be.true;
 });
 
   });

ambari git commit: AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)

2017-10-06 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/trunk f44c86690 -> 388cb4180


AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to 
resources/widgets.json (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/388cb418
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/388cb418
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/388cb418

Branch: refs/heads/trunk
Commit: 388cb4180b3ea08e25d95aaf67bac68e8283a518
Parents: f44c866
Author: Dmytro Sen 
Authored: Fri Oct 6 17:07:24 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 6 17:07:41 2017 +0300

--
 .../server/api/services/AmbariMetaInfo.java |  8 ++
 .../AmbariManagementControllerImpl.java | 22 ++---
 .../internal/ServiceResourceProvider.java   |  8 --
 .../internal/StackArtifactResourceProvider.java | 18 +---
 .../server/orm/entities/WidgetLayoutEntity.java |  6 +-
 .../ambari/server/stack/StackDirectory.java | 18 
 .../apache/ambari/server/stack/StackModule.java |  5 --
 .../apache/ambari/server/state/StackInfo.java   |  8 --
 .../resources/stacks/HDP/2.0.6/widgets.json | 95 
 .../main/resources/stacks/HDP/3.0/widgets.json  | 95 
 ambari-server/src/main/resources/widgets.json   | 95 
 .../server/api/services/AmbariMetaInfoTest.java |  8 ++
 .../AmbariManagementControllerImplTest.java |  6 +-
 .../AmbariManagementControllerTest.java |  6 ++
 .../resources/stacks/OTHER/1.0/widgets.json | 95 
 ambari-server/src/test/resources/widgets.json   | 95 
 16 files changed, 224 insertions(+), 364 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/388cb418/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index de84965..425d247 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.Component;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.HostComponent;
 import static 
org.apache.ambari.server.controller.utilities.PropertyHelper.AGGREGATE_FUNCTION_IDENTIFIERS;
+import static 
org.apache.ambari.server.stack.StackDirectory.WIDGETS_DESCRIPTOR_FILE_NAME;
 
 import java.io.File;
 import java.io.FileReader;
@@ -125,6 +126,7 @@ public class AmbariMetaInfo {
   private File commonServicesRoot;
   private File extensionsRoot;
   private File serverVersionFile;
+  private File commonWidgetsDescriptorFile;
   private File customActionRoot;
   private Map versionDefinitions = null;
 
@@ -214,6 +216,8 @@ public class AmbariMetaInfo {
 serverVersionFile = new File(serverVersionFilePath);
 
 customActionRoot = new File(conf.getCustomActionDefinitionPath());
+
+commonWidgetsDescriptorFile = new File(conf.getResourceDirPath(), 
WIDGETS_DESCRIPTOR_FILE_NAME);
   }
 
   /**
@@ -1435,4 +1439,8 @@ public class AmbariMetaInfo {
 
 return null;
   }
+
+  public File getCommonWidgetsDescriptorFile() {
+return commonWidgetsDescriptorFile;
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/388cb418/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index b2993e3..5642575 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -5184,22 +5184,12 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 widgetDescriptorFiles.add(widgetDescriptorFile);
   }
 } else {
-  Set stackIds = new HashSet<>();
-
-  for (Service svc : cluster.getServices().values()) {
-stackIds.add(svc.getDesiredStackId());
-  }
-
-  for (StackId stackId : stackIds) {
-StackInfo stackInfo = ambariMetaInfo.getStack(stackId);
-
-String widgetDescriptorFileLocation =

[2/2] ambari git commit: AMBARI-22158. Ambari schema upgrade fails when upgrading ambari from 2.5.1.0 to 2.6.0.0 and using oracle as database (dlysnichenko)

2017-10-06 Thread dmitriusan

AMBARI-22158. Ambari schema upgrade fails when upgrading ambari from 2.5.1.0 to 
2.6.0.0 and using oracle as database (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f44c8669
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f44c8669
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f44c8669

Branch: refs/heads/trunk
Commit: f44c86690a64523aed04bfd76e5c38e194e731ba
Parents: b358ee2
Author: Lisnichenko Dmitro 
Authored: Fri Oct 6 17:02:13 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Fri Oct 6 17:03:10 2017 +0300

--
 .../org/apache/ambari/server/upgrade/UpgradeCatalog260.java| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f44c8669/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
index c31469e..866a501 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
@@ -144,11 +144,14 @@ public class UpgradeCatalog260 extends 
AbstractUpgradeCatalog {
   public static final String CURRENT = "CURRENT";
   public static final String SELECTED = "1";
   public static final String VIEWURL_TABLE = "viewurl";
+  public static final String VIEWINSTANCE_TABLE = "viewinstance";
   public static final String PK_VIEWURL = "PK_viewurl";
   public static final String URL_ID_COLUMN = "url_id";
   public static final String STALE_POSTGRESS_VIEWURL_PKEY = "viewurl_pkey";
   public static final String USERS_TABLE = "users";
   public static final String STALE_POSTGRESS_USERS_LDAP_USER_KEY = 
"users_ldap_user_key";
+  public static final String SHORT_URL_COLUMN = "short_url";
+  public static final String FK_INSTANCE_URL_ID = "FK_instance_url_id";
 
 
   /**
@@ -205,8 +208,11 @@ public class UpgradeCatalog260 extends 
AbstractUpgradeCatalog {
* Adds the {@value #PK_VIEWURL} constraint.
*/
   private void addViewUrlPKConstraint() throws SQLException {
+dbAccessor.dropFKConstraint(VIEWINSTANCE_TABLE, FK_INSTANCE_URL_ID);
 dbAccessor.dropPKConstraint(VIEWURL_TABLE, STALE_POSTGRESS_VIEWURL_PKEY);
 dbAccessor.addPKConstraint(VIEWURL_TABLE, PK_VIEWURL, URL_ID_COLUMN);
+dbAccessor.addFKConstraint(VIEWINSTANCE_TABLE, FK_INSTANCE_URL_ID,
+SHORT_URL_COLUMN, VIEWURL_TABLE, URL_ID_COLUMN, false);
   }
 
   /**

[1/2] ambari git commit: AMBARI-22158. Ambari schema upgrade fails when upgrading ambari from 2.5.1.0 to 2.6.0.0 and using oracle as database (dlysnichenko)

2017-10-06 Thread dmitriusan

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 6cf8be32e -> 5c09b19ae
  refs/heads/trunk b358ee20e -> f44c86690


AMBARI-22158. Ambari schema upgrade fails when upgrading ambari from 2.5.1.0 to 
2.6.0.0 and using oracle as database (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c09b19a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c09b19a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c09b19a

Branch: refs/heads/branch-2.6
Commit: 5c09b19ae0e902826cec9f999da9ef1ad3ec5d66
Parents: 6cf8be3
Author: Lisnichenko Dmitro 
Authored: Fri Oct 6 17:02:13 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Fri Oct 6 17:02:13 2017 +0300

--
 .../org/apache/ambari/server/upgrade/UpgradeCatalog260.java| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5c09b19a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
index 30bf50a..5a24bbb 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog260.java
@@ -143,11 +143,14 @@ public class UpgradeCatalog260 extends 
AbstractUpgradeCatalog {
   public static final String CURRENT = "CURRENT";
   public static final String SELECTED = "1";
   public static final String VIEWURL_TABLE = "viewurl";
+  public static final String VIEWINSTANCE_TABLE = "viewinstance";
   public static final String PK_VIEWURL = "PK_viewurl";
   public static final String URL_ID_COLUMN = "url_id";
   public static final String STALE_POSTGRESS_VIEWURL_PKEY = "viewurl_pkey";
   public static final String USERS_TABLE = "users";
   public static final String STALE_POSTGRESS_USERS_LDAP_USER_KEY = 
"users_ldap_user_key";
+  public static final String SHORT_URL_COLUMN = "short_url";
+  public static final String FK_INSTANCE_URL_ID = "FK_instance_url_id";
 
 
   /**
@@ -205,8 +208,11 @@ public class UpgradeCatalog260 extends 
AbstractUpgradeCatalog {
* Adds the {@value #PK_VIEWURL} constraint.
*/
   private void addViewUrlPKConstraint() throws SQLException {
+dbAccessor.dropFKConstraint(VIEWINSTANCE_TABLE, FK_INSTANCE_URL_ID);
 dbAccessor.dropPKConstraint(VIEWURL_TABLE, STALE_POSTGRESS_VIEWURL_PKEY);
 dbAccessor.addPKConstraint(VIEWURL_TABLE, PK_VIEWURL, URL_ID_COLUMN);
+dbAccessor.addFKConstraint(VIEWINSTANCE_TABLE, FK_INSTANCE_URL_ID,
+SHORT_URL_COLUMN, VIEWURL_TABLE, URL_ID_COLUMN, false);
   }
 
   /**

ambari git commit: AMBARI-22139 - CURRENT cluster Shows Upgrade If Component Didn't Report Version (jonathanhurley)

2017-10-06 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 5eab1a569 -> 6cf8be32e


AMBARI-22139 - CURRENT cluster Shows Upgrade If Component Didn't Report Version 
(jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6cf8be32
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6cf8be32
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6cf8be32

Branch: refs/heads/branch-2.6
Commit: 6cf8be32e4f0e41346b59953b7069c4ac67140fb
Parents: 5eab1a5
Author: Jonathan Hurley 
Authored: Thu Oct 5 16:06:06 2017 -0400
Committer: Jonathan Hurley 
Committed: Fri Oct 6 09:37:10 2017 -0400

--
 .../python/resource_management/TestScript.py| 26 ++--
 .../libraries/script/script.py  | 22 ++---
 .../src/test/python/stacks/utils/RMFTestCase.py |  9 ---
 3 files changed, 48 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6cf8be32/ambari-agent/src/test/python/resource_management/TestScript.py
--
diff --git a/ambari-agent/src/test/python/resource_management/TestScript.py 
b/ambari-agent/src/test/python/resource_management/TestScript.py
index 75726d6..79d0598 100644
--- a/ambari-agent/src/test/python/resource_management/TestScript.py
+++ b/ambari-agent/src/test/python/resource_management/TestScript.py
@@ -21,9 +21,9 @@ import StringIO
 import sys, pprint
 from resource_management.libraries.script import Script
 from resource_management.core.environment import Environment
+from resource_management.core.logger import Logger
 from mock.mock import patch, MagicMock
 from stacks.utils.RMFTestCase import *
-import logging
 
 class TestScript(RMFTestCase):
 
@@ -110,7 +110,7 @@ class TestScript(RMFTestCase):
   @patch("__builtin__.open")
   def test_status_commands_clear_structured_out(self, open_mock):
 """
-Tests that status commands will clear and stored structured output from 
prior status commands.
+Tests that status commands will clear any stored structured output from 
prior status commands.
 :param open_mock: 
 :return: 
 """
@@ -141,6 +141,28 @@ class TestScript(RMFTestCase):
 self.assertTrue(open_mock.called)
 self.assertEquals({}, Script.structuredOut)
 
+
+  @patch.object(Logger, "error", new = MagicMock())
+  @patch.object(Script, "put_structured_out")
+  
@patch("resource_management.libraries.functions.version_select_util.get_component_version_from_symlink",
 new = MagicMock(return_value=None))
+  
@patch("resource_management.libraries.functions.stack_select.get_package_name", 
new = MagicMock(return_value="foo-package"))
+  
@patch("resource_management.libraries.functions.stack_select.unsafe_get_stack_versions",
 new = MagicMock(return_value=("",0,["2.6.0.0-1234"])))
+  def test_save_version_structured_out_stack_select(self, pso_mock):
+"""
+Tests that when writing out the version of the component to the structure 
output,
+if all else fails, we'll invoke the stack-select tool to see if there are 
any versions
+reported.
+:param pso_mock:
+:return:
+"""
+script = Script()
+script.stroutfile = ''
+script.save_component_version_to_structured_out("start")
+
+self.assertEqual(pso_mock.call_count, 1)
+self.assertEquals(pso_mock.call_args[0][0], {'version':'2.6.0.0-1234'})
+
+
   def tearDown(self):
 # enable stdout
 sys.stdout = sys.__stdout__

http://git-wip-us.apache.org/repos/asf/ambari/blob/6cf8be32/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 8f9cf5c..a1fd1f3 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -46,7 +46,7 @@ from resource_management.core.environment import Environment
 from resource_management.core.logger import Logger
 from resource_management.core.exceptions import Fail, 
ClientComponentHasNoStatus, ComponentIsNotRunning
 from resource_management.core.resources.packaging import Package
-from resource_management.libraries.functions.version_select_util import 
get_component_version_from_symlink
+from resource_management.libraries.functions import version_select_util
 from resource_management.libraries.functions.version import compare_versions
 from resource_management.libraries.functions.version import 
format_stack_version
 from resource_management.libraries.functions import stack_tools

ambari git commit: Revert "AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)"

2017-10-06 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/trunk fab2aa3c6 -> b358ee20e


Revert "AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to 
resources/widgets.json (dsen)"

This reverts commit 7172655ff269fbb7e0d29ba93197aa5a804749c0.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b358ee20
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b358ee20
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b358ee20

Branch: refs/heads/trunk
Commit: b358ee20e857d31017e54c1bde6f3c1aac084030
Parents: fab2aa3
Author: Dmytro Sen 
Authored: Fri Oct 6 16:44:41 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 6 16:44:59 2017 +0300

--
 .../server/api/services/AmbariMetaInfo.java |  8 --
 .../AmbariManagementControllerImpl.java | 22 +++--
 .../internal/ServiceResourceProvider.java   |  8 ++
 .../internal/StackArtifactResourceProvider.java | 18 +++-
 .../server/orm/entities/WidgetLayoutEntity.java |  6 +-
 .../ambari/server/stack/StackDirectory.java | 18 
 .../apache/ambari/server/stack/StackModule.java |  5 ++
 .../apache/ambari/server/state/StackInfo.java   |  8 ++
 .../resources/stacks/HDP/2.0.6/widgets.json | 95 
 .../main/resources/stacks/HDP/3.0/widgets.json  | 95 
 .../server/api/services/AmbariMetaInfoTest.java |  8 --
 .../AmbariManagementControllerImplTest.java |  6 +-
 .../AmbariManagementControllerTest.java |  6 --
 .../resources/stacks/OTHER/1.0/widgets.json | 95 
 14 files changed, 364 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b358ee20/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 425d247..de84965 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -21,7 +21,6 @@ package org.apache.ambari.server.api.services;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.Component;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.HostComponent;
 import static 
org.apache.ambari.server.controller.utilities.PropertyHelper.AGGREGATE_FUNCTION_IDENTIFIERS;
-import static 
org.apache.ambari.server.stack.StackDirectory.WIDGETS_DESCRIPTOR_FILE_NAME;
 
 import java.io.File;
 import java.io.FileReader;
@@ -126,7 +125,6 @@ public class AmbariMetaInfo {
   private File commonServicesRoot;
   private File extensionsRoot;
   private File serverVersionFile;
-  private File commonWidgetsDescriptorFile;
   private File customActionRoot;
   private Map versionDefinitions = null;
 
@@ -216,8 +214,6 @@ public class AmbariMetaInfo {
 serverVersionFile = new File(serverVersionFilePath);
 
 customActionRoot = new File(conf.getCustomActionDefinitionPath());
-
-commonWidgetsDescriptorFile = new File(conf.getResourceDirPath(), 
WIDGETS_DESCRIPTOR_FILE_NAME);
   }
 
   /**
@@ -1439,8 +1435,4 @@ public class AmbariMetaInfo {
 
 return null;
   }
-
-  public File getCommonWidgetsDescriptorFile() {
-return commonWidgetsDescriptorFile;
-  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/b358ee20/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 5642575..b2993e3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -5184,12 +5184,22 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 widgetDescriptorFiles.add(widgetDescriptorFile);
   }
 } else {
-  // common cluster level widgets
-  File commonWidgetsFile = ambariMetaInfo.getCommonWidgetsDescriptorFile();
-  if (commonWidgetsFile != null && commonWidgetsFile.exists()) {
-widgetDescriptorFiles.add(commonWidgetsFile);
-  } else {
-LOG.warn("Common widgets file with path {%s} doesn't exist. No cluster 
widgets will be created.", commonWidgetsFile);
+

ambari git commit: AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In System (alexantonenko)

2017-10-06 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 6bfcb838e -> 5eab1a569


AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In 
System (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5eab1a56
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5eab1a56
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5eab1a56

Branch: refs/heads/branch-2.6
Commit: 5eab1a569c4316efe9a5adc9f843a0e015ff4e1f
Parents: 6bfcb83
Author: Alex Antonenko 
Authored: Fri Oct 6 16:36:26 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Oct 6 16:36:26 2017 +0300

--
 .../stack_upgrade/upgrade_version_box_view.js   | 13 --
 .../upgrade_version_box_view_test.js| 44 ++--
 2 files changed, 49 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5eab1a56/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index 95bdcc0..67dd498 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -203,7 +203,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
 'controller.requestInProgressRepoId',
 'parentView.repoVersions.@each.status',
 'App.currentStackName',
-'App.upgradeIsRunning'
+'App.upgradeIsRunning',
+'isCurrentStackPresent'
   ),
 
   /**
@@ -305,8 +306,6 @@ App.UpgradeVersionBoxView = Em.View.extend({
 });
   }
 
-
-
   this.addRemoveIopSelectButton(element, isDisabled);
   }
   element.set('isDisabled', isDisabled);
@@ -364,12 +363,17 @@ App.UpgradeVersionBoxView = Em.View.extend({
 return false;
   },
 
+  isCurrentStackPresent: 
Ember.computed('parentView.repoVersions.@each.stackVersion.state', function () {
+return 
this.get('parentView.repoVersions').someProperty('stackVersion.state', 
'CURRENT');
+  }),
+
   /**
* check if actions of NOT_REQUIRED stack version disabled
* @returns {boolean}
*/
   isDisabledOnInit: function() {
 return  this.get('controller.requestInProgress') ||
+!this.get('isCurrentStackPresent') ||
 !this.get('content.isCompatible') ||
 (App.get('upgradeIsRunning') && !App.get('upgradeSuspended')) ||
 this.get('parentView.repoVersions').someProperty('status', 
'INSTALLING');
@@ -380,7 +384,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
* @returns {boolean}
*/
   isDisabledOnInstalled: function() {
-return !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
+return !this.get('isCurrentStackPresent') ||
+  !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
   this.get('controller.requestInProgress') ||
   this.get('parentView.repoVersions').someProperty('status', 'INSTALLING') 
||
   (this.get('controller.isDowngrade') &&

http://git-wip-us.apache.org/repos/asf/ambari/blob/5eab1a56/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
--
diff --git 
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
 
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
index 4469222..fd4e890 100644
--- 
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
+++ 
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
@@ -29,6 +29,7 @@ describe('App.UpgradeVersionBoxView', function () {
 sinon.stub(App.db, 'getFilterConditions', function () {return [];});
 view = App.UpgradeVersionBoxView.create({
   initFilters: Em.K,
+  isCurrentStackPresent: true,
   controller: Em.Object.create({
 upgrade: Em.K,
 getRepoVersionInstallId: Em.K,
@@ -1038,6 +1039,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: true,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -1046,6 +1048,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -1054,6 +1057,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLING',

ambari git commit: AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In System (alexantonenko)

2017-10-06 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/trunk 7172655ff -> fab2aa3c6


AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In 
System (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fab2aa3c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fab2aa3c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fab2aa3c

Branch: refs/heads/trunk
Commit: fab2aa3c62e3dbe5cce795ca50c4b61baee1d19e
Parents: 7172655
Author: Alex Antonenko 
Authored: Fri Oct 6 16:35:29 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Oct 6 16:35:29 2017 +0300

--
 .../stack_upgrade/upgrade_version_box_view.js   | 13 --
 .../upgrade_version_box_view_test.js| 44 ++--
 2 files changed, 49 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fab2aa3c/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index 28f4f32..355ad88 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -199,7 +199,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
 'isUpgrading',
 'controller.requestInProgress',
 'controller.requestInProgressRepoId',
-'parentView.repoVersions.@each.status'
+'parentView.repoVersions.@each.status',
+'isCurrentStackPresent'
   ),
 
   /**
@@ -208,6 +209,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
*/
   isDisabledOnInit: function() {
 return  this.get('controller.requestInProgress') ||
+!this.get('isCurrentStackPresent') ||
 !this.get('content.isCompatible') ||
 (App.get('upgradeIsRunning') && !App.get('upgradeSuspended')) ||
 this.get('parentView.repoVersions').someProperty('status', 
'INSTALLING');
@@ -312,8 +314,6 @@ App.UpgradeVersionBoxView = Em.View.extend({
 });
   }
 
-
-
   }
   element.set('isDisabled', isDisabled);
 }
@@ -357,7 +357,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
* @returns {boolean}
*/
   isDisabledOnInstalled: function() {
-return !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
+return !this.get('isCurrentStackPresent') ||
+  !App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') ||
   this.get('controller.requestInProgress') ||
   this.get('parentView.repoVersions').someProperty('status', 'INSTALLING') 
||
   (this.get('controller.isDowngrade') &&
@@ -392,6 +393,10 @@ App.UpgradeVersionBoxView = Em.View.extend({
 $('.out-of-sync-badge').tooltip('destroy');
   },
 
+  isCurrentStackPresent: 
Ember.computed('parentView.repoVersions.@each.stackVersion.state', function () {
+return 
this.get('parentView.repoVersions').someProperty('stackVersion.state', 
'CURRENT');
+  }),
+
   /**
* run custom action of controller
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/fab2aa3c/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
--
diff --git 
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
 
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
index 506fb81..9bee7af 100644
--- 
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
+++ 
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
@@ -29,6 +29,7 @@ describe('App.UpgradeVersionBoxView', function () {
 sinon.stub(App.db, 'getFilterConditions', function () {return [];});
 view = App.UpgradeVersionBoxView.create({
   initFilters: Em.K,
+  isCurrentStackPresent: true,
   controller: Em.Object.create({
 upgrade: Em.K,
 getRepoVersionInstallId: Em.K,
@@ -1103,6 +1104,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: true,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -,6 +1113,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLED',
 isCompatible: true,
+isCurrentStackPresent: true,
 expected: true
   },
   {
@@ -1119,6 +1122,7 @@ describe('App.UpgradeVersionBoxView', function () {
 upgradeSuspended: false,
 status: 'INSTALLING',

[2/2] ambari git commit: AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)

2017-10-06 Thread dsen

AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to 
resources/widgets.json (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7172655f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7172655f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7172655f

Branch: refs/heads/trunk
Commit: 7172655ff269fbb7e0d29ba93197aa5a804749c0
Parents: 32bf39e
Author: Dmytro Sen 
Authored: Fri Oct 6 16:33:57 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 6 16:33:57 2017 +0300

--
 .../server/api/services/AmbariMetaInfo.java |  8 ++
 .../AmbariManagementControllerImpl.java | 22 ++---
 .../internal/ServiceResourceProvider.java   |  8 --
 .../internal/StackArtifactResourceProvider.java | 18 +---
 .../server/orm/entities/WidgetLayoutEntity.java |  6 +-
 .../ambari/server/stack/StackDirectory.java | 18 
 .../apache/ambari/server/stack/StackModule.java |  5 --
 .../apache/ambari/server/state/StackInfo.java   |  8 --
 .../resources/stacks/HDP/2.0.6/widgets.json | 95 
 .../main/resources/stacks/HDP/3.0/widgets.json  | 95 
 .../server/api/services/AmbariMetaInfoTest.java |  8 ++
 .../AmbariManagementControllerImplTest.java |  6 +-
 .../AmbariManagementControllerTest.java |  6 ++
 .../resources/stacks/OTHER/1.0/widgets.json | 95 
 14 files changed, 34 insertions(+), 364 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7172655f/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index de84965..425d247 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.Component;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.HostComponent;
 import static 
org.apache.ambari.server.controller.utilities.PropertyHelper.AGGREGATE_FUNCTION_IDENTIFIERS;
+import static 
org.apache.ambari.server.stack.StackDirectory.WIDGETS_DESCRIPTOR_FILE_NAME;
 
 import java.io.File;
 import java.io.FileReader;
@@ -125,6 +126,7 @@ public class AmbariMetaInfo {
   private File commonServicesRoot;
   private File extensionsRoot;
   private File serverVersionFile;
+  private File commonWidgetsDescriptorFile;
   private File customActionRoot;
   private Map versionDefinitions = null;
 
@@ -214,6 +216,8 @@ public class AmbariMetaInfo {
 serverVersionFile = new File(serverVersionFilePath);
 
 customActionRoot = new File(conf.getCustomActionDefinitionPath());
+
+commonWidgetsDescriptorFile = new File(conf.getResourceDirPath(), 
WIDGETS_DESCRIPTOR_FILE_NAME);
   }
 
   /**
@@ -1435,4 +1439,8 @@ public class AmbariMetaInfo {
 
 return null;
   }
+
+  public File getCommonWidgetsDescriptorFile() {
+return commonWidgetsDescriptorFile;
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/7172655f/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index b2993e3..5642575 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -5184,22 +5184,12 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 widgetDescriptorFiles.add(widgetDescriptorFile);
   }
 } else {
-  Set stackIds = new HashSet<>();
-
-  for (Service svc : cluster.getServices().values()) {
-stackIds.add(svc.getDesiredStackId());
-  }
-
-  for (StackId stackId : stackIds) {
-StackInfo stackInfo = ambariMetaInfo.getStack(stackId);
-
-String widgetDescriptorFileLocation = 
stackInfo.getWidgetsDescriptorFileLocation();
-if (widgetDescriptorFileLocation != null) {
-  File widgetDescriptorFile = new File(widgetDescriptorFileLocation);
-  if (widgetDescriptorFile.exists()) {
-

[1/2] ambari git commit: Revert "AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)"

2017-10-06 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/trunk b609fb43f -> 7172655ff


Revert "AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to 
resources/widgets.json (dsen)"

This reverts commit b609fb43fe6d77adb7606436d9772414bf002b6b.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/32bf39e7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/32bf39e7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/32bf39e7

Branch: refs/heads/trunk
Commit: 32bf39e7d276d825b5874e6a55a54bc69e24e294
Parents: b609fb4
Author: Dmytro Sen 
Authored: Fri Oct 6 16:27:13 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 6 16:27:13 2017 +0300

--
 .../server/api/services/AmbariMetaInfo.java |  8 --
 .../AmbariManagementControllerImpl.java | 22 +++--
 .../internal/ServiceResourceProvider.java   |  8 ++
 .../internal/StackArtifactResourceProvider.java | 18 +++-
 .../server/orm/entities/WidgetLayoutEntity.java |  6 +-
 .../ambari/server/stack/StackDirectory.java | 18 
 .../apache/ambari/server/stack/StackModule.java |  5 ++
 .../apache/ambari/server/state/StackInfo.java   |  8 ++
 .../server/api/services/AmbariMetaInfoTest.java |  8 --
 .../AmbariManagementControllerImplTest.java |  6 +-
 .../AmbariManagementControllerTest.java |  6 --
 .../resources/stacks/OTHER/1.0/widgets.json | 95 
 12 files changed, 174 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/32bf39e7/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 425d247..de84965 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -21,7 +21,6 @@ package org.apache.ambari.server.api.services;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.Component;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.HostComponent;
 import static 
org.apache.ambari.server.controller.utilities.PropertyHelper.AGGREGATE_FUNCTION_IDENTIFIERS;
-import static 
org.apache.ambari.server.stack.StackDirectory.WIDGETS_DESCRIPTOR_FILE_NAME;
 
 import java.io.File;
 import java.io.FileReader;
@@ -126,7 +125,6 @@ public class AmbariMetaInfo {
   private File commonServicesRoot;
   private File extensionsRoot;
   private File serverVersionFile;
-  private File commonWidgetsDescriptorFile;
   private File customActionRoot;
   private Map versionDefinitions = null;
 
@@ -216,8 +214,6 @@ public class AmbariMetaInfo {
 serverVersionFile = new File(serverVersionFilePath);
 
 customActionRoot = new File(conf.getCustomActionDefinitionPath());
-
-commonWidgetsDescriptorFile = new File(conf.getResourceDirPath(), 
WIDGETS_DESCRIPTOR_FILE_NAME);
   }
 
   /**
@@ -1439,8 +1435,4 @@ public class AmbariMetaInfo {
 
 return null;
   }
-
-  public File getCommonWidgetsDescriptorFile() {
-return commonWidgetsDescriptorFile;
-  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/32bf39e7/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 5642575..b2993e3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -5184,12 +5184,22 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 widgetDescriptorFiles.add(widgetDescriptorFile);
   }
 } else {
-  // common cluster level widgets
-  File commonWidgetsFile = ambariMetaInfo.getCommonWidgetsDescriptorFile();
-  if (commonWidgetsFile != null && commonWidgetsFile.exists()) {
-widgetDescriptorFiles.add(commonWidgetsFile);
-  } else {
-LOG.warn("Common widgets file with path {%s} doesn't exist. No cluster 
widgets will be created.", commonWidgetsFile);
+  Set stackIds = new HashSet<>();
+
+  for (Service svc : cluster.getServices().values()) {
+stackIds.add(svc.getDesiredStackId());
+

ambari git commit: AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)

2017-10-06 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/trunk 3f0025253 -> b609fb43f


AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to 
resources/widgets.json (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b609fb43
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b609fb43
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b609fb43

Branch: refs/heads/trunk
Commit: b609fb43fe6d77adb7606436d9772414bf002b6b
Parents: 3f00252
Author: Dmytro Sen 
Authored: Fri Oct 6 13:57:14 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 6 13:57:14 2017 +0300

--
 .../server/api/services/AmbariMetaInfo.java |  8 ++
 .../AmbariManagementControllerImpl.java | 22 ++---
 .../internal/ServiceResourceProvider.java   |  8 --
 .../internal/StackArtifactResourceProvider.java | 18 +---
 .../server/orm/entities/WidgetLayoutEntity.java |  6 +-
 .../ambari/server/stack/StackDirectory.java | 18 
 .../apache/ambari/server/stack/StackModule.java |  5 --
 .../apache/ambari/server/state/StackInfo.java   |  8 --
 .../server/api/services/AmbariMetaInfoTest.java |  8 ++
 .../AmbariManagementControllerImplTest.java |  6 +-
 .../AmbariManagementControllerTest.java |  6 ++
 .../resources/stacks/OTHER/1.0/widgets.json | 95 
 12 files changed, 34 insertions(+), 174 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b609fb43/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index de84965..425d247 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.Component;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.HostComponent;
 import static 
org.apache.ambari.server.controller.utilities.PropertyHelper.AGGREGATE_FUNCTION_IDENTIFIERS;
+import static 
org.apache.ambari.server.stack.StackDirectory.WIDGETS_DESCRIPTOR_FILE_NAME;
 
 import java.io.File;
 import java.io.FileReader;
@@ -125,6 +126,7 @@ public class AmbariMetaInfo {
   private File commonServicesRoot;
   private File extensionsRoot;
   private File serverVersionFile;
+  private File commonWidgetsDescriptorFile;
   private File customActionRoot;
   private Map versionDefinitions = null;
 
@@ -214,6 +216,8 @@ public class AmbariMetaInfo {
 serverVersionFile = new File(serverVersionFilePath);
 
 customActionRoot = new File(conf.getCustomActionDefinitionPath());
+
+commonWidgetsDescriptorFile = new File(conf.getResourceDirPath(), 
WIDGETS_DESCRIPTOR_FILE_NAME);
   }
 
   /**
@@ -1435,4 +1439,8 @@ public class AmbariMetaInfo {
 
 return null;
   }
+
+  public File getCommonWidgetsDescriptorFile() {
+return commonWidgetsDescriptorFile;
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/b609fb43/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index b2993e3..5642575 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -5184,22 +5184,12 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 widgetDescriptorFiles.add(widgetDescriptorFile);
   }
 } else {
-  Set stackIds = new HashSet<>();
-
-  for (Service svc : cluster.getServices().values()) {
-stackIds.add(svc.getDesiredStackId());
-  }
-
-  for (StackId stackId : stackIds) {
-StackInfo stackInfo = ambariMetaInfo.getStack(stackId);
-
-String widgetDescriptorFileLocation = 
stackInfo.getWidgetsDescriptorFileLocation();
-if (widgetDescriptorFileLocation != null) {
-  File widgetDescriptorFile = new File(widgetDescriptorFileLocation);
-  if (widgetDescriptorFile.exists()) {
-widgetDescriptorFiles.add(widgetDescriptorFile);
-

ambari git commit: AMBARI-22148 Style changes for service summary. (atkach)

2017-10-06 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/trunk 0f32765dc -> 3f0025253


AMBARI-22148 Style changes for service summary. (atkach)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f002525
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f002525
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f002525

Branch: refs/heads/trunk
Commit: 3f00252534e2dd4b08bd5d308757070fe849cba2
Parents: 0f32765
Author: Andrii Tkach 
Authored: Thu Oct 5 17:56:44 2017 +0300
Committer: Andrii Tkach 
Committed: Fri Oct 6 12:50:49 2017 +0300

--
 ambari-web/app/messages.js  |  6 ++--
 ambari-web/app/styles/application.less  |  2 +-
 .../app/templates/main/service/info/summary.hbs | 16 -
 .../templates/main/service/services/hdfs.hbs| 38 
 .../app/views/main/service/info/summary.js  |  8 +
 .../app/views/main/service/services/hdfs.js |  2 --
 6 files changed, 51 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index d0c7e39..7cde3d1 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -357,6 +357,7 @@ Em.I18n.translations = {
   'common.repositoryType': 'Repository Type',
   'common.rolling.downgrade': 'Rolling Downgrade',
   'common.express.downgrade': 'Express Downgrade',
+  'common.views': 'Views',
 
   'models.alert_instance.tiggered.verbose': "Occurred on {0}  Checked on 
{1}",
   'models.alert_definition.triggered.verbose': "Occurred on {0}",
@@ -2961,8 +2962,9 @@ Em.I18n.translations = {
   'dashboard.services.hdfs.nodes.heapUsed':'{0} / {1}',
 
   'dashboard.services.hdfs.chart.label':'Capacity (Used/Total)',
-  'dashboard.services.hdfs.blockErrors':'{0} / {1} / {2}',
-  'dashboard.services.hdfs.blockErrorsDesc':'corrupt replica / missing / under 
replicated',
+  'dashboard.services.hdfs.blockErrors.corrupt': 'corrupt replica',
+  'dashboard.services.hdfs.blockErrors.replicated': 'under replicated',
+  'dashboard.services.hdfs.blockErrors.missing': 'missing',
   'dashboard.services.hdfs.datanode.status.tooltip.live': 'This is the number 
of DataNodes that are live as reported from ' +
 'the NameNode. Even if a DataNode process is up, NameNode might see the 
status as dead ' +
 'if the DataNode is not communicating with the NameNode as expected. This 
can be due situations ' +

http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 8181996..7c9cc8e 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1083,7 +1083,7 @@ a:focus {
   .col-md-3 {
 min-height: 100px;
 margin-left: 2px;
-min-width: 150px;
+min-width: 180px;
   }
   .summary-label {
 font-size: 12px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/templates/main/service/info/summary.hbs
--
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs 
b/ambari-web/app/templates/main/service/info/summary.hbs
index b1b0a42..075cae0 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -57,8 +57,8 @@
   
 {{#if view.hasAlertDefinitions}}
   
-
 {{#if view.alertsCount}}
+  
   
 {{view.alertsCount}}
   
@@ -118,6 +118,20 @@
   {{/if}}
 
   {{/view}}
+  
+ 
+   {{t common.views}}
+ 
+  
+  
+   {{#if view.views.length}}
+ {{#each item in view.views}}
+   {{item.label}}
+ {{/each}}
+   {{else}}
+ {{t menu.item.views.noViews}}
+   {{/if}}
+  
 
   
   {{! widgets in the metrics panel are loaded seperately from summary page 
text information

http://git-wip-us.apache.org/repos/asf/ambari/blob/3f002525/ambari-web/app/templates/main/service/services/hdfs.hbs
--
diff --git a/ambari-web/app/templates/main/service/services/hdfs.hbs 
b/ambari-web/app/templates/main/service/services/hdfs.hbs
index 967239d..fec5bac 100644
--- a/ambari-web/app/templates/main/service/services/hdfs.hbs
+++ b/ambari-web/app/templates/main/service/services/hdfs.hbs
@@

ambari git commit: AMBARI-21854 Adapt Repository Files For Existing Deployments (dgrinenko)

2017-10-06 Thread hapylestat

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 415862712 -> 6bfcb838e


AMBARI-21854 Adapt Repository Files For Existing Deployments (dgrinenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6bfcb838
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6bfcb838
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6bfcb838

Branch: refs/heads/branch-2.6
Commit: 6bfcb838e710c3389f7a804a7cdb620a3e465e15
Parents: 4158627
Author: Dmytro Grinenko 
Authored: Fri Oct 6 11:43:26 2017 +0300
Committer: Dmytro Grinenko 
Committed: Fri Oct 6 11:43:26 2017 +0300

--
 .../core/providers/package/__init__.py  |  2 +-
 .../core/providers/package/apt.py   | 23 --
 .../core/providers/package/yumrpm.py| 82 ++-
 .../core/providers/package/zypper.py| 37 +++--
 .../libraries/functions/repository_util.py  | 79 ++
 .../libraries/script/script.py  |  3 +-
 .../ambari/server/agent/CommandRepository.java  | 85 
 .../ambari/server/agent/ExecutionCommand.java   |  1 +
 .../server/configuration/Configuration.java | 13 +++
 .../controller/AmbariActionExecutionHelper.java |  1 -
 .../AmbariCustomCommandExecutionHelper.java | 17 +++-
 .../orm/entities/RepositoryVersionEntity.java   | 27 +++
 .../stack/upgrade/RepositoryVersionHelper.java  | 21 -
 .../server/upgrade/UpgradeCatalog260.java   | 13 +++
 .../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 +
 .../custom_actions/scripts/install_packages.py  |  5 +-
 ...ClusterStackVersionResourceProviderTest.java |  2 +
 .../configs/install_packages_config.json|  1 +
 .../install_packages_repository_file.json   |  1 +
 24 files changed, 339 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6bfcb838/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
index 13cb784..e531f3d 100644
--- 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
+++ 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
@@ -69,7 +69,7 @@ class PackageProvider(Provider):
   def get_available_packages_in_repos(self, repositories):
 """
 Gets all (both installed and available) packages that are available at 
given repositories.
-:param repositories: from command configs like 
config['repositoryFile']['repositories']
+:type repositories 
resource_management.libraries.functions.repository_util.CommandRepository
 :return: installed and available packages from these repositories
 """
 raise NotImplementedError()

http://git-wip-us.apache.org/repos/asf/ambari/blob/6bfcb838/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
 
b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
index 5fcb945..7f3563e 100644
--- 
a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
+++ 
b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
@@ -275,24 +275,31 @@ class AptProvider(PackageProvider):
 
 return packages
 
-  def get_available_packages_in_repos(self, repositories):
+  def get_available_packages_in_repos(self, repos):
 """
 Gets all (both installed and available) packages that are available at 
given repositories.
-:param repositories: from command configs like 
config['repositoryFile']['repositories']
+:type repos 
resource_management.libraries.functions.repository_util.CommandRepository
 :return: installed and available packages from these repositories
 """
 
 filtered_packages = []
 packages = self.all_available_packages()
+repo_ids = []
 
-for repo in repositories:
-  repo_url_part = repo['baseUrl'].replace("http://;, "").replace("/", "_")
+for repo in repos.items:
+  repo_ids.append(repo.base_url.replace("http://;, "").replace("/", "_"))
 
-  for package in packages:
-if

[1/2] ambari git commit: AMBARI-22124. Refactor AMS logic in stack advisors to service advisors.(vbrodetskyi)

2017-10-06 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/trunk 9adfcdcbd -> 0f32765dc


http://git-wip-us.apache.org/repos/asf/ambari/blob/0f32765d/ambari-server/src/test/python/common-services/AMBARI_METRICS/test_service_advisor.py
--
diff --git 
a/ambari-server/src/test/python/common-services/AMBARI_METRICS/test_service_advisor.py
 
b/ambari-server/src/test/python/common-services/AMBARI_METRICS/test_service_advisor.py
new file mode 100644
index 000..05254fe
--- /dev/null
+++ 
b/ambari-server/src/test/python/common-services/AMBARI_METRICS/test_service_advisor.py
@@ -0,0 +1,596 @@
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import imp
+import json
+import os
+from unittest import TestCase
+
+from mock.mock import patch, MagicMock
+
+
+class TestAMBARI_METRICS010ServiceAdvisor(TestCase):
+
+  testDirectory = os.path.dirname(os.path.abspath(__file__))
+  stack_advisor_path = os.path.join(testDirectory, 
'../../../../main/resources/stacks/stack_advisor.py')
+  with open(stack_advisor_path, 'rb') as fp:
+imp.load_module('stack_advisor', fp, stack_advisor_path, ('.py', 'rb', 
imp.PY_SOURCE))
+
+  serviceAdvisorPath = 
'../../../../main/resources/common-services/AMBARI_METRICS/0.1.0/service_advisor.py'
+  ambariMetrics010ServiceAdvisorPath = os.path.join(testDirectory, 
serviceAdvisorPath)
+  with open(ambariMetrics010ServiceAdvisorPath, 'rb') as fp:
+service_advisor_impl = imp.load_module('service_advisor_impl', fp, 
ambariMetrics010ServiceAdvisorPath, ('.py', 'rb', imp.PY_SOURCE))
+
+  def setUp(self):
+serviceAdvisorClass = getattr(self.service_advisor_impl, 
'AMBARI_METRICSServiceAdvisor')
+self.serviceAdvisor = serviceAdvisorClass()
+
+
+  def test_recommendAmsConfigurations(self):
+configurations = {
+  "hadoop-env": {
+"properties": {
+  "hdfs_user": "hdfs",
+  "proxyuser_group": "users"
+}
+  }
+}
+
+hosts = {
+  "items": [
+{
+  "href": "/api/v1/hosts/host1",
+  "Hosts": {
+"cpu_count": 1,
+"host_name": "c6401.ambari.apache.org",
+"os_arch": "x86_64",
+"os_type": "centos6",
+"ph_cpu_count": 1,
+"public_host_name": "public.c6401.ambari.apache.org",
+"rack_info": "/default-rack",
+"total_mem": 2097152,
+"disk_info": [{
+  "size": '8000',
+  "mountpoint": "/"
+}]
+  }
+},
+{
+  "href": "/api/v1/hosts/host2",
+  "Hosts": {
+"cpu_count": 1,
+"host_name": "c6402.ambari.apache.org",
+"os_arch": "x86_64",
+"os_type": "centos6",
+"ph_cpu_count": 1,
+"public_host_name": "public.c6402.ambari.apache.org",
+"rack_info": "/default-rack",
+"total_mem": 1048576,
+"disk_info": [{
+  "size": '8',
+  "mountpoint": "/"
+}]
+  }
+}
+  ]}
+
+
+services1 = {
+  "services": [
+{
+  "StackServices": {
+"service_name": "HDFS"
+  }, "components": [
+  {
+"StackServiceComponents": {
+  "component_name": "NAMENODE",
+  "hostnames": ["c6401.ambari.apache.org"]
+}
+  }
+]
+},
+{
+  "StackServices": {
+"service_name": "AMBARI_METRICS"
+  },
+  "components": [
+{
+  "StackServiceComponents": {
+"component_name": "METRICS_COLLECTOR",
+"hostnames": ["c6401.ambari.apache.org", 
"c6402.ambari.apache.org"]
+  }
+}, {
+  "StackServiceComponents": {
+"component_name": "METRICS_MONITOR",
+"hostnames": ["c6401.ambari.apache.org", 
"c6402.ambari.apache.org"]
+  }
+}
+  ]
+}],
+  "configurations": configurations,
+  "ambari-server-properties": {"ambari-server.user":"ambari_user"}
+}
+
+clusterData = {
+  "totalAvailableRam": 2048
+}
+
+expected =

[2/2] ambari git commit: AMBARI-22124. Refactor AMS logic in stack advisors to service advisors.(vbrodetskyi)

2017-10-06 Thread vbrodetskyi

AMBARI-22124. Refactor AMS logic in stack advisors to service 
advisors.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0f32765d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0f32765d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0f32765d

Branch: refs/heads/trunk
Commit: 0f32765dc2250044c7925f4e68e6f61b7a77d8f8
Parents: 9adfcdc
Author: Vitaly Brodetskyi 
Authored: Fri Oct 6 10:40:33 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Fri Oct 6 10:40:33 2017 +0300

--
 .../AMBARI_METRICS/0.1.0/service_advisor.py | 787 +++
 .../ATLAS/0.7.0.3.0/service_advisor.py  |   5 +-
 .../stacks/HDP/2.0.6/services/stack_advisor.py  | 542 +
 .../stacks/HDP/2.2/services/stack_advisor.py|   1 -
 .../AMBARI_METRICS/test_service_advisor.py  | 596 ++
 .../stacks/2.0.6/common/test_stack_advisor.py   | 576 --
 .../stacks/2.2/common/test_stack_advisor.py | 511 
 7 files changed, 1388 insertions(+), 1630 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0f32765d/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/service_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/service_advisor.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/service_advisor.py
new file mode 100644
index 000..eae98bf
--- /dev/null
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/service_advisor.py
@@ -0,0 +1,787 @@
+#!/usr/bin/env ambari-python-wrap
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+# Python imports
+import imp
+import re
+import os
+import sys
+import socket
+import traceback
+from math import ceil, floor, log
+
+
+from resource_management.core.logger import Logger
+
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+STACKS_DIR = os.path.join(SCRIPT_DIR, '../../../stacks/')
+PARENT_FILE = os.path.join(STACKS_DIR, 'service_advisor.py')
+
+#split points
+metricsDir = os.path.join(SCRIPT_DIR, 'package')
+print "METRICS_DIR=>" + str(metricsDir)
+serviceMetricsDir = os.path.join(metricsDir, 'files', 'service-metrics')
+customServiceMetricsDir = os.path.join(SCRIPT_DIR, 
'../../../dashboards/service-metrics')
+sys.path.append(os.path.join(metricsDir, 'scripts'))
+
+from split_points import FindSplitPointsForAMSRegions
+
+try:
+  with open(PARENT_FILE, 'rb') as fp:
+service_advisor = imp.load_module('service_advisor', fp, PARENT_FILE, 
('.py', 'rb', imp.PY_SOURCE))
+except Exception as e:
+  traceback.print_exc()
+  print "Failed to load parent"
+
+class AMBARI_METRICSServiceAdvisor(service_advisor.ServiceAdvisor):
+
+  def __init__(self, *args, **kwargs):
+self.as_super = super(AMBARI_METRICSServiceAdvisor, self)
+self.as_super.__init__(*args, **kwargs)
+
+# Always call these methods
+self.modifyMastersWithMultipleInstances()
+self.modifyCardinalitiesDict()
+self.modifyHeapSizeProperties()
+self.modifyNotValuableComponents()
+self.modifyComponentsNotPreferableOnServer()
+self.modifyComponentLayoutSchemes()
+
+  def modifyMastersWithMultipleInstances(self):
+"""
+Modify the set of masters with multiple instances.
+Must be overriden in child class.
+"""
+# Nothing to do
+pass
+
+  def modifyCardinalitiesDict(self):
+"""
+Modify the dictionary of cardinalities.
+Must be overriden in child class.
+"""
+min_val = 1
+
+self.cardinalitiesDict.update(
+  {
+'METRICS_COLLECTOR': {"min": min_val}
+  }
+)
+
+  def modifyHeapSizeProperties(self):
+"""
+Modify the dictionary of heap size properties.
+Must be overriden in child class.
+"""
+self.heap_size_properties = {"METRICS_COLLECTOR":
+   [{"config-name": "ams-hbase-env",
+ "property":

ambari git commit: AMBARI-22121. Create mpack for Isilon OneFS (amagyar)

2017-10-06 Thread amagyar

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-22008 add33d4f1 -> 95aed902d


AMBARI-22121. Create mpack for Isilon OneFS (amagyar)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/95aed902
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/95aed902
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/95aed902

Branch: refs/heads/branch-feature-AMBARI-22008
Commit: 95aed902d1473de3968fefc280be70a072b46701
Parents: add33d4
Author: Attila Magyar 
Authored: Fri Oct 6 09:13:09 2017 +0200
Committer: Attila Magyar 
Committed: Fri Oct 6 09:13:09 2017 +0200

--
 .../isilon-onefs-mpack/.gitignore   |   1 +
 .../management-packs/isilon-onefs-mpack/pom.xml | 110 ++
 .../src/main/assemblies/isilon-onefs-mpack.xml  |  40 ++
 .../addon-services/ONEFS/1.0.0/alerts.json  |  46 +++
 .../ONEFS/1.0.0/configuration/core-site.xml | 102 +
 .../ONEFS/1.0.0/configuration/hadoop-env.xml| 386 +++
 .../ONEFS/1.0.0/configuration/hdfs-site.xml |  61 +++
 .../addon-services/ONEFS/1.0.0/metainfo.xml |  90 +
 .../addon-services/ONEFS/1.0.0/metrics.json |  59 +++
 .../ONEFS/1.0.0/package/scripts/__init__.py |  20 +
 .../ONEFS/1.0.0/package/scripts/onefs_client.py |  56 +++
 .../ONEFS/1.0.0/package/scripts/params.py   |  29 ++
 .../ONEFS/1.0.0/package/scripts/params_linux.py |  74 
 .../1.0.0/package/scripts/params_windows.py |  83 
 .../1.0.0/package/scripts/service_check.py  | 137 +++
 .../1.0.0/package/scripts/status_params.py  |  58 +++
 .../addon-services/ONEFS/1.0.0/widgets.json |  38 ++
 .../src/main/resources/mpack.json   |  28 ++
 18 files changed, 1418 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/95aed902/contrib/management-packs/isilon-onefs-mpack/.gitignore
--
diff --git a/contrib/management-packs/isilon-onefs-mpack/.gitignore 
b/contrib/management-packs/isilon-onefs-mpack/.gitignore
new file mode 100644
index 000..1377554
--- /dev/null
+++ b/contrib/management-packs/isilon-onefs-mpack/.gitignore
@@ -0,0 +1 @@
+*.swp

http://git-wip-us.apache.org/repos/asf/ambari/blob/95aed902/contrib/management-packs/isilon-onefs-mpack/pom.xml
--
diff --git a/contrib/management-packs/isilon-onefs-mpack/pom.xml 
b/contrib/management-packs/isilon-onefs-mpack/pom.xml
new file mode 100644
index 000..5d8f215
--- /dev/null
+++ b/contrib/management-packs/isilon-onefs-mpack/pom.xml
@@ -0,0 +1,110 @@
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+  4.0.0
+  org.apache.ambari
+  isilon-onefs-mpack
+  pom
+  0.1.0.0-SNAPSHOT
+  Isilon OneFS Ambari Management Pack
+  http://ambari.apache.org/
+  
+3.0.0.0
+
+1.0.0
+  
+  
+org.apache.ambari.contrib.mpacks
+ambari-contrib-mpacks
+2.0.0.0-SNAPSHOT
+  
+  
+
+  
+org.codehaus.mojo
+build-helper-maven-plugin
+1.8
+
+  
+parse-version
+validate
+
+  parse-version
+
+  
+  
+regex-property
+
+  regex-property
+
+
+  mpackVersion
+  ${project.version}
+  ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
+  $1.$2.$3.$4
+  false
+
+  
+
+  
+  
+maven-resources-plugin
+2.6
+
+  
+copy-resources
+compile
+
+  copy-resources
+
+
+  ${basedir}/target/
+  
+
+  ${basedir}/src/main/resources
+  
+mpack.json
+  
+  true
+
+  
+
+  
+
+  
+  
+maven-assembly-plugin
+
+  gnu
+  
+src/main/assemblies/isilon-onefs-mpack.xml
+  
+
+
+  
+build-tarball
+package
+
+  single
+
+  
+
+  
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/95aed902/contrib/management-packs/isilon-onefs-mpack/src/main/assemblies/isilon-onefs-mpack.xml
--
diff --git

[2/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

[3/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

[1/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

ambari git commit: AMBARI-22163 : Anomaly Storage: Design Metric anomalies schema. (avijayan)

[1/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

[3/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

[2/3] ambari git commit: AMBARI-21776. Move druid version to druid 0.10.1 and drop TP flag. (Slim Bouguerra via Swapan Shridhar).

ambari git commit: AMBARI-14714. fix compiler errors (benyoka)

ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

ambari git commit: AMBARI-14714. add new blueprint schema elements (magyari_sandor)

ambari git commit: AMBARI-21601 [addendum]. Pre-configure services when Kerberos is enabled to reduce number of core service restarts when services are added (Eugene Chekanskiy via rlevas)

ambari git commit: AMBARI-21601 [addendum]. Pre-configure services when Kerberos is enabled to reduce number of core service restarts when services are added (Eugene Chekanskiy via rlevas)

ambari git commit: AMBARI-14714. add new v2 interfaces for blueprint

ambari git commit: AMBARI-22139 - CURRENT cluster Shows Upgrade If Component Didn't Report Version (jonathanhurley)

ambari git commit: AMBARI-22161. Unable to ignore service check failures during Upgrade (alexantonenko)

ambari git commit: AMBARI-22161. Unable to ignore service check failures during Upgrade (alexantonenko)

ambari git commit: AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)

[2/2] ambari git commit: AMBARI-22158. Ambari schema upgrade fails when upgrading ambari from 2.5.1.0 to 2.6.0.0 and using oracle as database (dlysnichenko)

[1/2] ambari git commit: AMBARI-22158. Ambari schema upgrade fails when upgrading ambari from 2.5.1.0 to 2.6.0.0 and using oracle as database (dlysnichenko)

ambari git commit: AMBARI-22139 - CURRENT cluster Shows Upgrade If Component Didn't Report Version (jonathanhurley)

ambari git commit: Revert "AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)"

ambari git commit: AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In System (alexantonenko)

ambari git commit: AMBARI-22157. Web Client Should Never List Any Upgrade Actions On Only Stack In System (alexantonenko)

[2/2] ambari git commit: AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)

[1/2] ambari git commit: Revert "AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)"

ambari git commit: AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (dsen)

ambari git commit: AMBARI-22148 Style changes for service summary. (atkach)

ambari git commit: AMBARI-21854 Adapt Repository Files For Existing Deployments (dgrinenko)

[1/2] ambari git commit: AMBARI-22124. Refactor AMS logic in stack advisors to service advisors.(vbrodetskyi)

[2/2] ambari git commit: AMBARI-22124. Refactor AMS logic in stack advisors to service advisors.(vbrodetskyi)

ambari git commit: AMBARI-22121. Create mpack for Isilon OneFS (amagyar)

31 matches

Site Navigation

Mail list logo

Footer information