[06/17] ambari git commit: AMBARI-21649 : Update Atlas log4j to reflect latest configurations (Vishal Suvagia via mugdha)

[jonathanhurley]

AMBARI-21649 : Update Atlas log4j to reflect latest configurations (Vishal 
Suvagia via mugdha)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 6ddd4ac76f426e31386822b37b20ec3fa7b133e5
Parents: abcf1ce
Author: Vishal Suvagia 
Authored: Wed Aug 9 14:02:05 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Aug 11 10:31:08 2017 +0530

--
 .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml  | 10 --
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml|  4 
 .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 +
 .../HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml  |  4 ++--
 .../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml  |  5 +
 .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml|  4 
 .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml |  1 +
 7 files changed, 25 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index f227bac..8664584 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -104,8 +104,8 @@
 atlas-log4j
 
 
-
-
+
+
   
 
   
@@ -127,6 +127,12 @@
 application-properties
 
   
+
+  
+atlas-log4j
+
+
+  
 
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index 1697604..7074e77 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -476,6 +476,10 @@
 
   
 
+  
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 840b17d..995a1d3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -1102,6 +1102,7 @@
   
   
   
+  
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
index 9e3abcf..8b5cad5 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
@@ -74,7 +74,7 @@
 
   
 
-  
+  
 
 
 
@@ -116,7 +116,7 @@
 
 
   
-
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ddd4ac7/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index c2c1532..a874fa7 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -175,6 +175,11 @@
 

[07/17] ambari git commit: AMBARI-21648. Do not use 'dbo' schema name in idempotent Ambari DDL generator for AzureDB. (stoader)

[jonathanhurley]

AMBARI-21648. Do not use 'dbo' schema name in idempotent Ambari DDL generator 
for AzureDB. (stoader)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: dba278bfbefad7c7c92e64cded3821f7bcf985b4
Parents: 6ddd4ac
Author: Toader, Sebastian 
Authored: Fri Aug 4 10:04:32 2017 +0200
Committer: Toader, Sebastian 
Committed: Fri Aug 11 09:52:07 2017 +0200

--
 ambari-server/src/main/python/azuredb_create_generator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dba278bf/ambari-server/src/main/python/azuredb_create_generator.py
--
diff --git a/ambari-server/src/main/python/azuredb_create_generator.py 
b/ambari-server/src/main/python/azuredb_create_generator.py
index 6ceaa90..1794d79 100755
--- a/ambari-server/src/main/python/azuredb_create_generator.py
+++ b/ambari-server/src/main/python/azuredb_create_generator.py
@@ -38,7 +38,7 @@ for statement in input_statements:
   statement = re.sub(
 create_table_re,
 dedent('''\
-  IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('dbo.\g<1>') AND type = 'U')
+  IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('\g<1>') AND type = 'U')
   BEGIN
   \g<0>
   END

[04/17] ambari git commit: AMBARI-21705 : Metrics Collector start failed due to 'Unable to initialize HA controller'. (avijayan)

[jonathanhurley]

AMBARI-21705 : Metrics Collector start failed due to 'Unable to initialize HA 
controller'. (avijayan)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 601cd7daedf70449a6e186355bd6786dbf15f5ce
Parents: a7e8dd9
Author: Aravindan Vijayan 
Authored: Thu Aug 10 16:47:55 2017 -0700
Committer: Aravindan Vijayan 
Committed: Thu Aug 10 16:47:55 2017 -0700

--
 .../metrics/timeline/availability/MetricCollectorHAController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/601cd7da/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
index addb14e..a06f4e8 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/availability/MetricCollectorHAController.java
@@ -138,8 +138,8 @@ public class MetricCollectorHAController {
 if (CollectionUtils.isEmpty(nodes) || 
!nodes.contains(instanceConfig.getInstanceName())) {
   LOG.info("Adding participant instance " + instanceConfig);
   admin.addInstance(clusterName, instanceConfig);
-  success = true;
 }
+success = true;
   } catch (HelixException | ZkNoNodeException ex) {
 LOG.warn("Helix Cluster not yet setup fully.");
 if (i < tries - 1) {

[11/17] ambari git commit: AMBARI-21706 : Fix exception messages whenever empty host list is passed in predicate. (avijayan)

[jonathanhurley]

AMBARI-21706 : Fix exception messages whenever empty host list is passed in 
predicate. (avijayan)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 0630899ce80dcc2cbac76090480e33b592658f04
Parents: cfa2998
Author: Aravindan Vijayan 
Authored: Fri Aug 11 12:00:07 2017 -0700
Committer: Aravindan Vijayan 
Committed: Fri Aug 11 12:00:07 2017 -0700

--
 .../server/api/predicate/QueryParser.java   |  4 ++-
 .../api/predicate/operators/InOperator.java |  2 +-
 .../internal/StackAdvisorResourceProvider.java  | 20 ---
 .../server/api/predicate/QueryParserTest.java   | 18 ++
 .../StackAdvisorResourceProviderTest.java   | 26 
 5 files changed, 65 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0630899c/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
index 7386813..6e189c5 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
@@ -107,7 +107,9 @@ public class QueryParser {
 if (keyObject != null) {
   String key = keyObject.toString();
   if (key.endsWith("/host_name")) {
-
expression.setRightOperand(expression.getRightOperand().toString().toLowerCase());
+if (expression.getRightOperand() != null) {
+  
expression.setRightOperand(expression.getRightOperand().toString().toLowerCase());
+}
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/0630899c/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
index 629c3fc..eedf2bb 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
@@ -47,7 +47,7 @@ public class InOperator extends AbstractOperator implements 
RelationalOperator {
   public Predicate toPredicate(String prop, String val) throws 
InvalidQueryException {
 
 if (val == null) {
-  throw new InvalidQueryException("IN operator is missing a required right 
operand.");
+  throw new InvalidQueryException("IN operator is missing a required right 
operand for property " + prop);
 }
 
 String[] tokens = val.split(",");

http://git-wip-us.apache.org/repos/asf/ambari/blob/0630899c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
index 5bb52c2..dd32c6b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.controller.internal;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -107,8 +108,22 @@ public abstract class StackAdvisorResourceProvider extends 
ReadOnlyResourceProvi
* 
* @see JsonRequestBodyParser for arrays parsing
*/
-  List hosts = (List) getRequestProperty(request, 
HOST_PROPERTY);
-  List services = (List) getRequestProperty(request, 
SERVICES_PROPERTY);
+  Object hostsObject = getRequestProperty(request, HOST_PROPERTY);
+  if (hostsObject instanceof LinkedHashSet) {
+if (((LinkedHashSet)hostsObject).isEmpty()) {
+  throw new Exception("Empty host list passed to recommendation 
service");

[02/17] ambari git commit: Revert "AMBARI-21642. Add hadoop LZO jars if installed in the cluster for DRUID. (Slim Bouguerra via Swapan Shridhar)"

[jonathanhurley]

Revert "AMBARI-21642. Add hadoop LZO jars if installed in the cluster for 
DRUID. (Slim Bouguerra via Swapan Shridhar)"

This reverts commit 8f1765f9d899026a56a333d7323130404758669a.


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 3a85a2c3e9874e64043a23745c1034b2f8258cc0
Parents: cf1ab75
Author: Jonathan Hurley 
Authored: Thu Aug 10 13:49:23 2017 -0400
Committer: Jonathan Hurley 
Committed: Thu Aug 10 13:49:23 2017 -0400

--
 .../DRUID/0.9.2/package/scripts/druid.py   |  6 --
 .../DRUID/0.9.2/package/scripts/params.py  | 13 -
 2 files changed, 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3a85a2c3/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
index 4e1ced1..cc02519 100644
--- 
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
@@ -113,12 +113,6 @@ def druid(upgrade_type=None, nodeType=None):

node_jvm_opts=druid_env_config[format('druid.{node_type_lowercase}.jvm.opts')])
  )
 Logger.info(format("Created druid-{node_type_lowercase} jvm.config"))
-# Handling hadoop Lzo jars if enable and node type is hadoop related eg 
Overlords and MMs
-if params.lzo_enabled and len(params.lzo_packages) > 0 and (
-node_type == 'middleManager' or node_type == 'overlord'):
-Logger.info(
-format("Copying hadoop lzo jars from {hadoop_lib_home} to 
{hadoop_dependencies_dir}/hadoop-client/*/"))
-Execute(format('{sudo} cp {hadoop_lib_home}/hadoop-lzo*.jar 
{hadoop_dependencies_dir}/hadoop-client/*/'))
 
   # All druid nodes have dependency on hdfs_client
   ensure_hadoop_directories()

http://git-wip-us.apache.org/repos/asf/ambari/blob/3a85a2c3/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index 9e766cd..d47e604 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -18,7 +18,6 @@ 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
@@ -27,7 +26,6 @@ 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
 
@@ -52,14 +50,10 @@ 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}")
@@ -236,10 +230,3 @@ if not len(druid_router_hosts) == 0:
   druid_router_host = druid_router_hosts[0]
 druid_coordinator_port = 
config['configurations']['druid-coordinator']['druid.port']
 druid_router_port = config['configurations']['druid-router']['druid.port']
-
-# Create current Hadoop Clients  Libs
-stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
-io_compression_codecs = 
default("/configurations/core-site/io.compression.codecs", None)
-lzo_enabled 

[13/17] ambari git commit: AMBARI-21549. Ambari upgrade should update unique constraints (dlysnichenko)

[jonathanhurley]

AMBARI-21549. Ambari upgrade should update unique constraints (dlysnichenko)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 9fe2b6788e198a47a2fcc2090810d16e683b5b48
Parents: 7ab5876
Author: Lisnichenko Dmitro 
Authored: Mon Aug 14 14:50:04 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Mon Aug 14 14:50:04 2017 +0300

--
 .../java/org/apache/ambari/server/orm/DBAccessor.java | 10 ++
 .../java/org/apache/ambari/server/orm/DBAccessorImpl.java |  7 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9fe2b678/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index 8f1a192..01bec59 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -184,6 +184,16 @@ public interface DBAccessor {
 throws SQLException;
 
   /**
+   * Add unique table constraint
+   * @param constraintName name of the constraint
+   * @param tableName name of the table
+   * @param columnNames list of columns
+   * @throws SQLException
+   */
+  void updateUniqueConstraint(String tableName, String constraintName, 
String... columnNames)
+  throws SQLException;
+
+  /**
*
* @param tableName name of the table
* @param constraintName name of the constraint

http://git-wip-us.apache.org/repos/asf/ambari/blob/9fe2b678/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index d693809..bed21e8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -571,6 +571,13 @@ public class DBAccessorImpl implements DBAccessor {
   }
 
   @Override
+  public void updateUniqueConstraint(String tableName, String constraintName, 
String... columnNames)
+  throws SQLException {
+dropUniqueConstraint(tableName, constraintName);
+addUniqueConstraint(tableName, constraintName, columnNames);
+  }
+
+  @Override
   public void addPKConstraint(String tableName, String constraintName, boolean 
ignoreErrors, String... columnName) throws SQLException {
 if (!tableHasPrimaryKey(tableName, null) && tableHasColumn(tableName, 
columnName)) {
   String query = dbmsHelper.getAddPrimaryKeyConstraintStatement(tableName, 
constraintName, columnName);

[03/17] ambari git commit: AMBARI-21696. Spark thrift service was alerting for connectivity for all newly created clusters. (Mingjie Tang via stoader)

[jonathanhurley]

AMBARI-21696. Spark thrift service was alerting for connectivity for all newly 
created clusters. (Mingjie Tang via stoader)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: a7e8dd9d2334e69a70f833131415951dca79527c
Parents: 3a85a2c
Author: Mingjie Tang 
Authored: Thu Aug 10 11:36:21 2017 +0200
Committer: Toader, Sebastian 
Committed: Thu Aug 10 21:52:00 2017 +0200

--
 .../SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py  | 2 +-
 .../2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7e8dd9d/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
index 93a2de8..3f80fd9 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
@@ -44,7 +44,7 @@ HIVE_SERVER2_PRINCIPAL_KEY = 
'{{hive-site/hive.server2.authentication.kerberos.p
 # The configured Kerberos executable search paths, if any
 KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = 
'{{kerberos-env/executable_search_paths}}'
 
-THRIFT_PORT_DEFAULT = 10015
+THRIFT_PORT_DEFAULT = 10001
 HIVE_SERVER_TRANSPORT_MODE_DEFAULT = 'binary'
 
 HIVEUSER_DEFAULT = 'hive'

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7e8dd9d/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
index 1ce4aca..9e1afea 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
@@ -45,7 +45,7 @@ HIVE_SERVER2_PRINCIPAL_KEY = 
'{{hive-site/hive.server2.authentication.kerberos.p
 # The configured Kerberos executable search paths, if any
 KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = 
'{{kerberos-env/executable_search_paths}}'
 
-THRIFT_PORT_DEFAULT = 10016
+THRIFT_PORT_DEFAULT = 10002
 HIVE_SERVER_TRANSPORT_MODE_DEFAULT = 'binary'
 
 HIVEUSER_DEFAULT = 'hive'

[01/17] ambari git commit: Merge branch 'branch-2.6' into branch-feature-AMBARI-21450

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 c35a834d7 -> bbd751130


Merge branch 'branch-2.6' into branch-feature-AMBARI-21450


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: cf1ab7575eb9872eac66dafc504e62a4da44c41b
Parents: 2307c9d 6d50cd6
Author: Jonathan Hurley 
Authored: Thu Aug 10 13:11:09 2017 -0400
Committer: Jonathan Hurley 
Committed: Thu Aug 10 13:48:14 2017 -0400

--
 .../upgrade/StackUpgradeFinishListener.java | 13 +
 .../metadata/CachedRoleCommandOrderProvider.java| 10 --
 ambari-server/src/main/resources/scripts/configs.py |  2 +-
 .../stacks/BigInsights/4.2.5/repos/repoinfo.xml | 16 ++--
 .../HDP/2.0.6/hooks/before-START/scripts/params.py  |  6 +++---
 .../upgrade/StackUpgradeFinishListenerTest.java | 14 ++
 6 files changed, 45 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cf1ab757/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
--
diff --cc 
ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index bd86b50,bd86b50..de53150
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@@ -331,10 -331,10 +331,10 @@@ if dfs_ha_enabled
   namenode_rpc = nn_host
 pass
   pass
--elif 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']:
--  namenode_rpc = 
default('/configurations/hdfs-site/dfs.namenode.rpc-address', None)
  else:
--  namenode_rpc = default('/configurations/core-site/fs.defaultFS', None)
++  namenode_rpc = 
default('/configurations/hdfs-site/dfs.namenode.rpc-address', None)
++  if namenode_rpc is None:
++namenode_rpc = default('/configurations/core-site/fs.defaultFS', None)
  
  if namenode_rpc:
   port_str = namenode_rpc.split(':')[-1].strip()

[16/17] ambari git commit: AMBARI-21714. Intermittent unit test failure in ExecutionCommandWrapperTest

[jonathanhurley]

AMBARI-21714. Intermittent unit test failure in ExecutionCommandWrapperTest


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 2d52cfb37cb59fdbeafc97bbcfa3417d9e658c2f
Parents: d9d58fd
Author: Attila Doroszlai 
Authored: Mon Aug 14 13:04:10 2017 +0200
Committer: Attila Doroszlai 
Committed: Mon Aug 14 19:31:24 2017 +0200

--
 .../actionmanager/ExecutionCommandWrapperTest.java  | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2d52cfb3/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
index f68f639..94ad0d5 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
@@ -114,6 +114,10 @@ public class ExecutionCommandWrapperTest {
 
 Cluster cluster1 = clusters.getCluster(CLUSTER1);
 
+OrmTestHelper helper = injector.getInstance(OrmTestHelper.class);
+RepositoryVersionEntity repositoryVersion = 
helper.getOrCreateRepositoryVersion(cluster1);
+cluster1.addService("HDFS", repositoryVersion);
+
 SERVICE_SITE_CLUSTER = new HashMap<>();
 SERVICE_SITE_CLUSTER.put(SERVICE_SITE_NAME1, SERVICE_SITE_VAL1);
 SERVICE_SITE_CLUSTER.put(SERVICE_SITE_NAME2, SERVICE_SITE_VAL2);
@@ -172,14 +176,6 @@ public class ExecutionCommandWrapperTest {
 
   @Test
   public void testGetExecutionCommand() throws JSONException, AmbariException {
-
-Cluster cluster = clusters.getCluster(CLUSTER1);
-
-OrmTestHelper helper = injector.getInstance(OrmTestHelper.class);
-RepositoryVersionEntity repositoryVersion = 
helper.getOrCreateRepositoryVersion(cluster);
-
-cluster.addService("HDFS", repositoryVersion);
-
 Map> confs = new HashMap<>();
 Map configurationsGlobal = new HashMap<>();
 configurationsGlobal.put(GLOBAL_NAME1, GLOBAL_VAL1);

[10/17] ambari git commit: AMBARI-21418. Ambari rebuilds custom auth_to_local rules changing its case sensitiveness option (/L) depending on the case_insensitive_username_rules. (amagyar)

[jonathanhurley]

AMBARI-21418. Ambari rebuilds custom auth_to_local rules changing its case 
sensitiveness option (/L) depending on the case_insensitive_username_rules. 
(amagyar)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: cfa299883cdf3f5ada93dfd72138b3b407f9bec5
Parents: 78684fb
Author: Attila Magyar 
Authored: Fri Aug 11 17:54:19 2017 +0200
Committer: Attila Magyar 
Committed: Fri Aug 11 17:54:19 2017 +0200

--
 .../server/controller/AuthToLocalBuilder.java   | 338 +++
 .../controller/AuthToLocalBuilderTest.java  |  45 +++
 2 files changed, 246 insertions(+), 137 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cfa29988/ambari-server/src/main/java/org/apache/ambari/server/controller/AuthToLocalBuilder.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AuthToLocalBuilder.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AuthToLocalBuilder.java
index 7e706ff..e6a4f62 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AuthToLocalBuilder.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AuthToLocalBuilder.java
@@ -18,8 +18,6 @@
 
 package org.apache.ambari.server.controller;
 
-import org.apache.commons.lang.StringUtils;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -30,6 +28,12 @@ import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
 /**
  * AuthToLocalBuilder helps to create auth_to_local rules for use in 
configuration files like
  * core-site.xml.  No duplicate rules will be generated.
@@ -60,7 +64,7 @@ public class AuthToLocalBuilder implements Cloneable {
   /**
* Ordered set of rules which have been added to the builder.
*/
-  private Set setRules = new TreeSet();
+  private Set setRules = new TreeSet<>();
 
   /**
* The default realm.
@@ -105,7 +109,7 @@ public class AuthToLocalBuilder implements Cloneable {
 
 this.additionalRealms = (additionalRealms == null)
 ? Collections.emptySet()
-: Collections.unmodifiableSet(new HashSet(additionalRealms));
+: Collections.unmodifiableSet(new HashSet<>(additionalRealms));
 
 this.caseInsensitiveUser = caseInsensitiveUserSupport;
   }
@@ -115,7 +119,7 @@ public class AuthToLocalBuilder implements Cloneable {
 AuthToLocalBuilder copy = (AuthToLocalBuilder) super.clone();
 
 /*  Copy mutable members  */
-copy.setRules = new TreeSet(setRules);
+copy.setRules = new TreeSet<>(setRules);
 
 return copy;
   }
@@ -126,20 +130,22 @@ public class AuthToLocalBuilder implements Cloneable {
*
* @param authToLocalRules config property value containing the existing 
rules
*/
-  public void addRules(String authToLocalRules) {
+  public AuthToLocalBuilder addRules(String authToLocalRules) {
 if (!StringUtils.isEmpty(authToLocalRules)) {
   String[] rules = authToLocalRules.split("RULE:|DEFAULT");
   for (String r : rules) {
 r = r.trim();
 if (!r.isEmpty()) {
   Rule rule = createRule(r);
-  setRules.add(rule);
+  if (!setRules.contains(rule.caseSensitivityInverted())) {
+setRules.add(rule);
+  }
 }
   }
 }
+return this;
   }
 
-
   /**
* Adds a rule for the given principal and local user.
* The principal must contain a realm component.
@@ -157,7 +163,7 @@ public class AuthToLocalBuilder implements Cloneable {
* @param localUsername a string declaring that local username to map the 
principal to
* @throws IllegalArgumentException if the provided principal doesn't 
contain a realm element
*/
-  public void addRule(String principal, String localUsername) {
+  public AuthToLocalBuilder addRule(String principal, String localUsername) {
 if (!StringUtils.isEmpty(principal) && 
!StringUtils.isEmpty(localUsername)) {
   Principal p = new Principal(principal);
   if (p.getRealm() == null) {
@@ -168,6 +174,7 @@ public class AuthToLocalBuilder implements Cloneable {
   Rule rule = createHostAgnosticRule(p, localUsername);
   setRules.add(rule);
 }
+return this;
   }
 
   /**
@@ -264,10 +271,10 @@ public class AuthToLocalBuilder 

[08/17] ambari git commit: AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari manages include/exclude files (dsen)

[jonathanhurley]

AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari 
manages include/exclude files (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 9e8a039bc2bf559ab54a987315b2c6c749c2512b
Parents: dba278b
Author: Dmytro Sen 
Authored: Fri Aug 11 13:38:46 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Aug 11 13:39:28 2017 +0300

--
 .../2.1.0.2.0/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 15 ---
 .../services/HDFS/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 16 +---
 .../before-START/scripts/shared_initialization.py   | 14 --
 5 files changed, 13 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9e8a039b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
index 500ed15..ef6a2e2 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
@@ -37,6 +37,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 import params
 service(

http://git-wip-us.apache.org/repos/asf/ambari/blob/9e8a039b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
index 265502f..cba724a 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
@@ -137,21 +137,6 @@ def setup_configs():
 group=params.user_group
   )
 
-  generate_include_file()
-
-
-def generate_include_file():
-  import params
-
-  if params.has_namenode and params.dfs_hosts and params.has_slaves:
-include_hosts_list = params.slave_hosts
-File(params.dfs_hosts,
- content=Template("include_hosts_list.j2"),
- owner=params.hdfs_user,
- group=params.user_group
-)
-
-
 def install_snappy():
   import params
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9e8a039b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
index e734973..b7e4044 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
@@ -35,6 +35,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 service(
   action=action,

http://git-wip-us.apache.org/repos/asf/ambari/blob/9e8a039b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
--
diff --git 

[17/17] ambari git commit: Merge branch 'branch-2.6' into branch-feature-AMBARI-21450

[jonathanhurley]

Merge branch 'branch-2.6' into branch-feature-AMBARI-21450


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: bbd751130f6e3d71018aa29379f6630b63db7f89
Parents: c35a834 2d52cfb
Author: Jonathan Hurley 
Authored: Mon Aug 14 16:17:39 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Aug 14 16:17:39 2017 -0400

--
 .../libraries/functions/check_process_status.py |  20 ++
 .../libraries/functions/get_stack_version.py|   2 +-
 .../libraries/script/script.py  |   4 +-
 .../MetricCollectorHAController.java|   2 +-
 .../server/api/predicate/QueryParser.java   |   4 +-
 .../api/predicate/operators/InOperator.java |   2 +-
 .../server/controller/AuthToLocalBuilder.java   | 338 +++
 .../BlueprintConfigurationProcessor.java|  18 +-
 .../internal/StackAdvisorResourceProvider.java  |  20 +-
 .../apache/ambari/server/orm/DBAccessor.java|  10 +
 .../ambari/server/orm/DBAccessorImpl.java   |   7 +
 .../server/upgrade/UpgradeCatalog252.java   |   1 +
 .../src/main/python/azuredb_create_generator.py |   2 +-
 .../DRUID/0.9.2/package/scripts/druid.py|   6 -
 .../DRUID/0.9.2/package/scripts/params.py   |  13 -
 .../2.1.0.2.0/package/scripts/hdfs_snamenode.py |   6 +
 .../HDFS/2.1.0.2.0/package/scripts/utils.py |   1 +
 .../scripts/alerts/alert_spark_thrift_port.py   |   2 +-
 .../scripts/alerts/alert_spark2_thrift_port.py  |   2 +-
 .../resources/host_scripts/alert_disk_space.py  |   2 +-
 .../scripts/shared_initialization.py|  15 -
 .../HDFS/package/scripts/hdfs_snamenode.py  |   6 +
 .../0.8/services/HDFS/package/scripts/utils.py  |   3 +
 .../4.0/services/HDFS/package/scripts/utils.py  |   2 +
 .../4.2/services/HDFS/package/scripts/utils.py  |   2 +
 .../scripts/shared_initialization.py|  16 +-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  10 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   4 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |   1 +
 .../ATLAS/configuration/atlas-log4j.xml |   4 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |   5 +
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |   4 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml |   1 +
 .../ExecutionCommandWrapperTest.java|  12 +-
 .../server/api/predicate/QueryParserTest.java   |  18 +
 .../controller/AuthToLocalBuilderTest.java  |  45 +++
 .../BlueprintConfigurationProcessorTest.java|  34 +-
 .../StackAdvisorResourceProviderTest.java   |  26 ++
 .../scripts/shared_initialization.py|  14 -
 39 files changed, 438 insertions(+), 246 deletions(-)
--

[09/17] ambari git commit: AMBARI-21619. More ResourceManager HA host group placeholders in blueprints

[jonathanhurley]

AMBARI-21619. More ResourceManager HA host group placeholders in blueprints


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 78684fb7cb5058eb5ada6ab8fc8bcf664c24df9e
Parents: 9e8a039
Author: Attila Doroszlai 
Authored: Tue Aug 1 14:22:37 2017 +0200
Committer: Attila Doroszlai 
Committed: Fri Aug 11 13:50:47 2017 +0200

--
 .../BlueprintConfigurationProcessor.java| 18 +--
 .../BlueprintConfigurationProcessorTest.java| 34 +---
 2 files changed, 31 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/78684fb7/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 5fd2b5b..ab6a586 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -899,14 +899,14 @@ public class BlueprintConfigurationProcessor {
 Map yarnSiteConfig = 
clusterTopology.getConfiguration().getFullProperties().get("yarn-site");
 // generate the property names based on the current HA config for the 
ResourceManager deployments
 for (String resourceManager : parseResourceManagers(yarnSiteConfig)) {
-  final String rmHostPropertyName = "yarn.resourcemanager.hostname." + 
resourceManager;
-  yarnSiteUpdatersForAvailability.put(rmHostPropertyName, new 
SingleHostTopologyUpdater("RESOURCEMANAGER"));
-
-  final String rmHTTPAddress = "yarn.resourcemanager.webapp.address." + 
resourceManager;
-  yarnSiteUpdatersForAvailability.put(rmHTTPAddress, new 
SingleHostTopologyUpdater("RESOURCEMANAGER"));
-
-  final String rmHTTPSAddress = 
"yarn.resourcemanager.webapp.https.address." + resourceManager;
-  yarnSiteUpdatersForAvailability.put(rmHTTPSAddress, new 
SingleHostTopologyUpdater("RESOURCEMANAGER"));
+  SingleHostTopologyUpdater updater = new 
SingleHostTopologyUpdater("RESOURCEMANAGER");
+  yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.hostname." + 
resourceManager, updater);
+  yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.admin.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.resource-tracker.address."
 + resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.scheduler.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.webapp.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.webapp.https.address."
 + resourceManager, updater);
 }
 
 return highAvailabilityUpdaters;
@@ -1341,7 +1341,7 @@ public class BlueprintConfigurationProcessor {
 /**
  * Component name
  */
-private String component;
+private final String component;
 
 /**
  * Constructor.

http://git-wip-us.apache.org/repos/asf/ambari/blob/78684fb7/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index c5af0d9..1959610 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -3359,6 +3359,14 @@ public class BlueprintConfigurationProcessorTest extends 
EasyMockSupport {
 yarnSiteProperties.put("yarn.resourcemanager.ha.rm-ids", "rm1, rm2");
 yarnSiteProperties.put("yarn.resourcemanager.hostname.rm1", 
expectedHostName);
 yarnSiteProperties.put("yarn.resourcemanager.hostname.rm2", 
expectedHostNameTwo);
+

[14/17] ambari git commit: AMBARI-21498. DB consistency checker throws errors for missing 'product-info' configs after Ambari upgrade (dlysnichenko)

[jonathanhurley]

AMBARI-21498. DB consistency checker throws errors for missing 'product-info' 
configs after Ambari upgrade (dlysnichenko)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 5e498c665c6d416ef5c71d732295b736ccd8ad0b
Parents: 9fe2b67
Author: Lisnichenko Dmitro 
Authored: Mon Aug 14 15:57:23 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Mon Aug 14 15:57:23 2017 +0300

--
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5e498c66/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
index 086d335..2a37f0a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
@@ -122,6 +122,7 @@ public class UpgradeCatalog252 extends 
AbstractUpgradeCatalog {
*/
   @Override
   protected void executeDMLUpdates() throws AmbariException, SQLException {
+addNewConfigurationsFromXml();
 resetStackToolsAndFeatures();
 ensureConfigTypesHaveAtLeastOneVersionSelected();
 updateMariaDBRedHatSupportHive();

[15/17] ambari git commit: AMBARI-21532. Namenode restart - PID file delete happens before the call to check status (dlysnichenko)

[jonathanhurley]

AMBARI-21532. Namenode restart - PID file delete happens before the call to 
check status (dlysnichenko)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: d9d58fda7b9942b89dc611486595509ad8df664d
Parents: 5e498c6
Author: Lisnichenko Dmitro 
Authored: Mon Aug 14 16:28:12 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Mon Aug 14 16:28:12 2017 +0300

--
 .../libraries/functions/check_process_status.py | 20 
 .../libraries/script/script.py  |  4 ++--
 .../HDFS/2.1.0.2.0/package/scripts/utils.py |  1 +
 .../0.8/services/HDFS/package/scripts/utils.py  |  3 +++
 .../4.0/services/HDFS/package/scripts/utils.py  |  2 ++
 .../4.2/services/HDFS/package/scripts/utils.py  |  2 ++
 6 files changed, 30 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9d58fda/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
index 7961f00..ac54bc9 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
@@ -59,3 +59,23 @@ def check_process_status(pid_file):
 Logger.info("Process with pid {0} is not running. Stale pid file"
   " at {1}".format(pid, pid_file))
 raise ComponentIsNotRunning()
+
+
+def wait_process_stopped(pid_file):
+  """
+Waits until component is actually stopped (check is performed using
+check_process_status() method.
+"""
+  import time
+  component_is_stopped = False
+  counter = 0
+  while not component_is_stopped:
+try:
+  if counter % 10 == 0:
+Logger.logger.info("Waiting for actual component stop")
+  check_process_status(pid_file)
+  time.sleep(1)
+  counter += 1
+except ComponentIsNotRunning, e:
+  Logger.logger.debug(" reports ComponentIsNotRunning")
+  component_is_stopped = True

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9d58fda/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 abbada4..54a7e6d 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
@@ -387,7 +387,7 @@ class Script(object):
 status_method = getattr(self, 'status')
 component_is_stopped = False
 counter = 0
-while not component_is_stopped :
+while not component_is_stopped:
   try:
 if counter % 100 == 0:
   Logger.logger.info("Waiting for actual component stop")
@@ -1019,4 +1019,4 @@ class Script(object):
 
   def __init__(self):
 if Script.instance is not None:
-  raise Fail("An instantiation already exists! Use, get_instance() 
method.")
\ No newline at end of file
+  raise Fail("An instantiation already exists! Use, get_instance() 
method.")

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9d58fda/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
index e2d60a0..f178d23 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
@@ -25,6 +25,7 @@ import ambari_simplejson as json # simplejson is much faster 
comparing to Python
 from resource_management.core.resources.system import Directory, File, Execute
 from resource_management.libraries.functions.format import format
 from resource_management.libraries.functions import check_process_status
+from resource_management.libraries.functions.check_process_status import 
wait_process_stopped
 from resource_management.libraries.functions 

[12/17] ambari git commit: AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 (smohanty)

[jonathanhurley]

AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 
(smohanty)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 7ab5876124db25cc111d80d82afb94b29e607485
Parents: 0630899
Author: Sumit Mohanty 
Authored: Fri Aug 11 16:35:00 2017 -0700
Committer: Sumit Mohanty 
Committed: Fri Aug 11 16:36:12 2017 -0700

--
 ambari-server/src/main/resources/host_scripts/alert_disk_space.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ab58761/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
--
diff --git a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py 
b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
index f3c6406..eb92781 100644
--- a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
+++ b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
@@ -67,7 +67,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 return (('UNKNOWN', ['There were no configurations supplied to the 
script.']))
 
   if not STACK_NAME in configurations or not STACK_ROOT in configurations:
-return (('STACK_ROOT', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
+return (('UNKNOWN', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
 
   path = stack_tools.get_stack_root(configurations[STACK_NAME], 
configurations[STACK_ROOT])
 

[05/17] ambari git commit: AMBARI-21690 Updating get_stack_version pattern match (mugdha)

[jonathanhurley]

AMBARI-21690 Updating get_stack_version pattern match (mugdha)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: abcf1ce8619bb0459c633f63fc2e2edaa7f04f64
Parents: 601cd7d
Author: Mugdha Varadkar 
Authored: Thu Aug 10 11:57:28 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Aug 11 09:59:07 2017 +0530

--
 .../resource_management/libraries/functions/get_stack_version.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/abcf1ce8/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
index 7274a59..463d61f 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
@@ -85,7 +85,7 @@ def get_stack_version(package_name):
 
   stack_version = re.sub(package_name + ' - ', '', stack_output)
   stack_version = stack_version.rstrip()
-  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', stack_version)
+  match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+(-[0-9]+)?', stack_version)
 
   if match is None:
 Logger.info('Failed to get extracted version with ' + stack_selector_path)

ambari git commit: AMBARI-21719. Result of install_packages uses version string instead of repo_version_id (ncole)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/trunk f134cee07 -> f206e9571


AMBARI-21719. Result of install_packages uses version string instead of 
repo_version_id (ncole)


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

Branch: refs/heads/trunk
Commit: f206e95711ab3d117cfc26587c9d09c52c86c16f
Parents: f134cee
Author: Nate Cole 
Authored: Mon Aug 14 15:25:11 2017 -0400
Committer: Nate Cole 
Committed: Mon Aug 14 15:25:11 2017 -0400

--
 .../libraries/functions/repository_util.py  |   1 +
 .../DistributeRepositoriesStructuredOutput.java |  70 -
 .../DistributeRepositoriesActionListener.java   | 104 +--
 .../stack/upgrade/RepositoryVersionHelper.java  |  15 ---
 .../custom_actions/scripts/install_packages.py  |  66 +++-
 .../server/agent/HeartbeatProcessorTest.java|  65 +++-
 ...ClusterStackVersionResourceProviderTest.java |   4 +-
 .../custom_actions/TestInstallPackages.py   |  86 ++-
 .../configs/install_packages_config.json|   2 +-
 9 files changed, 163 insertions(+), 250 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f206e957/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
index c9920e2..6ad1aee 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
@@ -94,6 +94,7 @@ class CommandRepository(object):
 # version_id is the primary id of the repo_version table in the database
 self.version_id = _find_value(json_dict, 'repoVersionId')
 self.stack_name = _find_value(json_dict, 'stackName')
+self.version_string = _find_value(json_dict, 'repoVersion')
 self.repositories = []
 
 repos_def = _find_value(json_dict, 'repositories')

http://git-wip-us.apache.org/repos/asf/ambari/blob/f206e957/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/DistributeRepositoriesStructuredOutput.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/DistributeRepositoriesStructuredOutput.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/DistributeRepositoriesStructuredOutput.java
deleted file mode 100644
index d8ae32f..000
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/DistributeRepositoriesStructuredOutput.java
+++ /dev/null
@@ -1,70 +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.
- *
- * */
-
-package org.apache.ambari.server.bootstrap;
-
-import com.google.gson.annotations.SerializedName;
-
-/**
- * This class is used for mapping json of structured output for
- * "Distribute repositories/install packages" action.
- */
-public class DistributeRepositoriesStructuredOutput {
-
-  /**
-   * Repository version that has been (re)installed as a result of current 
custom action
-   */
-  @SerializedName("installed_repository_version")
-  private String installedRepositoryVersion;
-
-  /**
-   * Either SUCCESS or FAIL
-   */
-  @SerializedName("package_installation_result")
-  private String packageInstallationResult;
-
-  /**
-   * The actual version returned, even when a failure during install occurs.
-   */
-  @SerializedName("actual_version")
-  private String actualVersion;
-
-  /**
-   * The stack id used to look up version
-   */
-  @SerializedName("stack_id")
-  private String stackId;
-
-  public String getInstalledRepositoryVersion() {
-
-return 

ambari git commit: AMBARI-21719. Result of install_packages uses version string instead of repo_version_id (ncole)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 272e1ce18 -> c35a834d7


AMBARI-21719. Result of install_packages uses version string instead of 
repo_version_id (ncole)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: c35a834d7bf42ddc0b52f54635ff641f4806136a
Parents: 272e1ce
Author: Nate Cole 
Authored: Mon Aug 14 11:35:00 2017 -0400
Committer: Nate Cole 
Committed: Mon Aug 14 13:28:29 2017 -0400

--
 .../libraries/functions/repository_util.py  |   1 +
 .../DistributeRepositoriesStructuredOutput.java |  70 -
 .../DistributeRepositoriesActionListener.java   | 104 +--
 .../stack/upgrade/RepositoryVersionHelper.java  |  15 ---
 .../custom_actions/scripts/install_packages.py  |  65 +++-
 .../2.0.6/hooks/before-START/scripts/params.py  |   7 +-
 .../server/agent/HeartbeatProcessorTest.java|  65 +++-
 ...ClusterStackVersionResourceProviderTest.java |   4 +-
 .../custom_actions/TestInstallPackages.py   |  88 ++--
 .../configs/install_packages_config.json|   2 +-
 10 files changed, 168 insertions(+), 253 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c35a834d/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
index f1edbec..91009b0 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
@@ -94,6 +94,7 @@ class CommandRepository(object):
 # version_id is the primary id of the repo_version table in the database
 self.version_id = _find_value(json_dict, 'repoVersionId')
 self.stack_name = _find_value(json_dict, 'stackName')
+self.version_string = _find_value(json_dict, 'repoVersion')
 self.repositories = []
 
 repos_def = _find_value(json_dict, 'repositories')

http://git-wip-us.apache.org/repos/asf/ambari/blob/c35a834d/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/DistributeRepositoriesStructuredOutput.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/DistributeRepositoriesStructuredOutput.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/DistributeRepositoriesStructuredOutput.java
deleted file mode 100644
index 0cf2d78..000
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/bootstrap/DistributeRepositoriesStructuredOutput.java
+++ /dev/null
@@ -1,70 +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.
- *
- * */
-
-package org.apache.ambari.server.bootstrap;
-
-import com.google.gson.annotations.SerializedName;
-
-/**
- * This class is used for mapping json of structured output for
- * "Distribute repositories/install packages" action.
- */
-public class DistributeRepositoriesStructuredOutput {
-
-  /**
-   * Repository version that has been (re)installed as a result of current 
custom action
-   */
-  @SerializedName("installed_repository_version")
-  private String installedRepositoryVersion;
-
-  /**
-   * Either SUCCESS or FAIL
-   */
-  @SerializedName("package_installation_result")
-  private String packageInstallationResult;
-
-  /**
-   * The actual version returned, even when a failure during install occurs.
-   */
-  @SerializedName("actual_version")
-  private String actualVersion;
-
-  /**
-   * The stack id used to look up version
-   */
-  

[1/2] ambari git commit: AMBARI-21714. Intermittent unit test failure in ExecutionCommandWrapperTest

[adoroszlai]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 d9d58fda7 -> 2d52cfb37
  refs/heads/trunk 4e3f7ebe0 -> f134cee07


AMBARI-21714. Intermittent unit test failure in ExecutionCommandWrapperTest


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

Branch: refs/heads/trunk
Commit: f134cee07e9685a5a86fe73162b9a00bf60a9fef
Parents: 4e3f7eb
Author: Attila Doroszlai 
Authored: Mon Aug 14 13:04:10 2017 +0200
Committer: Attila Doroszlai 
Committed: Mon Aug 14 13:04:10 2017 +0200

--
 .../actionmanager/ExecutionCommandWrapperTest.java  | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f134cee0/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
index 52d54aa..7d97ee1 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
@@ -113,6 +113,10 @@ public class ExecutionCommandWrapperTest {
 
 Cluster cluster1 = clusters.getCluster(CLUSTER1);
 
+OrmTestHelper helper = injector.getInstance(OrmTestHelper.class);
+RepositoryVersionEntity repositoryVersion = 
helper.getOrCreateRepositoryVersion(cluster1);
+cluster1.addService("HDFS", repositoryVersion);
+
 SERVICE_SITE_CLUSTER = new HashMap<>();
 SERVICE_SITE_CLUSTER.put(SERVICE_SITE_NAME1, SERVICE_SITE_VAL1);
 SERVICE_SITE_CLUSTER.put(SERVICE_SITE_NAME2, SERVICE_SITE_VAL2);
@@ -167,14 +171,6 @@ public class ExecutionCommandWrapperTest {
 
   @Test
   public void testGetExecutionCommand() throws JSONException, AmbariException {
-
-Cluster cluster = clusters.getCluster(CLUSTER1);
-
-OrmTestHelper helper = injector.getInstance(OrmTestHelper.class);
-RepositoryVersionEntity repositoryVersion = 
helper.getOrCreateRepositoryVersion(cluster);
-
-cluster.addService("HDFS", repositoryVersion);
-
 Map> confs = new HashMap<>();
 Map configurationsGlobal = new HashMap<>();
 configurationsGlobal.put(GLOBAL_NAME1, GLOBAL_VAL1);

[2/2] ambari git commit: AMBARI-21714. Intermittent unit test failure in ExecutionCommandWrapperTest

[adoroszlai]

AMBARI-21714. Intermittent unit test failure in ExecutionCommandWrapperTest


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

Branch: refs/heads/branch-2.6
Commit: 2d52cfb37cb59fdbeafc97bbcfa3417d9e658c2f
Parents: d9d58fd
Author: Attila Doroszlai 
Authored: Mon Aug 14 13:04:10 2017 +0200
Committer: Attila Doroszlai 
Committed: Mon Aug 14 19:31:24 2017 +0200

--
 .../actionmanager/ExecutionCommandWrapperTest.java  | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2d52cfb3/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
index f68f639..94ad0d5 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
@@ -114,6 +114,10 @@ public class ExecutionCommandWrapperTest {
 
 Cluster cluster1 = clusters.getCluster(CLUSTER1);
 
+OrmTestHelper helper = injector.getInstance(OrmTestHelper.class);
+RepositoryVersionEntity repositoryVersion = 
helper.getOrCreateRepositoryVersion(cluster1);
+cluster1.addService("HDFS", repositoryVersion);
+
 SERVICE_SITE_CLUSTER = new HashMap<>();
 SERVICE_SITE_CLUSTER.put(SERVICE_SITE_NAME1, SERVICE_SITE_VAL1);
 SERVICE_SITE_CLUSTER.put(SERVICE_SITE_NAME2, SERVICE_SITE_VAL2);
@@ -172,14 +176,6 @@ public class ExecutionCommandWrapperTest {
 
   @Test
   public void testGetExecutionCommand() throws JSONException, AmbariException {
-
-Cluster cluster = clusters.getCluster(CLUSTER1);
-
-OrmTestHelper helper = injector.getInstance(OrmTestHelper.class);
-RepositoryVersionEntity repositoryVersion = 
helper.getOrCreateRepositoryVersion(cluster);
-
-cluster.addService("HDFS", repositoryVersion);
-
 Map> confs = new HashMap<>();
 Map configurationsGlobal = new HashMap<>();
 configurationsGlobal.put(GLOBAL_NAME1, GLOBAL_VAL1);

ambari git commit: AMBARI-21498. DB consistency checker throws errors for missing 'product-info' configs after Ambari upgrade (dlysnichenko)

[dmitriusan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 5f750176f -> fb5567608


AMBARI-21498. DB consistency checker throws errors for missing 'product-info' 
configs after Ambari upgrade (dlysnichenko)


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

Branch: refs/heads/branch-2.5
Commit: fb5567608f173fa4cbc4f1beed6fcf9163c418ed
Parents: 5f75017
Author: Lisnichenko Dmitro 
Authored: Mon Aug 14 20:12:31 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Mon Aug 14 20:12:31 2017 +0300

--
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fb556760/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
index ca7ab3f..ce1c8f1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
@@ -122,6 +122,7 @@ public class UpgradeCatalog252 extends 
AbstractUpgradeCatalog {
*/
   @Override
   protected void executeDMLUpdates() throws AmbariException, SQLException {
+addNewConfigurationsFromXml();
 resetStackToolsAndFeatures();
 ensureConfigTypesHaveAtLeastOneVersionSelected();
 updateMariaDBRedHatSupportHive();

ambari git commit: AMBARI-21532. Namenode restart - PID file delete happens before the call to check status (dlysnichenko)

[dmitriusan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 5e498c665 -> d9d58fda7


AMBARI-21532. Namenode restart - PID file delete happens before the call to 
check status (dlysnichenko)


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

Branch: refs/heads/branch-2.6
Commit: d9d58fda7b9942b89dc611486595509ad8df664d
Parents: 5e498c6
Author: Lisnichenko Dmitro 
Authored: Mon Aug 14 16:28:12 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Mon Aug 14 16:28:12 2017 +0300

--
 .../libraries/functions/check_process_status.py | 20 
 .../libraries/script/script.py  |  4 ++--
 .../HDFS/2.1.0.2.0/package/scripts/utils.py |  1 +
 .../0.8/services/HDFS/package/scripts/utils.py  |  3 +++
 .../4.0/services/HDFS/package/scripts/utils.py  |  2 ++
 .../4.2/services/HDFS/package/scripts/utils.py  |  2 ++
 6 files changed, 30 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9d58fda/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
index 7961f00..ac54bc9 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
@@ -59,3 +59,23 @@ def check_process_status(pid_file):
 Logger.info("Process with pid {0} is not running. Stale pid file"
   " at {1}".format(pid, pid_file))
 raise ComponentIsNotRunning()
+
+
+def wait_process_stopped(pid_file):
+  """
+Waits until component is actually stopped (check is performed using
+check_process_status() method.
+"""
+  import time
+  component_is_stopped = False
+  counter = 0
+  while not component_is_stopped:
+try:
+  if counter % 10 == 0:
+Logger.logger.info("Waiting for actual component stop")
+  check_process_status(pid_file)
+  time.sleep(1)
+  counter += 1
+except ComponentIsNotRunning, e:
+  Logger.logger.debug(" reports ComponentIsNotRunning")
+  component_is_stopped = True

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9d58fda/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 abbada4..54a7e6d 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
@@ -387,7 +387,7 @@ class Script(object):
 status_method = getattr(self, 'status')
 component_is_stopped = False
 counter = 0
-while not component_is_stopped :
+while not component_is_stopped:
   try:
 if counter % 100 == 0:
   Logger.logger.info("Waiting for actual component stop")
@@ -1019,4 +1019,4 @@ class Script(object):
 
   def __init__(self):
 if Script.instance is not None:
-  raise Fail("An instantiation already exists! Use, get_instance() 
method.")
\ No newline at end of file
+  raise Fail("An instantiation already exists! Use, get_instance() 
method.")

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9d58fda/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
index e2d60a0..f178d23 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
@@ -25,6 +25,7 @@ import ambari_simplejson as json # simplejson is much faster 
comparing to Python
 from resource_management.core.resources.system import Directory, File, Execute
 from resource_management.libraries.functions.format import format
 from resource_management.libraries.functions import check_process_status
+from resource_management.libraries.functions.check_process_status 

ambari git commit: AMBARI-21498. DB consistency checker throws errors for missing 'product-info' configs after Ambari upgrade (dlysnichenko)

[dmitriusan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 9fe2b6788 -> 5e498c665


AMBARI-21498. DB consistency checker throws errors for missing 'product-info' 
configs after Ambari upgrade (dlysnichenko)


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

Branch: refs/heads/branch-2.6
Commit: 5e498c665c6d416ef5c71d732295b736ccd8ad0b
Parents: 9fe2b67
Author: Lisnichenko Dmitro 
Authored: Mon Aug 14 15:57:23 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Mon Aug 14 15:57:23 2017 +0300

--
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5e498c66/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
index 086d335..2a37f0a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
@@ -122,6 +122,7 @@ public class UpgradeCatalog252 extends 
AbstractUpgradeCatalog {
*/
   @Override
   protected void executeDMLUpdates() throws AmbariException, SQLException {
+addNewConfigurationsFromXml();
 resetStackToolsAndFeatures();
 ensureConfigTypesHaveAtLeastOneVersionSelected();
 updateMariaDBRedHatSupportHive();

ambari git commit: AMBARI-21715. Upgrade History Is too Verbose (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 0aba12139 -> 272e1ce18


AMBARI-21715. Upgrade History Is too Verbose (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 272e1ce18f66e4ed9b2546b77ad5c50a2bf8d743
Parents: 0aba121
Author: Alex Antonenko 
Authored: Mon Aug 14 14:22:07 2017 +0300
Committer: Alex Antonenko 
Committed: Mon Aug 14 14:22:07 2017 +0300

--
 ambari-web/app/messages.js  |   2 +
 ambari-web/app/styles/stack_versions.less   |  31 +
 .../admin/stack_upgrade/upgrade_history.hbs |  49 +--
 .../admin/stack_upgrade/upgrade_history_view.js |  57 +---
 .../stack_upgrade/upgrade_history_view_test.js  | 129 ++-
 5 files changed, 177 insertions(+), 91 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/272e1ce1/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index a0dcf8c..64b5ae4 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -346,6 +346,8 @@ Em.I18n.translations = {
   'common.rolling': 'Rolling',
   'common.express': 'Express',
   'common.hostOrdered': 'Host Ordered',
+  'common.repository': 'Repository',
+  'common.repositoryType': 'Repository Type',
   'common.rolling.downgrade': 'Rolling Downgrade',
   'common.express.downgrade': 'Express Downgrade',
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/272e1ce1/ambari-web/app/styles/stack_versions.less
--
diff --git a/ambari-web/app/styles/stack_versions.less 
b/ambari-web/app/styles/stack_versions.less
index 06ad16c..07d6f83 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -807,3 +807,34 @@
 border-bottom: 1px solid #eee;
   }
 }
+
+#upgrade-summary-table {
+  .wide-column {
+width: 14%;
+  }
+  .accordion-group {
+border-right: none;
+  }
+  .accordion-inner {
+border-top: none;
+padding-left: 0;
+padding-top: 20px;
+  }
+  .accordion-heading {
+background-color: transparent;
+  }
+  .accordion-toggle {
+padding: 5px;
+display: inline-block;
+float: left;
+line-height: 10px;
+margin-left: -20px;
+  }
+  .accordion-body {
+min-width: 350px;
+.service-name {
+  text-align: left;
+  min-width: 70px;
+}
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/272e1ce1/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
index d70a991..6b226cc 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
@@ -46,33 +46,62 @@
   
 {{t common.direction}}
 {{t common.type}}
-{{t common.service}}
-{{t common.version}}
+{{t common.repository}}
+{{t common.repositoryType}}
 {{t common.start.time}}
 {{t common.duration}}
 {{t common.end.time}}
 {{t common.status}}
   
   
-  
+  
 {{#if view.pageContent}}
   {{#each item in view.pageContent}}
 
-  
-
-  
+  
+
+  
+  
 {{unbound item.directionLabel}}
   
 
+
+  
+  {{#each service in item.services}}
+
+  
+{{service.displayName}}
+  
+  
+
+  {{service.fromVersion}}
+
+  
+  
+
+  
+  
+
+  {{service.toVersion}}
+
+  
+
+  {{/each}}
+  
+
   
   
 {{item.upgradeTypeLabel}}
   
-  

[04/32] ambari git commit: AMBARI-21679. Service Checks Will Run Multiple Times In Patch/Service Upgrades (ncole)

[lpuskas]

AMBARI-21679. Service Checks Will Run Multiple Times In Patch/Service Upgrades 
(ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: b23464936abad71f07e632ab6b0472b60a9ab0e3
Parents: c9ced87
Author: Nate Cole 
Authored: Tue Aug 8 12:26:35 2017 -0400
Committer: Nate Cole 
Committed: Wed Aug 9 11:12:15 2017 -0400

--
 .../ambari/server/state/UpgradeHelper.java  | 68 +++-
 .../state/stack/upgrade/ClusterGrouping.java|  4 ++
 .../server/state/stack/upgrade/Grouping.java| 15 +
 .../stack/upgrade/ServiceCheckGrouping.java | 60 ++---
 .../ambari/server/state/UpgradeHelperTest.java  | 68 +++-
 .../HDP/2.1.1/upgrades/upgrade_test_checks.xml  | 15 +
 6 files changed, 217 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b2346493/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
index 7ed70de..464cb41 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
@@ -63,6 +63,8 @@ import org.apache.ambari.server.state.stack.upgrade.Direction;
 import org.apache.ambari.server.state.stack.upgrade.Grouping;
 import org.apache.ambari.server.state.stack.upgrade.ManualTask;
 import org.apache.ambari.server.state.stack.upgrade.RestartTask;
+import org.apache.ambari.server.state.stack.upgrade.ServiceCheckGrouping;
+import 
org.apache.ambari.server.state.stack.upgrade.ServiceCheckGrouping.ServiceCheckStageWrapper;
 import org.apache.ambari.server.state.stack.upgrade.StageWrapper;
 import org.apache.ambari.server.state.stack.upgrade.StageWrapperBuilder;
 import org.apache.ambari.server.state.stack.upgrade.StartTask;
@@ -77,6 +79,7 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
@@ -299,6 +302,7 @@ public class UpgradeHelper {
 Map> allTasks = 
upgradePack.getTasks();
 List groups = new ArrayList<>();
 
+UpgradeGroupHolder previousGroupHolder = null;
 for (Grouping group : upgradePack.getGroups(context.getDirection())) {
 
   // !!! grouping is not scoped to context
@@ -320,6 +324,7 @@ public class UpgradeHelper {
   groupHolder.skippable = group.skippable;
   groupHolder.supportsAutoSkipOnFailure = group.supportsAutoSkipOnFailure;
   groupHolder.allowRetry = group.allowRetry;
+  groupHolder.processingGroup = group.isProcessingGroup();
 
   // !!! all downgrades are skippable
   if (context.getDirection().isDowngrade()) {
@@ -496,9 +501,22 @@ public class UpgradeHelper {
   List proxies = builder.build(context);
 
   if (CollectionUtils.isNotEmpty(proxies)) {
+
 groupHolder.items = proxies;
 postProcess(context, groupHolder);
-groups.add(groupHolder);
+
+// !!! prevent service checks from running twice.  merge the stage 
wrappers
+if (ServiceCheckGrouping.class.isInstance(group)) {
+  if (null != previousGroupHolder && 
ServiceCheckGrouping.class.equals(previousGroupHolder.groupClass)) {
+mergeServiceChecks(groupHolder, previousGroupHolder);
+  } else {
+groups.add(groupHolder);
+  }
+} else {
+  groups.add(groupHolder);
+}
+
+previousGroupHolder = groupHolder;
   }
 }
 
@@ -518,10 +536,53 @@ public class UpgradeHelper {
   }
 }
 
+// !!! strip off the first service check if nothing has been processed
+Iterator iterator = groups.iterator();
+boolean canServiceCheck = false;
+while (iterator.hasNext()) {
+  UpgradeGroupHolder holder = iterator.next();
+
+  if (ServiceCheckGrouping.class.equals(holder.groupClass) && 
!canServiceCheck) {
+iterator.remove();
+  }
+
+  canServiceCheck |= holder.processingGroup;
+}
+
 return groups;
   }
 
   /**
+   * Merges two service check groups when they have been orchestrated 
back-to-back.
+   * @param newHolder   the "new" group holder, which was orchestrated after 
the "old" one
+   * 

[23/32] ambari git commit: AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 (smohanty)

[lpuskas]

AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 
(smohanty)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d9c271ae61c285e3b4e066616f057d857797fec9
Parents: bc6cbf3
Author: Sumit Mohanty 
Authored: Fri Aug 11 16:35:00 2017 -0700
Committer: Sumit Mohanty 
Committed: Fri Aug 11 16:36:41 2017 -0700

--
 ambari-server/src/main/resources/host_scripts/alert_disk_space.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9c271ae/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
--
diff --git a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py 
b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
index f3c6406..eb92781 100644
--- a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
+++ b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
@@ -67,7 +67,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 return (('UNKNOWN', ['There were no configurations supplied to the 
script.']))
 
   if not STACK_NAME in configurations or not STACK_ROOT in configurations:
-return (('STACK_ROOT', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
+return (('UNKNOWN', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
 
   path = stack_tools.get_stack_root(configurations[STACK_NAME], 
configurations[STACK_ROOT])
 

[27/32] ambari git commit: AMBARI-21307 Implemented PUT operation, added unit tests

[lpuskas]

AMBARI-21307 Implemented PUT operation, added unit tests


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 4d89a000ed048a047c747fdf696691d3f8957bc1
Parents: 174ab7d
Author: lpuskas 
Authored: Thu Jul 13 16:20:58 2017 +0200
Committer: lpuskas 
Committed: Mon Aug 14 13:54:23 2017 +0200

--
 .../services/AmbariConfigurationService.java|  89 ---
 .../server/controller/ControllerModule.java |   2 +
 .../controller/ResourceProviderFactory.java |  23 +-
 .../AbstractControllerResourceProvider.java |   2 +
 .../AmbariConfigurationResourceProvider.java|  88 +--
 .../internal/DefaultProviderModule.java |   2 -
 .../server/orm/dao/AmbariConfigurationDAO.java  |   4 +
 ...AmbariConfigurationResourceProviderTest.java | 231 +++
 8 files changed, 363 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4d89a000/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
index 0c159b9..0632361 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -56,16 +56,10 @@ import io.swagger.annotations.ApiResponses;
  *"data": [
  *{
  * "authentication.ldap.primaryUrl": "localhost:33389"
- *},
- *{
- *"authentication.ldap.secondaryUrl": "localhost:333"
- * },
- * {
+   "authentication.ldap.secondaryUrl": "localhost:333"
  * "authentication.ldap.baseDn": "dc=ambari,dc=apache,dc=org"
- * }
- * // ..
- * ]
- * }
+  * // ..
+ * ]
  * }
  * 
  */
@@ -74,7 +68,7 @@ import io.swagger.annotations.ApiResponses;
 public class AmbariConfigurationService extends BaseService {
 
   private static final String AMBARI_CONFIGURATION_REQUEST_TYPE =
-  
"org.apache.ambari.server.api.services.AmbariConfigurationRequestSwagger";
+"org.apache.ambari.server.api.services.AmbariConfigurationRequestSwagger";
 
   /**
* Creates an ambari configuration resource.
@@ -87,9 +81,9 @@ public class AmbariConfigurationService extends BaseService {
   @POST
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Creates an ambari configuration resource",
-  nickname = "AmbariConfigurationService#createAmbariConfiguration")
+nickname = "AmbariConfigurationService#createAmbariConfiguration")
   @ApiImplicitParams({
-  @ApiImplicitParam(dataType = AMBARI_CONFIGURATION_REQUEST_TYPE, 
paramType = PARAM_TYPE_BODY)
+@ApiImplicitParam(dataType = AMBARI_CONFIGURATION_REQUEST_TYPE, paramType 
= PARAM_TYPE_BODY)
   })
   @ApiResponses({
 @ApiResponse(code = HttpStatus.SC_CREATED, message = 
MSG_SUCCESSFUL_OPERATION),
@@ -108,24 +102,24 @@ public class AmbariConfigurationService extends 
BaseService {
   @GET
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Retrieve all ambari configuration resources",
-  nickname = "AmbariConfigurationService#getAmbariConfigurations",
-  notes = "Returns all Ambari configurations.",
-  response = AmbariConfigurationResponseSwagger.class,
-  responseContainer = RESPONSE_CONTAINER_LIST)
+nickname = "AmbariConfigurationService#getAmbariConfigurations",
+notes = "Returns all Ambari configurations.",
+response = AmbariConfigurationResponseSwagger.class,
+responseContainer = RESPONSE_CONTAINER_LIST)
   @ApiImplicitParams({
-  @ApiImplicitParam(name = QUERY_FIELDS, value = QUERY_FILTER_DESCRIPTION,
-  defaultValue = "AmbariConfiguration/data, AmbariConfiguration/id, 
AmbariConfiguration/type",
-  dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY),
-  @ApiImplicitParam(name = QUERY_SORT, value = QUERY_SORT_DESCRIPTION,
-  defaultValue = "AmbariConfiguration/id",
-  dataType = DATA_TYPE_STRING, paramType = PARAM_TYPE_QUERY),
-  @ApiImplicitParam(name = QUERY_PAGE_SIZE, value = 
QUERY_PAGE_SIZE_DESCRIPTION, defaultValue = DEFAULT_PAGE_SIZE, dataType = 
DATA_TYPE_INT, 

[21/32] ambari git commit: AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari manages include/exclude file (dsen)

[lpuskas]

AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari 
manages include/exclude file (dsen)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 10b1efbc40b5d7dcd3d26e153f8e17125be747e8
Parents: faf5d90
Author: Dmytro Sen 
Authored: Fri Aug 11 13:36:46 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Aug 11 13:36:46 2017 +0300

--
 .../2.1.0.2.0/package/scripts/hdfs_snamenode.py |  6 ++
 .../3.0.0.3.0/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 15 ---
 .../services/HDFS/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 16 +---
 .../before-START/scripts/shared_initialization.py   | 16 +---
 .../before-START/scripts/shared_initialization.py   | 14 --
 .../before-START/scripts/shared_initialization.py   | 14 --
 8 files changed, 20 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/10b1efbc/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
index 8d4c40c..0eaeef4 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
@@ -39,6 +39,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 import params
 service(

http://git-wip-us.apache.org/repos/asf/ambari/blob/10b1efbc/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
index 8d4c40c..0eaeef4 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
@@ -39,6 +39,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 import params
 service(

http://git-wip-us.apache.org/repos/asf/ambari/blob/10b1efbc/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
index 265502f..cba724a 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
@@ -137,21 +137,6 @@ def setup_configs():
 group=params.user_group
   )
 
-  generate_include_file()
-
-
-def generate_include_file():
-  import params
-
-  if params.has_namenode and params.dfs_hosts and params.has_slaves:
-include_hosts_list = params.slave_hosts
-File(params.dfs_hosts,
- content=Template("include_hosts_list.j2"),
- owner=params.hdfs_user,
- group=params.user_group
-)
-
-
 def install_snappy():
   import params
 

[32/32] ambari git commit: AMBARI-21545 Stack Advisor support for LDAP configuration (benyoka)

[lpuskas]

AMBARI-21545 Stack Advisor support for LDAP configuration (benyoka)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: f6aca1278ad31c0de70546816e6145d43fd6d8c5
Parents: cb2e6a8
Author: Balazs Bence Sari 
Authored: Tue Aug 8 20:17:14 2017 +0200
Committer: lpuskas 
Committed: Mon Aug 14 14:01:38 2017 +0200

--
 .../services/AmbariConfigurationService.java|   4 +-
 .../stackadvisor/StackAdvisorRequest.java   |  12 ++
 .../commands/StackAdvisorCommand.java   |  54 +
 .../commands/StackAdvisorCommandTest.java   | 212 +++
 .../StackAdvisorResourceProviderTest.java   |  97 -
 5 files changed, 324 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f6aca127/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
index 0632361..927e518 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -56,9 +56,9 @@ import io.swagger.annotations.ApiResponses;
  *"data": [
  *{
  * "authentication.ldap.primaryUrl": "localhost:33389"
-   "authentication.ldap.secondaryUrl": "localhost:333"
+ * "authentication.ldap.secondaryUrl": "localhost:333"
  * "authentication.ldap.baseDn": "dc=ambari,dc=apache,dc=org"
-  * // ..
+ * // ..
  * ]
  * }
  * 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f6aca127/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java
index 7ba1b18..b90eae6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRequest.java
@@ -30,6 +30,8 @@ import 
org.apache.ambari.server.api.services.stackadvisor.recommendations.Recomm
 import org.apache.ambari.server.state.ChangedConfigInfo;
 import org.apache.commons.lang.StringUtils;
 
+import com.google.common.base.Preconditions;
+
 /**
  * Stack advisor request.
  */
@@ -47,6 +49,7 @@ public class StackAdvisorRequest {
   private List changedConfigurations = new LinkedList<>();
   private Set configGroups;
   private Map userContext = new HashMap<>();
+  private Map ldapConfig = new HashMap<>();
 
   public String getStackName() {
 return stackName;
@@ -92,6 +95,8 @@ public class StackAdvisorRequest {
 return configurations;
   }
 
+  public Map getLdapConfig() { return ldapConfig; }
+
   public List getChangedConfigurations() {
 return changedConfigurations;
   }
@@ -188,6 +193,13 @@ public class StackAdvisorRequest {
   return this;
 }
 
+public StackAdvisorRequestBuilder withLdapConfig(Map 
ldapConfig) {
+  Preconditions.checkNotNull(ldapConfig);
+  this.instance.ldapConfig = ldapConfig;
+  return this;
+}
+
+
 public StackAdvisorRequest build() {
   return this.instance;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/f6aca127/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
index 356754d..2dc45de 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
+++ 

[19/32] ambari git commit: AMBARI-21173. Not able to start Yarn services after restoring the configs to initial value.(vbrodetskyi)

[lpuskas]

AMBARI-21173. Not able to start Yarn services after restoring the configs to 
initial value.(vbrodetskyi)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 86c7f92c31fda6b89eb7c9389072a94abe35d917
Parents: d016878
Author: Vitaly Brodetskyi 
Authored: Fri Aug 11 03:03:55 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Fri Aug 11 03:04:36 2017 +0300

--
 .../org/apache/ambari/server/state/cluster/ClusterImpl.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/86c7f92c/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index c950d67..c191358 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -1806,12 +1806,18 @@ public class ClusterImpl implements Cluster {
 if (serviceConfigEntity.getGroupId() == null) {
   Collection configTypes = serviceConfigTypes.get(serviceName);
   List enabledConfigs = 
clusterDAO.getEnabledConfigsByTypes(clusterId, configTypes);
+  List serviceConfigEntities = 
serviceConfigEntity.getClusterConfigEntities();
+  ArrayList duplicatevalues = new 
ArrayList(serviceConfigEntities);
+  duplicatevalues.retainAll(enabledConfigs);
+  enabledConfigs.removeAll(duplicatevalues);
+  serviceConfigEntities.removeAll(duplicatevalues);
+
   for (ClusterConfigEntity enabledConfig : enabledConfigs) {
 enabledConfig.setSelected(false);
 clusterDAO.merge(enabledConfig);
   }
 
-  for (ClusterConfigEntity configEntity : 
serviceConfigEntity.getClusterConfigEntities()) {
+  for (ClusterConfigEntity configEntity : serviceConfigEntities) {
 configEntity.setSelected(true);
 clusterDAO.merge(configEntity);
   }

[25/32] ambari git commit: AMBARI-21307 Added new resource related changes to the db creation ddl-s

[lpuskas]

AMBARI-21307 Added new resource related changes to the db creation ddl-s


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 9694279affb3639ba2de1f2563fc4e6acacf9f02
Parents: e526e51
Author: lpuskas 
Authored: Thu Jul 6 18:15:18 2017 +0200
Committer: lpuskas 
Committed: Mon Aug 14 13:54:23 2017 +0200

--
 .../AmbariConfigurationResourceProvider.java| 12 ++--
 .../server/orm/dao/AmbariConfigurationDAO.java  | 65 ++--
 .../apache/ambari/server/orm/dao/DaoUtils.java  | 13 +---
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  | 21 +++
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  | 20 ++
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 20 ++
 .../resources/Ambari-DDL-Postgres-CREATE.sql| 14 ++---
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 20 ++
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   | 20 ++
 9 files changed, 120 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9694279a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
index 5e5af9e..e8f186d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
@@ -97,14 +97,14 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 }
   }
 
-  private static Set properties = Sets.newHashSet(
+  private static Set PROPERTIES = Sets.newHashSet(
 ResourcePropertyId.ID.getPropertyId(),
 ResourcePropertyId.TYPE.getPropertyId(),
 ResourcePropertyId.VERSION.getPropertyId(),
 ResourcePropertyId.VERSION_TAG.getPropertyId(),
 ResourcePropertyId.DATA.getPropertyId());
 
-  private static Map pkPropertyMap = 
Collections.unmodifiableMap(
+  private static Map PK_PROPERTY_MAP = 
Collections.unmodifiableMap(
 new HashMap() {{
   put(Resource.Type.AmbariConfiguration, 
ResourcePropertyId.ID.getPropertyId());
 }}
@@ -117,7 +117,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
   private Gson gson;
 
   protected AmbariConfigurationResourceProvider() {
-super(properties, pkPropertyMap);
+super(PROPERTIES, PK_PROPERTY_MAP);
 
setRequiredCreateAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION));
 
setRequiredDeleteAuthorizations(EnumSet.of(RoleAuthorization.AMBARI_MANAGE_CONFIGURATION));
 
@@ -126,7 +126,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 
   @Override
   protected Set getPKPropertyIds() {
-return Sets.newHashSet("AmbariConfiguration/id");
+return Sets.newHashSet(ResourcePropertyId.ID.getPropertyId());
   }
 
   @Override
@@ -137,7 +137,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 AmbariConfigurationEntity ambariConfigurationEntity = 
getEntityFromRequest(request);
 
 LOGGER.info("Persisting new ambari configuration: {} ", 
ambariConfigurationEntity);
-ambariConfigurationDAO.persist(ambariConfigurationEntity);
+ambariConfigurationDAO.create(ambariConfigurationEntity);
 
 return getRequestStatus(null);
   }
@@ -170,7 +170,7 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 } else {
   LOGGER.debug("Deleting amari configuration with id: {}", idFromRequest);
   try {
-ambariConfigurationDAO.deleteById(idFromRequest);
+ambariConfigurationDAO.removeByPK(idFromRequest);
   } catch (IllegalStateException e) {
 throw new NoSuchResourceException(e.getMessage());
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/9694279a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AmbariConfigurationDAO.java
index 

[17/32] ambari git commit: AMBARI-21696. Spark thrift service was alerting for connectivity for all newly created clusters. (Mingjie Tang via stoader)

[lpuskas]

AMBARI-21696. Spark thrift service was alerting for connectivity for all newly 
created clusters. (Mingjie Tang via stoader)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 24d8802d6369244a666044397ff29c3775a44dcd
Parents: d2ac184
Author: Mingjie Tang 
Authored: Thu Aug 10 11:36:21 2017 +0200
Committer: Toader, Sebastian 
Committed: Thu Aug 10 21:48:09 2017 +0200

--
 .../SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py  | 2 +-
 .../2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/24d8802d/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
index 93a2de8..3f80fd9 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/alerts/alert_spark_thrift_port.py
@@ -44,7 +44,7 @@ HIVE_SERVER2_PRINCIPAL_KEY = 
'{{hive-site/hive.server2.authentication.kerberos.p
 # The configured Kerberos executable search paths, if any
 KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = 
'{{kerberos-env/executable_search_paths}}'
 
-THRIFT_PORT_DEFAULT = 10015
+THRIFT_PORT_DEFAULT = 10001
 HIVE_SERVER_TRANSPORT_MODE_DEFAULT = 'binary'
 
 HIVEUSER_DEFAULT = 'hive'

http://git-wip-us.apache.org/repos/asf/ambari/blob/24d8802d/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
index 1ce4aca..9e1afea 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/alerts/alert_spark2_thrift_port.py
@@ -45,7 +45,7 @@ HIVE_SERVER2_PRINCIPAL_KEY = 
'{{hive-site/hive.server2.authentication.kerberos.p
 # The configured Kerberos executable search paths, if any
 KERBEROS_EXECUTABLE_SEARCH_PATHS_KEY = 
'{{kerberos-env/executable_search_paths}}'
 
-THRIFT_PORT_DEFAULT = 10016
+THRIFT_PORT_DEFAULT = 10002
 HIVE_SERVER_TRANSPORT_MODE_DEFAULT = 'binary'
 
 HIVEUSER_DEFAULT = 'hive'

[29/32] ambari git commit: AMBARI-21307 Draft implementation of the group related attributes

[lpuskas]

AMBARI-21307 Draft implementation of the group related attributes


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 2c9b774933c1bc767045c29a8d2c162b89c9b227
Parents: d64ea03
Author: lpuskas 
Authored: Tue Aug 8 13:54:29 2017 +0200
Committer: lpuskas 
Committed: Mon Aug 14 13:54:24 2017 +0200

--
 .../server/ldap/AmbariLdapConfiguration.java|  22 +-
 .../ldap/LdapConfigurationValidatorService.java |  34 +--
 .../apache/ambari/server/ldap/LdapModule.java   |   4 +-
 .../server/ldap/service/AmbariLdapFacade.java   |  25 +-
 .../ldap/service/LdapConnectionService.java |  35 +++
 .../ambari/server/ldap/service/LdapFacade.java  |   9 +-
 .../ad/AdLdapConfigurationValidatorService.java | 177 --
 ...efaultLdapConfigurationValidatorService.java | 232 +++
 .../ad/DefaultLdapConnectionService.java|  63 +
 .../service/ad/LdapConfigurationConverter.java  |  50 
 ...AdLdapConfigurationValidatorServiceTest.java | 129 ---
 ...ltLdapConfigurationValidatorServiceTest.java | 156 +
 12 files changed, 552 insertions(+), 384 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2c9b7749/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
index 519f400..a6ff80b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
@@ -53,7 +53,7 @@ public class AmbariLdapConfiguration {
 GROUP_OBJECT_CLASS("ambari.ldap.group.object.class"),
 GROUP_NAME_ATTRIBUTE("ambari.ldap.group.name.attribute"),
 GROUP_MEMBER_ATTRIBUTE("ambari.ldap.group.member.attribute"),
-GROUP_SEARCH_BASE("ambari.ldap.group.member.attribute"),
+GROUP_SEARCH_BASE("ambari.ldap.group.search.base"),
 DN_ATTRIBUTE("authentication.ldap.dnAttribute");
 
 private String propertyName;
@@ -126,4 +126,24 @@ public class AmbariLdapConfiguration {
 return (String) configurationValue(LdapConfigProperty.USER_NAME_ATTRIBUTE);
   }
 
+  public String userSearchBase() {
+return (String) configurationValue(LdapConfigProperty.USER_SEARCH_BASE);
+  }
+
+  public String groupObjectClass() {
+return (String) configurationValue(LdapConfigProperty.GROUP_OBJECT_CLASS);
+  }
+
+  public String groupNameAttribute() {
+return (String) 
configurationValue(LdapConfigProperty.GROUP_NAME_ATTRIBUTE);
+  }
+
+  public String groupMemberAttribute() {
+return (String) 
configurationValue(LdapConfigProperty.GROUP_MEMBER_ATTRIBUTE);
+  }
+
+  public String groupSearchBase() {
+return (String) configurationValue(LdapConfigProperty.GROUP_SEARCH_BASE);
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2c9b7749/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
index 4667721..7efa3b7 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationValidatorService.java
@@ -14,8 +14,11 @@
 
 package org.apache.ambari.server.ldap;
 
+import java.util.Set;
+
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ldap.service.AmbariLdapException;
+import org.apache.directory.ldap.client.api.LdapConnection;
 
 /**
  * Collection of operations for validating ldap configuration.
@@ -26,27 +29,32 @@ public interface LdapConfigurationValidatorService {
   /**
* Tests the connection based on the provided configuration.
*
-   * @param configuration the ambari ldap configuration instance
+   * @param ldapConnection connection instance
+   * @param configuration  the ambari ldap configuration instance
* @throws AmbariLdapException if the connection is not possible
*/
-  void checkConnection(AmbariLdapConfiguration configuration) throws 
AmbariLdapException;
+  void checkConnection(LdapConnection 

[08/32] ambari git commit: AMBARI-21677 - Upgrade Pre-Checks Should Take PATCH/SERVICE Types Into Account (jonathanhurley)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/108ad9b4/ambari-server/src/main/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheck.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheck.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheck.java
index ba4b61e..f41b34c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheck.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/YarnTimelineServerStatePreservingCheck.java
@@ -17,8 +17,9 @@
  */
 package org.apache.ambari.server.checks;
 
-import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.PrereqCheckRequest;
@@ -30,6 +31,8 @@ import 
org.apache.ambari.server.state.stack.UpgradePack.PrerequisiteCheckConfig;
 import org.apache.ambari.server.utils.VersionUtils;
 import org.apache.commons.lang.BooleanUtils;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import com.google.inject.Singleton;
 
 /**
@@ -55,43 +58,16 @@ public class YarnTimelineServerStatePreservingCheck extends 
AbstractCheckDescrip
* {@inheritDoc}
*/
   @Override
-  public boolean isApplicable(PrereqCheckRequest request) throws 
AmbariException {
-if (!super.isApplicable(request, Arrays.asList("YARN"), true)) {
-  return false;
-}
-
-final Cluster cluster = 
clustersProvider.get().getCluster(request.getClusterName());
-
-String minApplicableStackVersion = null;
-PrerequisiteCheckConfig prerequisiteCheckConfig = 
request.getPrerequisiteCheckConfig();
-Map checkProperties = null;
-if(prerequisiteCheckConfig != null) {
-  checkProperties = 
prerequisiteCheckConfig.getCheckProperties(this.getClass().getName());
-}
-if(checkProperties != null && 
checkProperties.containsKey(MIN_APPLICABLE_STACK_VERSION_PROPERTY_NAME)) {
-  minApplicableStackVersion = 
checkProperties.get(MIN_APPLICABLE_STACK_VERSION_PROPERTY_NAME);
-}
-
-// Due to the introduction of YARN Timeline state recovery only from 
certain
-// stack-versions onwards, this check is not applicable to earlier versions
-// of the stack.
-// Applicable only if min-applicable-stack-version config property is not 
defined, or
-// version equals or exceeds the configured version.
-if(minApplicableStackVersion != null && 
!minApplicableStackVersion.isEmpty()) {
-  String[] minStack = minApplicableStackVersion.split("-");
-  if(minStack.length == 2) {
-String minStackName = minStack[0];
-String minStackVersion = minStack[1];
-Service yarnService = cluster.getService("YARN");
-String stackName = yarnService.getDesiredStackId().getStackName();
-if (minStackName.equals(stackName)) {
-  String currentRepositoryVersion = 
yarnService.getDesiredRepositoryVersion().getVersion();
-  return VersionUtils.compareVersions(currentRepositoryVersion, 
minStackVersion) >= 0;
-}
-  }
-}
+  public Set getApplicableServices() {
+return Sets.newHashSet("YARN");
+  }
 
-return true;
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public List getQualifications() {
+return Lists. newArrayList(new 
YarnTimelineServerMinVersionQualification());
   }
 
   /**
@@ -108,4 +84,53 @@ public class YarnTimelineServerStatePreservingCheck extends 
AbstractCheckDescrip
   prerequisiteCheck.setFailReason(getFailReason(prerequisiteCheck, 
request));
 }
   }
+
+  /**
+   * The {@link YarnTimelineServerMinVersionQualification} is used to determine
+   * if the ATS component needs to have the
+   * {@value #MIN_APPLICABLE_STACK_VERSION_PROPERTY_NAME} set.
+   */
+  private class YarnTimelineServerMinVersionQualification implements 
CheckQualification {
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public boolean isApplicable(PrereqCheckRequest request) throws 
AmbariException {
+  final Cluster cluster = 
clustersProvider.get().getCluster(request.getClusterName());
+
+  String minApplicableStackVersion = null;
+  PrerequisiteCheckConfig prerequisiteCheckConfig = 
request.getPrerequisiteCheckConfig();
+  Map checkProperties = null;
+  if(prerequisiteCheckConfig != null) {
+checkProperties = 
prerequisiteCheckConfig.getCheckProperties(this.getClass().getName());
+  }
+
+  if(checkProperties != null && 
checkProperties.containsKey(MIN_APPLICABLE_STACK_VERSION_PROPERTY_NAME)) {
+minApplicableStackVersion = 
checkProperties.get(MIN_APPLICABLE_STACK_VERSION_PROPERTY_NAME);
+  }
+
+  // Due to the introduction of YARN Timeline state recovery only from 
certain
+   

[20/32] ambari git commit: AMBARI-21649 : Update Atlas log4j to reflect latest configurations (Vishal Suvagia via mugdha)

[lpuskas]

AMBARI-21649 : Update Atlas log4j to reflect latest configurations (Vishal 
Suvagia via mugdha)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: faf5d90799deee6509b1398f762616219e241f68
Parents: 86c7f92
Author: Vishal Suvagia 
Authored: Thu Aug 10 11:02:38 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Aug 11 10:24:42 2017 +0530

--
 .../ATLAS/0.7.0.3.0/configuration/atlas-log4j.xml |  4 ++--
 .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml  | 10 --
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml|  4 
 .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  1 +
 .../HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml  |  4 ++--
 .../resources/stacks/HDP/2.6/upgrades/config-upgrade.xml  |  5 +
 .../stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml|  4 
 .../resources/stacks/HDP/2.6/upgrades/upgrade-2.6.xml |  1 +
 8 files changed, 27 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/faf5d907/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-log4j.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-log4j.xml
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-log4j.xml
index bafd47d..b9c8127 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-log4j.xml
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.7.0.3.0/configuration/atlas-log4j.xml
@@ -88,7 +88,7 @@
 
   
 
-  
+  
 
 
 
@@ -130,7 +130,7 @@
 
 
   
-
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/faf5d907/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index ec6ee55..f89654e 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -134,8 +134,8 @@
 atlas-log4j
 
 
-
-
+
+
   
 
   
@@ -157,6 +157,12 @@
 application-properties
 
   
+
+  
+atlas-log4j
+
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/faf5d907/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
index e9490b2..492c308 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml
@@ -479,6 +479,10 @@
 
   
 
+  
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/faf5d907/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
index 840b17d..995a1d3 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml
@@ -1102,6 +1102,7 @@
   
   
   
+  
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/faf5d907/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ATLAS/configuration/atlas-log4j.xml
index 9e3abcf..8b5cad5 100644
--- 

[24/32] ambari git commit: AMBARI-21708. History Server cannot be started due to wrong permissions of /mr-history

[lpuskas]

AMBARI-21708. History Server cannot be started due to wrong permissions of 
/mr-history


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 4e3f7ebe06b146c5e676e3a81f1f159f26e74252
Parents: d9c271a
Author: Attila Doroszlai 
Authored: Fri Aug 11 10:09:46 2017 +0200
Committer: Attila Doroszlai 
Committed: Mon Aug 14 09:20:47 2017 +0200

--
 .../common-services/YARN/2.1.0.2.0/package/scripts/yarn.py | 2 +-
 .../src/test/python/stacks/2.0.6/YARN/test_historyserver.py| 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4e3f7ebe/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
index 28d14fe..1177107 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
@@ -327,6 +327,7 @@ def setup_historyserver():
action="create_on_execute",
owner=params.mapred_user,
group=params.user_group,
+   change_permissions_for_parents=True,
mode=0777
   )
   params.HdfsResource(None, action="execute")
@@ -401,7 +402,6 @@ def setup_resourcemanager():
 params.HdfsResource(params.node_labels_dir,
  type="directory",
  action="create_on_execute",
- change_permissions_for_parents=True,
  owner=params.yarn_user,
  group=params.user_group,
  mode=0700

http://git-wip-us.apache.org/repos/asf/ambari/blob/4e3f7ebe/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
index ba3d0ab..6a99dfa 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
@@ -330,6 +330,7 @@ class TestHistoryServer(RMFTestCase):
 security_enabled = False,
 hadoop_conf_dir = '/etc/hadoop/conf',
 keytab = UnknownConfigurationMock(),
+change_permissions_for_parents = True,
 kinit_path_local = '/usr/bin/kinit',
 user = 'hdfs',
 dfs_type = '',
@@ -596,6 +597,7 @@ class TestHistoryServer(RMFTestCase):
 security_enabled = True,
 hadoop_conf_dir = '/etc/hadoop/conf',
 keytab = '/etc/security/keytabs/hdfs.headless.keytab',
+change_permissions_for_parents = True,
 kinit_path_local = '/usr/bin/kinit',
 user = 'hdfs',
 dfs_type = '',

[07/32] ambari git commit: AMBARI-21677 - Upgrade Pre-Checks Should Take PATCH/SERVICE Types Into Account (jonathanhurley)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/108ad9b4/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerAuditDbCheckTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerAuditDbCheckTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerAuditDbCheckTest.java
index e3e14d5..ec91e48 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerAuditDbCheckTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerAuditDbCheckTest.java
@@ -22,28 +22,45 @@ import java.util.Map;
 
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
 import org.apache.ambari.server.state.DesiredConfig;
 import org.apache.ambari.server.state.Service;
+import org.apache.ambari.server.state.repository.ClusterVersionSummary;
+import org.apache.ambari.server.state.repository.VersionDefinitionXml;
 import org.apache.ambari.server.state.stack.PrereqCheckStatus;
 import org.apache.ambari.server.state.stack.PrerequisiteCheck;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
 
 import com.google.inject.Provider;
 
 /* Tests for RangerAuditDbCheck */
-
+@RunWith(MockitoJUnitRunner.class)
 public class RangerAuditDbCheckTest {
   private final Clusters clusters = Mockito.mock(Clusters.class);
   private final RangerAuditDbCheck rangerAuditDbCheck = new 
RangerAuditDbCheck();
 
+  @Mock
+  private ClusterVersionSummary m_clusterVersionSummary;
+
+  @Mock
+  private VersionDefinitionXml m_vdfXml;
+
+  @Mock
+  private RepositoryVersionEntity m_repositoryVersion;
+
+  final Map m_services = new HashMap<>();
+
   @Before
-  public void setup() {
+  public void setup() throws Exception {
 rangerAuditDbCheck.clustersProvider = new Provider() {
 
   @Override
@@ -53,24 +70,31 @@ public class RangerAuditDbCheckTest {
 };
 Configuration config = Mockito.mock(Configuration.class);
 rangerAuditDbCheck.config = config;
+
+m_services.clear();
+Mockito.when(m_repositoryVersion.getRepositoryXml()).thenReturn(m_vdfXml);
+
Mockito.when(m_vdfXml.getClusterSummary(Mockito.any(Cluster.class))).thenReturn(m_clusterVersionSummary);
+
Mockito.when(m_clusterVersionSummary.getAvailableServiceNames()).thenReturn(m_services.keySet());
   }
 
   @Test
   public void testIsApplicable() throws Exception {
 final Cluster cluster = Mockito.mock(Cluster.class);
-final Map services = new HashMap<>();
 final Service service = Mockito.mock(Service.class);
 
-services.put("RANGER", service);
+m_services.put("RANGER", service);
 
-Mockito.when(cluster.getServices()).thenReturn(services);
+Mockito.when(cluster.getServices()).thenReturn(m_services);
 Mockito.when(cluster.getClusterId()).thenReturn(1L);
 Mockito.when(clusters.getCluster("cluster")).thenReturn(cluster);
 
-Assert.assertTrue(rangerAuditDbCheck.isApplicable(new 
PrereqCheckRequest("cluster")));
+PrereqCheckRequest request = new PrereqCheckRequest("cluster");
+request.setTargetRepositoryVersion(m_repositoryVersion);
 
-services.remove("RANGER");
-Assert.assertFalse(rangerAuditDbCheck.isApplicable(new 
PrereqCheckRequest("cluster")));
+Assert.assertTrue(rangerAuditDbCheck.isApplicable(request));
+
+m_services.remove("RANGER");
+Assert.assertFalse(rangerAuditDbCheck.isApplicable(request));
   }
 
   @Test
@@ -107,5 +131,5 @@ public class RangerAuditDbCheckTest {
 Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus());
 
   }
-  
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/108ad9b4/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerPasswordCheckTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerPasswordCheckTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerPasswordCheckTest.java
index c69c4e5..cfffb8f 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerPasswordCheckTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/RangerPasswordCheckTest.java
@@ -22,7 +22,6 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import 

[14/32] ambari git commit: AMBARI-21701. Add check for import from relocated packages

[lpuskas]

AMBARI-21701. Add check for import from relocated packages


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 8895386bcc7b122788ae2af42031ff0e786c7733
Parents: 7a3ffea
Author: Attila Doroszlai 
Authored: Thu Aug 10 15:40:56 2017 +0200
Committer: Attila Doroszlai 
Committed: Thu Aug 10 16:50:45 2017 +0200

--
 ambari-server/checkstyle.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8895386b/ambari-server/checkstyle.xml
--
diff --git a/ambari-server/checkstyle.xml b/ambari-server/checkstyle.xml
index fb314bc..f1fc3a1 100644
--- a/ambari-server/checkstyle.xml
+++ b/ambari-server/checkstyle.xml
@@ -23,7 +23,9 @@
 
 
 
-
+
+  
+
 
   
   

[10/32] ambari git commit: AMBARI-21695. Problem in starting accumulo in upgraded cluster (IOP-HDP). (swagle)

[lpuskas]

AMBARI-21695. Problem in starting accumulo in upgraded cluster (IOP-HDP). 
(swagle)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 3136abed153856c1672e502d71a407abe211828f
Parents: 108ad9b
Author: Siddharth Wagle 
Authored: Wed Aug 9 15:49:15 2017 -0700
Committer: Siddharth Wagle 
Committed: Wed Aug 9 15:49:15 2017 -0700

--
 .../metadata/CachedRoleCommandOrderProvider.java   |  9 -
 .../upgrades/FinalizeUpgradeAction.java| 17 +
 2 files changed, 25 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3136abed/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
index c6315a7..0a5d301 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.metadata;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.state.Cluster;
@@ -46,7 +47,7 @@ public class CachedRoleCommandOrderProvider implements 
RoleCommandOrderProvider
   @Inject
   private Clusters clusters;
 
-  private Map rcoMap = new HashMap<>();
+  private Map rcoMap = new ConcurrentHashMap<>();
 
   @Inject
   public CachedRoleCommandOrderProvider() {
@@ -124,4 +125,10 @@ public class CachedRoleCommandOrderProvider implements 
RoleCommandOrderProvider
 return rco;
   }
 
+  /**
+   * Clear all entries - used after an upgrade
+   */
+  public void clearRoleCommandOrderCache() {
+rcoMap.clear();
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/3136abed/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 9d70546..8471d7b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -35,6 +35,8 @@ import org.apache.ambari.server.agent.CommandReport;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.events.StackUpgradeFinishEvent;
 import org.apache.ambari.server.events.publishers.VersionEventPublisher;
+import org.apache.ambari.server.metadata.CachedRoleCommandOrderProvider;
+import org.apache.ambari.server.metadata.RoleCommandOrderProvider;
 import org.apache.ambari.server.orm.dao.HostComponentStateDAO;
 import org.apache.ambari.server.orm.dao.HostVersionDAO;
 import org.apache.ambari.server.orm.entities.HostComponentStateEntity;
@@ -93,6 +95,9 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 }
   }
 
+  @Inject
+  private RoleCommandOrderProvider roleCommandOrderProvider;
+
   /**
* Execution path for upgrade.
* @return the command report
@@ -197,6 +202,12 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
   // Reset upgrade state
   cluster.setUpgradeEntity(null);
 
+  // Clear any cached RCO data after version upgrade
+  if (roleCommandOrderProvider instanceof CachedRoleCommandOrderProvider) {
+CachedRoleCommandOrderProvider cachedRcoProvider = 
(CachedRoleCommandOrderProvider) roleCommandOrderProvider;
+cachedRcoProvider.clearRoleCommandOrderCache();
+  }
+
   // the upgrade is done!
   versionEventPublisher.publish(new StackUpgradeFinishEvent(cluster));
 
@@ -319,6 +330,12 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
   // Reset upgrade state
   cluster.setUpgradeEntity(null);
 
+  // Clear any cached RCO data after version upgrade
+  if (roleCommandOrderProvider 

[13/32] ambari git commit: AMBARI-21693. Can't register multiple PATCH versions (ncole)

[lpuskas]

AMBARI-21693. Can't register multiple PATCH versions (ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 7a3ffea9e4236c2ad58b05ff7af8a31691c96ce6
Parents: 1433ecf
Author: Nate Cole 
Authored: Thu Aug 10 07:42:00 2017 -0400
Committer: Nate Cole 
Committed: Thu Aug 10 07:42:00 2017 -0400

--
 .../VersionDefinitionResourceProvider.java  |  51 --
 .../server/orm/dao/RepositoryVersionDAO.java|  15 +-
 .../orm/entities/RepositoryVersionEntity.java   |  25 ++-
 .../VersionDefinitionResourceProviderTest.java  | 170 ++-
 4 files changed, 238 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7a3ffea9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index 5d65f35..4696c70 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -21,6 +21,7 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -71,6 +72,8 @@ import org.codehaus.jackson.node.ArrayNode;
 import org.codehaus.jackson.node.JsonNodeFactory;
 import org.codehaus.jackson.node.ObjectNode;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
@@ -442,39 +445,67 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
 
 boolean emptyCompatible = 
StringUtils.isBlank(holder.xml.release.compatibleWith);
 
-for (RepositoryVersionEntity candidate : entities) {
-  String baseVersion = candidate.getVersion();
+for (RepositoryVersionEntity version : entities) {
+  String baseVersion = version.getVersion();
   if (baseVersion.lastIndexOf('-') > -1) {
 baseVersion = baseVersion.substring(0,  baseVersion.lastIndexOf('-'));
   }
 
   if (emptyCompatible) {
 if (baseVersion.equals(holder.xml.release.version)) {
-  matching.add(candidate);
+  matching.add(version);
 }
   } else {
 if (baseVersion.matches(holder.xml.release.compatibleWith)) {
-  matching.add(candidate);
+  matching.add(version);
 }
   }
 }
 
+RepositoryVersionEntity parent = null;
+
 if (matching.isEmpty()) {
   String format = "No versions matched pattern %s";
 
   throw new IllegalArgumentException(String.format(format,
   emptyCompatible ? holder.xml.release.version : 
holder.xml.release.compatibleWith));
 } else if (matching.size() > 1) {
-  Set versions= new HashSet<>();
-  for (RepositoryVersionEntity match : matching) {
-versions.add(match.getVersion());
-  }
 
-  throw new IllegalArgumentException(String.format("More than one 
repository matches patch %s: %s",
+  Function function = new 
Function() {
+@Override
+public String apply(RepositoryVersionEntity input) {
+  return input.getVersion();
+}
+  };
+
+  Collection versions = Collections2.transform(matching, function);
+
+  List used = 
s_repoVersionDAO.findByServiceDesiredVersion(matching);
+
+  if (used.isEmpty()) {
+throw new IllegalArgumentException(String.format("Could not determine 
which version " +
+  "to associate patch %s. Remove one of %s and try again.",
   entity.getVersion(), StringUtils.join(versions, ", ")));
+  } else if (used.size() > 1) {
+Collection usedVersions = Collections2.transform(used, 
function);
+
+throw new IllegalArgumentException(String.format("Patch %s was found 
to match more " +
+"than one repository in use: %s. Move all services to a common 
version and try again.",
+entity.getVersion(), StringUtils.join(usedVersions, ", 

[05/32] ambari git commit: AMBARI-21679. Service Checks Will Run Multiple Times In Patch/Service Upgrades, part 2 (ncole)

[lpuskas]

AMBARI-21679. Service Checks Will Run Multiple Times In Patch/Service Upgrades, 
part 2 (ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 78778ad5709ccee4cd4171fbe358373ed88e4fca
Parents: b234649
Author: Nate Cole 
Authored: Wed Aug 9 11:55:40 2017 -0400
Committer: Nate Cole 
Committed: Wed Aug 9 11:55:40 2017 -0400

--
 .../org/apache/ambari/server/state/stack/UpgradePackTest.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/78778ad5/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
index c7a761d..616139c 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
@@ -1,4 +1,4 @@
-/*
+/**
  * 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
@@ -210,10 +210,12 @@ public class UpgradePackTest {
 "SERVICE_CHECK_1",
 "CORE_SLAVES",
 "SERVICE_CHECK_2",
+"OOZIE",
 "POST_CLUSTER");
 
 List expected_down = Arrays.asList(
 "PRE_CLUSTER",
+"OOZIE",
 "CORE_SLAVES",
 "SERVICE_CHECK_2",
 "CORE_MASTER",

[22/32] ambari git commit: AMBARI-21706 : Fix exception messages whenever empty host list is passed in predicate. (avijayan)

[lpuskas]

AMBARI-21706 : Fix exception messages whenever empty host list is passed in 
predicate. (avijayan)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: bc6cbf3596247c79c6a2aad9047ebe6a2d1cf27b
Parents: 10b1efb
Author: Aravindan Vijayan 
Authored: Fri Aug 11 12:03:54 2017 -0700
Committer: Aravindan Vijayan 
Committed: Fri Aug 11 12:03:54 2017 -0700

--
 .../server/api/predicate/QueryParser.java   |  4 +++-
 .../api/predicate/operators/InOperator.java |  2 +-
 .../internal/StackAdvisorResourceProvider.java  | 20 +---
 .../server/api/predicate/QueryParserTest.java   | 18 ++
 .../StackAdvisorResourceProviderTest.java   | 25 
 5 files changed, 64 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bc6cbf35/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
index 3ce0958..005c151 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
@@ -107,7 +107,9 @@ public class QueryParser {
 if (keyObject != null) {
   String key = keyObject.toString();
   if (key.endsWith("/host_name")) {
-
expression.setRightOperand(expression.getRightOperand().toString().toLowerCase());
+if (expression.getRightOperand() != null) {
+  
expression.setRightOperand(expression.getRightOperand().toString().toLowerCase());
+}
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/bc6cbf35/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
index 75ae5de..1dc5a14 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
@@ -47,7 +47,7 @@ public class InOperator extends AbstractOperator implements 
RelationalOperator {
   public Predicate toPredicate(String prop, String val) throws 
InvalidQueryException {
 
 if (val == null) {
-  throw new InvalidQueryException("IN operator is missing a required right 
operand.");
+  throw new InvalidQueryException("IN operator is missing a required right 
operand for property " + prop);
 }
 
 String[] tokens = val.split(",");

http://git-wip-us.apache.org/repos/asf/ambari/blob/bc6cbf35/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
index 2eed23d..a162097 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.controller.internal;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -106,8 +107,22 @@ public abstract class StackAdvisorResourceProvider extends 
ReadOnlyResourceProvi
* 
* @see JsonRequestBodyParser for arrays parsing
*/
-  List hosts = (List) getRequestProperty(request, 
HOST_PROPERTY);
-  List services = (List) getRequestProperty(request, 
SERVICES_PROPERTY);
+  Object hostsObject = getRequestProperty(request, HOST_PROPERTY);
+  if (hostsObject instanceof LinkedHashSet) {
+if (((LinkedHashSet)hostsObject).isEmpty()) {
+  throw new Exception("Empty host list passed to recommendation 

[02/32] ambari git commit: AMBARI-21642. Add hadoop LZO jars if installed in the cluster for DRUID. (Slim Bouguerra via Swapan Shridhar)

[lpuskas]

AMBARI-21642. Add hadoop LZO jars if installed in the cluster for DRUID. (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/5442231e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5442231e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5442231e

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 5442231e4e8e517f1e47f4c177cbe5799e8f96b8
Parents: ea2c432
Author: Swapan Shridhar 
Authored: Tue Aug 8 16:14:31 2017 -0700
Committer: Swapan Shridhar 
Committed: Tue Aug 8 16:14:31 2017 -0700

--
 .../DRUID/0.9.2/package/scripts/druid.py   |  6 ++
 .../DRUID/0.9.2/package/scripts/params.py  | 13 +
 2 files changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5442231e/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
index cc02519..4e1ced1 100644
--- 
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
@@ -113,6 +113,12 @@ def druid(upgrade_type=None, nodeType=None):

node_jvm_opts=druid_env_config[format('druid.{node_type_lowercase}.jvm.opts')])
  )
 Logger.info(format("Created druid-{node_type_lowercase} jvm.config"))
+# Handling hadoop Lzo jars if enable and node type is hadoop related eg 
Overlords and MMs
+if params.lzo_enabled and len(params.lzo_packages) > 0 and (
+node_type == 'middleManager' or node_type == 'overlord'):
+Logger.info(
+format("Copying hadoop lzo jars from {hadoop_lib_home} to 
{hadoop_dependencies_dir}/hadoop-client/*/"))
+Execute(format('{sudo} cp {hadoop_lib_home}/hadoop-lzo*.jar 
{hadoop_dependencies_dir}/hadoop-client/*/'))
 
   # All druid nodes have dependency on hdfs_client
   ensure_hadoop_directories()

http://git-wip-us.apache.org/repos/asf/ambari/blob/5442231e/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index d47e604..9e766cd 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -18,6 +18,7 @@ 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
@@ -26,6 +27,7 @@ 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
 
@@ -50,10 +52,14 @@ 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}")
@@ -230,3 +236,10 @@ if not len(druid_router_hosts) == 0:
   druid_router_host = druid_router_hosts[0]
 druid_coordinator_port = 
config['configurations']['druid-coordinator']['druid.port']
 druid_router_port = config['configurations']['druid-router']['druid.port']
+
+# Create current Hadoop Clients  Libs
+stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+io_compression_codecs = 
default("/configurations/core-site/io.compression.codecs", None)
+lzo_enabled = io_compression_codecs is not None and 

[11/32] ambari git commit: AMBARI-21695. Problem in starting accumulo in upgraded cluster (IOP-HDP). Addendum. (swagle)

[lpuskas]

AMBARI-21695. Problem in starting accumulo in upgraded cluster (IOP-HDP). 
Addendum. (swagle)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 655c3c6aa1ece4b16e2bc6ae6bcee3061252747d
Parents: 3136abe
Author: Siddharth Wagle 
Authored: Wed Aug 9 20:07:24 2017 -0700
Committer: Siddharth Wagle 
Committed: Wed Aug 9 20:07:24 2017 -0700

--
 .../listeners/upgrade/StackUpgradeFinishListener.java  | 13 +
 .../metadata/CachedRoleCommandOrderProvider.java   |  1 -
 .../serveraction/upgrades/FinalizeUpgradeAction.java   | 13 -
 3 files changed, 13 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/655c3c6a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
index 53ec23d..f1168a4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
@@ -23,6 +23,8 @@ import org.apache.ambari.server.EagerSingleton;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.events.StackUpgradeFinishEvent;
 import org.apache.ambari.server.events.publishers.VersionEventPublisher;
+import org.apache.ambari.server.metadata.CachedRoleCommandOrderProvider;
+import org.apache.ambari.server.metadata.RoleCommandOrderProvider;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
@@ -46,9 +48,13 @@ public class StackUpgradeFinishListener {
* Logger.
*/
   private final static Logger LOG = 
LoggerFactory.getLogger(StackUpgradeFinishListener.class);
+
   @Inject
   Provider ambariMetaInfo;
 
+  @Inject
+  RoleCommandOrderProvider roleCommandOrderProvider;
+
   /**
* Constructor.
*
@@ -80,6 +86,13 @@ public class StackUpgradeFinishListener {
   }
 }
   }
+
+  // Clear the RoleCommandOrder cache on upgrade
+  if (roleCommandOrderProvider instanceof CachedRoleCommandOrderProvider) {
+LOG.info("Clearing RCO cache");
+CachedRoleCommandOrderProvider cachedRcoProvider = 
(CachedRoleCommandOrderProvider) roleCommandOrderProvider;
+cachedRcoProvider.clearRoleCommandOrderCache();
+  }
 }
 
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/655c3c6a/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
index 0a5d301..1ef415a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
@@ -18,7 +18,6 @@
 
 package org.apache.ambari.server.metadata;
 
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

http://git-wip-us.apache.org/repos/asf/ambari/blob/655c3c6a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 8471d7b..26dcf27 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -35,7 +35,6 @@ import org.apache.ambari.server.agent.CommandReport;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.events.StackUpgradeFinishEvent;
 import 

[16/32] ambari git commit: AMBARI-21695. Problem in starting accumulo in upgraded cluster (IOP-HDP). UT fix ammended. (swagle)

[lpuskas]

AMBARI-21695. Problem in starting accumulo in upgraded cluster (IOP-HDP). UT 
fix ammended. (swagle)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d2ac184c3de509d2fb6f6b46f6f0119b4f1a121d
Parents: 64a3926
Author: Siddharth Wagle 
Authored: Thu Aug 10 09:49:14 2017 -0700
Committer: Siddharth Wagle 
Committed: Thu Aug 10 09:49:14 2017 -0700

--
 .../events/listeners/upgrade/StackUpgradeFinishListener.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d2ac184c/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
index 0146bdb..41c2c2b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
@@ -90,7 +90,7 @@ public class StackUpgradeFinishListener {
   // Clear the RoleCommandOrder cache on upgrade
   if (roleCommandOrderProvider.get() instanceof 
CachedRoleCommandOrderProvider) {
 LOG.info("Clearing RCO cache");
-CachedRoleCommandOrderProvider cachedRcoProvider = 
(CachedRoleCommandOrderProvider) roleCommandOrderProvider;
+CachedRoleCommandOrderProvider cachedRcoProvider = 
(CachedRoleCommandOrderProvider) roleCommandOrderProvider.get();
 cachedRcoProvider.clearRoleCommandOrderCache();
   }
 }

[12/32] ambari git commit: AMBARI-21677. Upgrade Pre-Checks Should Take PATCH/SERVICE Types Into Account - fix import

[lpuskas]

AMBARI-21677. Upgrade Pre-Checks Should Take PATCH/SERVICE Types Into Account - 
fix import


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 1433ecff108df159f71961e23a34d248e1684c85
Parents: 655c3c6
Author: Attila Doroszlai 
Authored: Thu Aug 10 11:56:16 2017 +0200
Committer: Attila Doroszlai 
Committed: Thu Aug 10 11:56:16 2017 +0200

--
 .../apache/ambari/server/checks/AbstractCheckDescriptorTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1433ecff/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java
index 1b87b30..092bd0b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/AbstractCheckDescriptorTest.java
@@ -36,13 +36,13 @@ import 
org.apache.ambari.server.state.repository.VersionDefinitionXml;
 import org.apache.ambari.server.state.stack.PrereqCheckType;
 import org.apache.ambari.server.state.stack.PrerequisiteCheck;
 import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
-import org.apache.hadoop.metrics2.sink.relocated.google.common.collect.Sets;
 import org.easymock.EasyMock;
 import org.easymock.EasyMockSupport;
 import org.easymock.Mock;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.google.common.collect.Sets;
 import com.google.inject.Provider;
 
 import junit.framework.Assert;
@@ -303,4 +303,4 @@ public class AbstractCheckDescriptorTest extends 
EasyMockSupport {
 throws AmbariException {
 }
   }
-}
\ No newline at end of file
+}

[15/32] ambari git commit: AMBARI-21695. Problem in starting accumulo in upgraded cluster (IOP-HDP). UT fix. (swagle)

[lpuskas]

AMBARI-21695. Problem in starting accumulo in upgraded cluster (IOP-HDP). UT 
fix. (swagle)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 64a3926fb430a128fbda63a3477f8330e2562c58
Parents: 8895386
Author: Siddharth Wagle 
Authored: Thu Aug 10 08:52:02 2017 -0700
Committer: Siddharth Wagle 
Committed: Thu Aug 10 08:52:02 2017 -0700

--
 .../events/listeners/upgrade/StackUpgradeFinishListener.java   | 4 ++--
 .../listeners/upgrade/StackUpgradeFinishListenerTest.java  | 6 ++
 2 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/64a3926f/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
index f1168a4..0146bdb 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListener.java
@@ -53,7 +53,7 @@ public class StackUpgradeFinishListener {
   Provider ambariMetaInfo;
 
   @Inject
-  RoleCommandOrderProvider roleCommandOrderProvider;
+  Provider roleCommandOrderProvider;
 
   /**
* Constructor.
@@ -88,7 +88,7 @@ public class StackUpgradeFinishListener {
   }
 
   // Clear the RoleCommandOrder cache on upgrade
-  if (roleCommandOrderProvider instanceof CachedRoleCommandOrderProvider) {
+  if (roleCommandOrderProvider.get() instanceof 
CachedRoleCommandOrderProvider) {
 LOG.info("Clearing RCO cache");
 CachedRoleCommandOrderProvider cachedRcoProvider = 
(CachedRoleCommandOrderProvider) roleCommandOrderProvider;
 cachedRcoProvider.clearRoleCommandOrderCache();

http://git-wip-us.apache.org/repos/asf/ambari/blob/64a3926f/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListenerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListenerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListenerTest.java
index 759716a..c4b1f0b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListenerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackUpgradeFinishListenerTest.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.events.StackUpgradeFinishEvent;
 import org.apache.ambari.server.events.publishers.VersionEventPublisher;
+import org.apache.ambari.server.metadata.RoleCommandOrderProvider;
 import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
 import org.apache.ambari.server.orm.entities.UpgradeEntity;
 import org.apache.ambari.server.state.Cluster;
@@ -33,11 +34,14 @@ import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.ServiceComponentHost;
 import org.easymock.EasyMockRunner;
 import org.easymock.EasyMockSupport;
+import org.easymock.Mock;
+import org.easymock.MockType;
 import org.easymock.TestSubject;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.google.inject.Provider;
 
 
 /**
@@ -67,6 +71,8 @@ public class StackUpgradeFinishListenerTest extends 
EasyMockSupport {
   @TestSubject
   private StackUpgradeFinishListener listener = new 
StackUpgradeFinishListener(publisher);
 
+  @Mock(type = MockType.NICE)
+  private Provider 
roleCommandOrderProviderProviderMock;
 
   @Before
   public void setup() throws Exception {

[30/32] ambari git commit: AMBARI-21307 Groups for the test user returned to the caller

[lpuskas]

AMBARI-21307 Groups for the test user returned to the caller


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: cb2e6a8e688a8c4230213239a1868e034e49a951
Parents: 2c9b774
Author: lpuskas 
Authored: Tue Aug 8 15:50:29 2017 +0200
Committer: lpuskas 
Committed: Mon Aug 14 13:54:24 2017 +0200

--
 .../api/services/ldap/LdapRestService.java  | 16 +-
 .../server/ldap/AmbariLdapConfiguration.java|  2 +-
 .../apache/ambari/server/ldap/LdapModule.java   |  3 +
 .../server/ldap/service/AmbariLdapFacade.java   |  3 +-
 .../ambari/server/ldap/service/LdapFacade.java  |  3 +-
 ...efaultLdapConfigurationValidatorService.java | 25 ++---
 .../ad/DefaultLdapConnectionService.java|  2 +-
 ...ltLdapConfigurationValidatorServiceTest.java | 59 +++-
 8 files changed, 49 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cb2e6a8e/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
index 33b10fa..8578204 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
@@ -28,6 +28,8 @@
 
 package org.apache.ambari.server.api.services.ldap;
 
+import java.util.Set;
+
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
@@ -41,12 +43,16 @@ import org.apache.ambari.server.api.services.BaseService;
 import org.apache.ambari.server.api.services.Result;
 import org.apache.ambari.server.api.services.ResultImpl;
 import org.apache.ambari.server.api.services.ResultStatus;
+import org.apache.ambari.server.controller.internal.ResourceImpl;
+import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.ldap.AmbariLdapConfiguration;
 import org.apache.ambari.server.ldap.LdapConfigurationFactory;
 import org.apache.ambari.server.ldap.service.LdapFacade;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.Sets;
+
 /**
  * Endpoint designated to LDAP specific operations.
  */
@@ -68,6 +74,8 @@ public class LdapRestService extends BaseService {
   @Consumes(MediaType.APPLICATION_JSON)
   public Response validateConfiguration(LdapCheckConfigurationRequest 
ldapCheckConfigurationRequest) {
 
+Set groups = Sets.newHashSet();
+
 Result result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.OK));
 try {
 
@@ -86,7 +94,11 @@ public class LdapRestService extends BaseService {
 case "test-attributes":
 
   LOGGER.info("Testing LDAP attributes ");
-  
ldapFacade.checkLdapAttibutes(ldapCheckConfigurationRequest.getRequestInfo().getParameters(),
 ambariLdapConfiguration);
+  groups = 
ldapFacade.checkLdapAttibutes(ldapCheckConfigurationRequest.getRequestInfo().getParameters(),
 ambariLdapConfiguration);
+  // todo factor out the resource creation, design better the 
structure in the response
+  Resource resource = new 
ResourceImpl(Resource.Type.AmbariConfiguration);
+  resource.setProperty("groups", groups);
+  result.getResultTree().addChild(resource, "payload");
 
   break;
 case "detect-attributes":
@@ -101,7 +113,7 @@ public class LdapRestService extends BaseService {
   }
 
 } catch (Exception e) {
-  result = new ResultImpl(new 
ResultStatus(ResultStatus.STATUS.BAD_REQUEST, e));
+  result.setResultStatus(new ResultStatus(ResultStatus.STATUS.BAD_REQUEST, 
e));
 }
 
 return 
Response.status(result.getStatus().getStatusCode()).entity(getResultSerializer().serialize(result)).build();

http://git-wip-us.apache.org/repos/asf/ambari/blob/cb2e6a8e/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
index a6ff80b..8ab587b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
+++ 

[03/32] ambari git commit: AMBARI-21691 Config Group filter does not reflect all the config groups in the list. (atkach)

[lpuskas]

AMBARI-21691 Config Group filter does not reflect all the config groups in the 
list. (atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: c9ced876800a36ba09959370d17a228f31d1018d
Parents: 5442231
Author: Andrii Tkach 
Authored: Wed Aug 9 16:16:08 2017 +0300
Committer: Andrii Tkach 
Committed: Wed Aug 9 16:16:08 2017 +0300

--
 ambari-web/app/mixins/common/table_server_view_mixin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9ced876/ambari-web/app/mixins/common/table_server_view_mixin.js
--
diff --git a/ambari-web/app/mixins/common/table_server_view_mixin.js 
b/ambari-web/app/mixins/common/table_server_view_mixin.js
index a4e6db7..9695579 100644
--- a/ambari-web/app/mixins/common/table_server_view_mixin.js
+++ b/ambari-web/app/mixins/common/table_server_view_mixin.js
@@ -58,7 +58,7 @@ App.TableServerViewMixin = Em.Mixin.create({
 return content.sort(function (a, b) {
   return a.get('index') - b.get('index');
 });
-  }.property('filteredContent'),
+  }.property('filteredContent.length'),
 
   /**
* compute applied filter and run content update from server

[01/32] ambari git commit: AMBARI-21685. Component fails to install with error, 'The stack packages are not defined on the command. Unable to load packages for the stack-select tool' (alejandro) [Forc

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 3fd19fe70 -> f6aca1278 (forced update)


AMBARI-21685. Component fails to install with error, 'The stack packages are 
not defined on the command. Unable to load packages for the stack-select tool' 
(alejandro)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: ea2c432fcff5807b3cffc5cb94e0764cb8f94aa7
Parents: 64cae8e
Author: Alejandro Fernandez 
Authored: Tue Aug 8 13:41:28 2017 -0700
Committer: Alejandro Fernandez 
Committed: Tue Aug 8 13:41:28 2017 -0700

--
 .../resources/stacks/HDP/3.0/configuration/cluster-env.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ea2c432f/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml 
b/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml
index 2fa33bd..1b903b1 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/3.0/configuration/cluster-env.xml
@@ -262,14 +262,14 @@ gpgcheck=0
 
 
   
-  
+  
   
-stack_select_packages
+stack_packages
 
 Associations between component and stack-select 
tools.
 VALUE_FROM_PROPERTY_FILE
 
-  stack_select_packages.json
+  stack_packages.json
   json
   true
   false

ambari git commit: AMBARI-21549. Ambari upgrade should update unique constraints (dlysnichenko)

[dmitriusan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 7ab587612 -> 9fe2b6788


AMBARI-21549. Ambari upgrade should update unique constraints (dlysnichenko)


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

Branch: refs/heads/branch-2.6
Commit: 9fe2b6788e198a47a2fcc2090810d16e683b5b48
Parents: 7ab5876
Author: Lisnichenko Dmitro 
Authored: Mon Aug 14 14:50:04 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Mon Aug 14 14:50:04 2017 +0300

--
 .../java/org/apache/ambari/server/orm/DBAccessor.java | 10 ++
 .../java/org/apache/ambari/server/orm/DBAccessorImpl.java |  7 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9fe2b678/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index 8f1a192..01bec59 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -184,6 +184,16 @@ public interface DBAccessor {
 throws SQLException;
 
   /**
+   * Add unique table constraint
+   * @param constraintName name of the constraint
+   * @param tableName name of the table
+   * @param columnNames list of columns
+   * @throws SQLException
+   */
+  void updateUniqueConstraint(String tableName, String constraintName, 
String... columnNames)
+  throws SQLException;
+
+  /**
*
* @param tableName name of the table
* @param constraintName name of the constraint

http://git-wip-us.apache.org/repos/asf/ambari/blob/9fe2b678/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index d693809..bed21e8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -571,6 +571,13 @@ public class DBAccessorImpl implements DBAccessor {
   }
 
   @Override
+  public void updateUniqueConstraint(String tableName, String constraintName, 
String... columnNames)
+  throws SQLException {
+dropUniqueConstraint(tableName, constraintName);
+addUniqueConstraint(tableName, constraintName, columnNames);
+  }
+
+  @Override
   public void addPKConstraint(String tableName, String constraintName, boolean 
ignoreErrors, String... columnName) throws SQLException {
 if (!tableHasPrimaryKey(tableName, null) && tableHasColumn(tableName, 
columnName)) {
   String query = dbmsHelper.getAddPrimaryKeyConstraintStatement(tableName, 
constraintName, columnName);

ambari git commit: AMBARI-21688. Fix raceconditions causing ambari-agent to hang/fail (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-3.0-perf cfec01d69 -> 57b79f937


AMBARI-21688. Fix raceconditions causing ambari-agent to hang/fail (aonishuk)


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

Branch: refs/heads/branch-3.0-perf
Commit: 57b79f937af5d046ef420b8dc839fad92a24c64a
Parents: cfec01d
Author: Andrew Onishuk 
Authored: Mon Aug 14 14:24:30 2017 +0300
Committer: Andrew Onishuk 
Committed: Mon Aug 14 14:24:30 2017 +0300

--
 .../python/ambari_agent/CommandStatusDict.py| 10 +++-
 .../ambari_agent/ComponentStatusExecutor.py |  3 +
 .../main/python/ambari_agent/HeartbeatThread.py | 63 +---
 .../python/ambari_agent/HostStatusReporter.py   |  3 +
 .../python/ambari_agent/InitializerModule.py| 36 +++
 .../listeners/ServerResponsesListener.py|  8 ++-
 .../src/main/python/ambari_agent/security.py| 27 -
 .../python/ambari_stomp/adapter/websocket.py| 18 --
 .../src/main/python/ambari_ws4py/websocket.py   |  3 +
 9 files changed, 114 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/57b79f93/ambari-agent/src/main/python/ambari_agent/CommandStatusDict.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/CommandStatusDict.py 
b/ambari-agent/src/main/python/ambari_agent/CommandStatusDict.py
index d6cbdcc..e7b7e49 100644
--- a/ambari-agent/src/main/python/ambari_agent/CommandStatusDict.py
+++ b/ambari-agent/src/main/python/ambari_agent/CommandStatusDict.py
@@ -25,6 +25,7 @@ from collections import defaultdict
 from Grep import Grep
 
 from ambari_agent import Constants
+from ambari_agent import security
 
 logger = logging.getLogger()
 
@@ -59,11 +60,14 @@ class CommandStatusDict():
 self.force_update_to_server({command['clusterId']: [new_report]})
 
   def force_update_to_server(self, reports_dict):
-if self.initializer_module.is_registered:
+if not self.initializer_module.is_registered:
+  return False
+
+try:
   
self.initializer_module.connection.send(message={'clusters':reports_dict}, 
destination=Constants.COMMANDS_STATUS_REPORTS_ENDPOINT)
   return True
-
-return False
+except security.ConnectionIsNotEstablished:
+  return False
 
   def report(self):
 report = self.generate_report()

http://git-wip-us.apache.org/repos/asf/ambari/blob/57b79f93/ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py
--
diff --git 
a/ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py 
b/ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py
index be3eb5b..66df15a 100644
--- a/ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py
@@ -24,6 +24,7 @@ import threading
 from ambari_agent import Constants
 from ambari_agent.LiveStatus import LiveStatus
 from collections import defaultdict
+from ambari_agent import security
 
 logger = logging.getLogger(__name__)
 
@@ -98,6 +99,8 @@ class ComponentStatusExecutor(threading.Thread):
 self.recovery_manager.handle_status_change(component_name, 
status)
 
 self.send_updates_to_server(cluster_reports)
+  except security.ConnectionIsNotEstablished: # server and agent 
disconnected during sending data. Not an issue
+pass
   except:
 logger.exception("Exception in ComponentStatusExecutor. Re-running it")
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/57b79f93/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py 
b/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
index e2fe4af..b6e1aaf 100644
--- a/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
+++ b/ambari-agent/src/main/python/ambari_agent/HeartbeatThread.py
@@ -23,7 +23,6 @@ import ambari_stomp
 import threading
 from socket import error as socket_error
 
-from ambari_agent.security import ConnectionFailed
 from ambari_agent import Constants
 from ambari_agent.Register import Register
 from ambari_agent.Utils import BlockingDictionary
@@ -35,6 +34,8 @@ from ambari_agent.listeners.MetadataEventListener import 
MetadataEventListener
 from ambari_agent.listeners.CommandsEventListener import CommandsEventListener
 from ambari_agent.listeners.HostLevelParamsEventListener import 

ambari git commit: AMBARI-21708. History Server cannot be started due to wrong permissions of /mr-history

[adoroszlai]

Repository: ambari
Updated Branches:
  refs/heads/trunk d9c271ae6 -> 4e3f7ebe0


AMBARI-21708. History Server cannot be started due to wrong permissions of 
/mr-history


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

Branch: refs/heads/trunk
Commit: 4e3f7ebe06b146c5e676e3a81f1f159f26e74252
Parents: d9c271a
Author: Attila Doroszlai 
Authored: Fri Aug 11 10:09:46 2017 +0200
Committer: Attila Doroszlai 
Committed: Mon Aug 14 09:20:47 2017 +0200

--
 .../common-services/YARN/2.1.0.2.0/package/scripts/yarn.py | 2 +-
 .../src/test/python/stacks/2.0.6/YARN/test_historyserver.py| 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4e3f7ebe/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
index 28d14fe..1177107 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
@@ -327,6 +327,7 @@ def setup_historyserver():
action="create_on_execute",
owner=params.mapred_user,
group=params.user_group,
+   change_permissions_for_parents=True,
mode=0777
   )
   params.HdfsResource(None, action="execute")
@@ -401,7 +402,6 @@ def setup_resourcemanager():
 params.HdfsResource(params.node_labels_dir,
  type="directory",
  action="create_on_execute",
- change_permissions_for_parents=True,
  owner=params.yarn_user,
  group=params.user_group,
  mode=0700

http://git-wip-us.apache.org/repos/asf/ambari/blob/4e3f7ebe/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
index ba3d0ab..6a99dfa 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_historyserver.py
@@ -330,6 +330,7 @@ class TestHistoryServer(RMFTestCase):
 security_enabled = False,
 hadoop_conf_dir = '/etc/hadoop/conf',
 keytab = UnknownConfigurationMock(),
+change_permissions_for_parents = True,
 kinit_path_local = '/usr/bin/kinit',
 user = 'hdfs',
 dfs_type = '',
@@ -596,6 +597,7 @@ class TestHistoryServer(RMFTestCase):
 security_enabled = True,
 hadoop_conf_dir = '/etc/hadoop/conf',
 keytab = '/etc/security/keytabs/hdfs.headless.keytab',
+change_permissions_for_parents = True,
 kinit_path_local = '/usr/bin/kinit',
 user = 'hdfs',
 dfs_type = '',