ambari git commit: AMBARI-22659. unable to proceed with cluster install after component install fails. (mpapirkovskyy)

[mpapirkovskyy]

Repository: ambari
Updated Branches:
  refs/heads/trunk 3ab1045c1 -> 856d9a53d


AMBARI-22659. unable to proceed with cluster install after component install 
fails. (mpapirkovskyy)


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

Branch: refs/heads/trunk
Commit: 856d9a53d39b1658a846311d672ba54699b73f90
Parents: 3ab1045
Author: Myroslav Papirkovskyi 
Authored: Fri Dec 15 18:13:49 2017 +0200
Committer: Myroslav Papirkovskyi 
Committed: Fri Dec 15 18:46:35 2017 +0200

--
 .../apache/ambari/server/orm/dao/HostVersionDAO.java | 15 +++
 .../server/orm/entities/HostVersionEntity.java   |  5 +
 .../ambari/server/state/cluster/ClusterImpl.java | 10 ++
 .../ambari/server/orm/dao/HostVersionDAOTest.java| 12 
 4 files changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/856d9a53/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java
index 158370f..feb4172 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java
@@ -130,6 +130,21 @@ public class HostVersionDAO extends 
CrudDAO {
   }
 
   /**
+   * Retrieve all of the cluster versions for the given cluster name.
+   *
+   * @param clusterName Cluster name
+   * @return Return all of the host versions that match the criteria.
+   */
+  @RequiresSession
+  public List findByCluster(String  clusterName) {
+final TypedQuery query = entityManagerProvider.get()
+.createNamedQuery("findByCluster", HostVersionEntity.class);
+query.setParameter("clusterName", clusterName);
+
+return daoUtils.selectList(query);
+  }
+
+  /**
* Retrieve all of the host versions for the given cluster name, and state. 

* @param clusterName Cluster name
* @param state repository version state

http://git-wip-us.apache.org/repos/asf/ambari/blob/856d9a53/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
index 4a030af..2c61a3c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
@@ -66,6 +66,11 @@ import org.apache.ambari.server.state.RepositoryVersionState;
 query = "SELECT hostVersion FROM HostVersionEntity hostVersion JOIN 
hostVersion.hostEntity host JOIN host.clusterEntities clusters "
 + "WHERE clusters.clusterName=:clusterName AND 
hostVersion.state=:state"),
 
+@NamedQuery(
+name = "findByCluster",
+query = "SELECT hostVersion FROM HostVersionEntity hostVersion JOIN 
hostVersion.hostEntity host JOIN host.clusterEntities clusters "
++ "WHERE clusters.clusterName=:clusterName"),
+
 @NamedQuery(name = "hostVersionByClusterHostnameAndState", query =
 "SELECT hostVersion FROM HostVersionEntity hostVersion JOIN 
hostVersion.hostEntity host JOIN host.clusterEntities clusters " +
 "WHERE clusters.clusterName=:clusterName AND 
hostVersion.hostEntity.hostName=:hostName AND hostVersion.state=:state"),

http://git-wip-us.apache.org/repos/asf/ambari/blob/856d9a53/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 c23b971..2266c62 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
@@ -1334,6 +1334,7 @@ public class ClusterImpl implements Cluster {
 try {
   refresh();
   deleteAllServices();
+  resetHostVersions();
 
   refresh(); // update one-to-many clusterServiceEntities
   removeEntities();
@@ -1353,6 

ambari git commit: AMBARI-22164. Fix wrong assignment due to leftover parameter name (adoroszlai)

[adoroszlai]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 f953ceb5a -> 09724a276


AMBARI-22164. Fix wrong assignment due to leftover parameter name (adoroszlai)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 09724a2769f3ea12e89574f60e78f1f47ddeb26d
Parents: f953ceb
Author: Doroszlai, Attila 
Authored: Wed Dec 6 10:50:44 2017 +0100
Committer: Doroszlai, Attila 
Committed: Fri Dec 15 18:06:14 2017 +0100

--
 .../ambari/server/controller/ServiceComponentHostRequest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09724a27/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
index ea082c6..2554c25 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
@@ -37,7 +37,7 @@ public class ServiceComponentHostRequest {
 
   public ServiceComponentHostRequest(String clusterName,
  String serviceGroupName,
- String serviceDisplayName,
+ String serviceName,
  String componentName,
  String hostname,
  String desiredState) {

ambari git commit: AMBARI-22249. Fix AmbariContext.serviceGroupDependencyResourceProvider initialization (adoroszlai)

[adoroszlai]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 27d17cf1e -> f953ceb5a


AMBARI-22249. Fix AmbariContext.serviceGroupDependencyResourceProvider 
initialization (adoroszlai)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: f953ceb5a5c0662b37dc6827fc9229818bc6cd8d
Parents: 27d17cf
Author: Doroszlai, Attila 
Authored: Tue Dec 5 10:05:12 2017 +0100
Committer: Doroszlai, Attila 
Committed: Fri Dec 15 18:05:16 2017 +0100

--
 .../main/java/org/apache/ambari/server/topology/AmbariContext.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f953ceb5/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
index f413768..3811848 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
@@ -779,7 +779,7 @@ public class AmbariContext {
 
   private synchronized ServiceGroupDependencyResourceProvider 
getServiceGroupDependencyResourceProvider() {
 if (serviceGroupDependencyResourceProvider == null) {
-  serviceGroupResourceProvider = (ServiceGroupResourceProvider) 
ClusterControllerHelper.
+  serviceGroupDependencyResourceProvider = 
(ServiceGroupDependencyResourceProvider) ClusterControllerHelper.
   
getClusterController().ensureResourceProvider(Resource.Type.ServiceGroupDependency);
 }
 return serviceGroupDependencyResourceProvider;

ambari git commit: AMBARI-22196. yum repo file contains parsing errors due to initial whitespace (adoroszlai)

[adoroszlai]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 0b1ce86bb -> 27d17cf1e


AMBARI-22196. yum repo file contains parsing errors due to initial whitespace 
(adoroszlai)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 27d17cf1e5b4582d0afa519e299dabdcf693c960
Parents: 0b1ce86
Author: Attila Doroszlai 
Authored: Fri Nov 17 18:16:48 2017 +0100
Committer: Doroszlai, Attila 
Committed: Fri Dec 15 18:04:01 2017 +0100

--
 ambari-server/src/main/resources/cluster-settings.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/27d17cf1/ambari-server/src/main/resources/cluster-settings.xml
--
diff --git a/ambari-server/src/main/resources/cluster-settings.xml 
b/ambari-server/src/main/resources/cluster-settings.xml
index 70b100a..817a31c 100644
--- a/ambari-server/src/main/resources/cluster-settings.xml
+++ b/ambari-server/src/main/resources/cluster-settings.xml
@@ -181,13 +181,13 @@
 
 repo_suse_rhel_template
 [{{repo_id}}]
-name={{repo_id}}
-{% if mirror_list %}mirrorlist={{mirror_list}}{% else 
%}baseurl={{base_url}}{% endif %}
+name={{repo_id}}
+{% if mirror_list %}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% 
endif %}
 
-path=/
-enabled=1
-gpgcheck=0
-
+path=/
+enabled=1
+gpgcheck=0
+
 Template of repositories for rhel and suse.
 
 

ambari git commit: AMBARI-22657 Oozie service check failed during 4th digit PU (dgrinenko)

[hapylestat]

Repository: ambari
Updated Branches:
  refs/heads/trunk f1f730229 -> 3ab1045c1


AMBARI-22657 Oozie service check failed during 4th digit PU (dgrinenko)


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

Branch: refs/heads/trunk
Commit: 3ab1045c1f95a90159e69fbd934953927947c754
Parents: f1f7302
Author: Dmytro Grinenko 
Authored: Fri Dec 15 17:50:01 2017 +0200
Committer: Dmytro Grinenko 
Committed: Fri Dec 15 17:50:01 2017 +0200

--
 .../resources/stacks/HDP/2.0.6/properties/stack_packages.json | 3 ++-
 .../main/resources/stacks/HDP/3.0/properties/stack_packages.json  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab1045c/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
index 62a46b9..01a30f3 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
@@ -536,7 +536,8 @@
 "oozie-server"
   ],
   "PATCH": [
-"oozie-server"
+"oozie-server",
+"oozie-client"
   ],
   "STANDARD": [
 "oozie-client",

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab1045c/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
 
b/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
index 4f05377..28efbfa 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
@@ -532,7 +532,8 @@
 "oozie-server"
   ],
   "PATCH": [
-"oozie-server"
+"oozie-server",
+"oozie-client"
   ],
   "STANDARD": [
 "oozie-client",

[11/53] [abbrv] ambari git commit: Revert "AMBARI-22572. During cluster installation bower cannot resolve angularjs version (alexantonenko)"

[aonishuk]

Revert "AMBARI-22572. During cluster installation bower cannot resolve 
angularjs version (alexantonenko)"

This reverts commit 88b59a6641a0b177f39e32c725acf04d85477c01.


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

Branch: refs/heads/branch-3.0-perf
Commit: 6613d45b7735b8b6d53eab3f450b36959c7aaee5
Parents: ddcebe2
Author: Vivek Ratnavel Subramanian 
Authored: Mon Dec 4 16:44:01 2017 -0800
Committer: Vivek Ratnavel Subramanian 
Committed: Mon Dec 4 16:44:01 2017 -0800

--
 ambari-admin/src/main/resources/ui/admin-web/bower.json | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6613d45b/ambari-admin/src/main/resources/ui/admin-web/bower.json
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/bower.json 
b/ambari-admin/src/main/resources/ui/admin-web/bower.json
index 5bbada9..c9e67f0 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/bower.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/bower.json
@@ -19,8 +19,5 @@
 "chai": "1.8.0",
 "mocha": "1.14.0",
 "sinon": "1.10.3"
-  },
-  "resolutions": {
-"angular": "1.5.11"
   }
 }

[24/53] [abbrv] ambari git commit: AMBARI-22583. Ambari should not force accounts created in IPA to be added a user named 'ambari-managed-principals' (rlevas)

[aonishuk]

AMBARI-22583. Ambari should not force accounts created in IPA to be added a 
user named 'ambari-managed-principals' (rlevas)


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

Branch: refs/heads/branch-3.0-perf
Commit: 814f5b456814ca278a02c06b5df3eba009c5caca
Parents: 9b1fde3
Author: Robert Levas 
Authored: Wed Dec 6 12:49:01 2017 -0500
Committer: Robert Levas 
Committed: Wed Dec 6 12:49:01 2017 -0500

--
 .../KERBEROS/1.10.3-10/configuration/kerberos-env.xml| 4 ++--
 .../KERBEROS/1.10.3-30/configuration/kerberos-env.xml| 4 ++--
 .../PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml| 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/814f5b45/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index 293bcf8..3b9339a 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
@@ -354,12 +354,12 @@
 
   The group in IPA user principals should be member of
 
-ambari-managed-principals
+
 
   true
   false
 
-
+
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/814f5b45/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
index 293bcf8..3b9339a 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
@@ -354,12 +354,12 @@
 
   The group in IPA user principals should be member of
 
-ambari-managed-principals
+
 
   true
   false
 
-
+
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/814f5b45/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
index a66a7a6..7250a15 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
@@ -353,11 +353,11 @@
 
   The group in IPA user principals should be member of
 
-ambari-managed-principals
+
 
   true
   false
 
-
+
   
 

[37/53] [abbrv] ambari git commit: AMBARI-22616 noplugins switch should not be used for yum repos backed by RedHat Satellite/Spacewalk (dgrinenko)

[aonishuk]

AMBARI-22616 noplugins switch should not be used for yum repos backed by RedHat 
Satellite/Spacewalk (dgrinenko)


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

Branch: refs/heads/branch-3.0-perf
Commit: 1ed7c086e4d417b47de8a2a7b80e28956cf01d47
Parents: 348bdd6
Author: Dmytro Grinenko 
Authored: Fri Dec 8 16:30:46 2017 +0200
Committer: Dmytro Grinenko 
Committed: Fri Dec 8 16:30:46 2017 +0200

--
 .../core/providers/package/yumrpm.py   | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1ed7c086/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
 
b/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
index c83a3ce..3742ff6 100644
--- 
a/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
+++ 
b/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
@@ -52,8 +52,8 @@ YUM_TR_PREFIX = "transaction-"
 
 YUM_REPO_LOCATION = "/etc/yum.repos.d"
 REPO_UPDATE_CMD = ['/usr/bin/yum', 'clean', 'metadata']
-ALL_INSTALLED_PACKAGES_CMD = [AMBARI_SUDO_BINARY, "yum", "list", "installed", 
"--noplugins"]
-ALL_AVAILABLE_PACKAGES_CMD = [AMBARI_SUDO_BINARY, "yum", "list", "available", 
"--noplugins"]
+ALL_INSTALLED_PACKAGES_CMD = [AMBARI_SUDO_BINARY, "yum", "list", "installed"]
+ALL_AVAILABLE_PACKAGES_CMD = [AMBARI_SUDO_BINARY, "yum", "list", "available"]
 VERIFY_DEPENDENCY_CMD = ['/usr/bin/yum', '-d', '0', '-e', '0', 'check', 
'dependencies']
 
 # base command output sample:
@@ -191,7 +191,14 @@ class YumProvider(RPMBasedPackageProvider):
   for line in lines[skip_index:]:
 items = items + line.strip(' \t\n\r').split()
 
-  for i in range(0, len(items), 3):
+  items_count = len(items)
+
+  for i in range(0, items_count, 3):
+
+# check if we reach the end
+if i+3 > items_count:
+  break
+
 if '.' in items[i]:
   items[i] = items[i][:items[i].rindex('.')]
 if items[i + 2].find('@') == 0:

[42/53] [abbrv] ambari git commit: AMBARI-22624 Modify display of compare of config versions, second patch. (atkach)

[aonishuk]

AMBARI-22624 Modify display of compare of config versions, second patch. 
(atkach)


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

Branch: refs/heads/branch-3.0-perf
Commit: 4be18df873a055f343c3d3cdf6355e33c090c67f
Parents: 0967264
Author: Andrii Tkach 
Authored: Mon Dec 11 17:50:21 2017 +0200
Committer: Andrii Tkach 
Committed: Mon Dec 11 17:50:21 2017 +0200

--
 ambari-web/app/styles/application.less  | 241 ---
 .../app/styles/service_configurations.less  |   6 +-
 .../configs/config_versions_control_view.js |   4 +
 3 files changed, 8 insertions(+), 243 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4be18df8/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index b8ad4ac..43fead6 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -601,247 +601,6 @@ h1 {
   }
 }
 
-#serviceConfig {
-  &.non-wizard {
-background: white;
-padding: 15px;
-  }
-  .alert{
-.glyphicon-refresh{
-  margin-left:10px;
-}
-.glyphicon-warning-sign {
-  color: @health-status-yellow;
-}
-  }
-  .collapsable {
-cursor: pointer;
-  }
-  .directories {
-min-width: 280px;
-  }
-  .panel-heading {
-cursor: pointer;
-  }
-  .panel-group {
-
-.control-label {
-  text-align: left;
-  word-wrap: break-word;
-  font-weight: 500;
-}
-.service-config-section{
-  .overridden-property{
-background-color: rgba(211, 237, 247, 0.39);
-padding: 5px;
-margin-left: -5px;
-  }
-  .checkbox {
-line-height: 0.8em;
-&.list-inline {
-  vertical-align: baseline;
-  &>.ember-checkbox{
-margin-left: -14px;
-  }
-}
-  }
-}
-.entry-row.indent-1 {
-  margin-left: 2em;
-}
-.entry-row.indent-2 {
-  margin-left: 4em;
-}
-.entry-row {
-  margin: 0;
-  .glyphicon-lock {
-color: #008000;
-  }
-  .action{
-margin-left: 3px;
-margin-right: 1px;
-font-size: 13px;
-white-space: nowrap;
-  }
-  input[type="radio"] {
-margin-right: 5px;
-margin-left: -20px;
-  }
-  .control-group {
-margin: 0;
-.overrideField {
-  display: block;
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-.overridden-hosts-view {
-  display: inline-block;
-}
-&>.ember-checkbox{
-  margin-bottom: 5px;
-}
-  }
-}
-form {
-  margin-bottom: 0;
-}
-  }
-  .badge {
-margin-left: 4px;
-  }
-
-  .master-host, .master-hosts, .slave-hosts {
-padding-top: 5px;
-line-height: 20px;
-  }
-
-  .enhanced-config-tab-content {
-.action {
-  display: inline-block;
-}
-  }
-  .common-config-category, .enhanced-config-tab-content  {
-.panel-title {
-  line-height: 16px;
-}
-.action {
-  cursor: pointer;
-}
-.a-icon(@color) {
-  color: @color;
-  margin-right: 2px;
-}
-.glyphicon-plus-sign {
-  .a-icon(@health-status-green);
-}
-.glyphicon-minus-sign {
-  .a-icon(#FF4B4B);
-}
-.icon-undo {
-  .a-icon(rgb(243, 178, 11));
-}
-.btn-final{
-  background: transparent repeat scroll 0 0 #fff;
-}
-.btn-final .glyphicon-lock{
-  color: #a6a6a6;
-  cursor: inherit;
-}
-.btn-final.active .glyphicon-lock {
-  color: blue;
-}
-.btn-final.active { //copied from Bootstrap .btn.active
-  background-color: #e6e6e6;
-  background-color: #d9d9d9 \9;
-  background-image: none;
-  outline: 0;
-  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 
0.05);
-}
-.btn-final.active[disabled] {
-  cursor: not-allowed;
-}
-a.panel-toggle:hover {
-  text-decoration: none;
-  .category-name {
-color: #337ab7;
-text-decoration: underline;
-  }
-}
-  }
-
-  .enhanced-config-tab-content
-  {
-.action-button {
-  margin-left: 3px;
-}
-  }
-
-  .capacity-scheduler {
-.header {
-  margin-bottom: 10px;
-  .col-md-1 {
-padding-top: 10px;
-font-weight: bold;
-  }
-}
-form.form-horizontal {
-  margin-left: 20px;
-  .control-label-span {
-word-wrap: break-word;
-  }
-}
-table tr, svg {
-  cursor: pointer;
-}
-

[19/53] [abbrv] ambari git commit: AMBARI-22583. Ambari should not force accounts created in IPA to be added a user named 'ambari-managed-principals' (rlevas)

[aonishuk]

AMBARI-22583. Ambari should not force accounts created in IPA to be added a 
user named 'ambari-managed-principals' (rlevas)


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

Branch: refs/heads/branch-3.0-perf
Commit: e973986e2292323e18282ce2fc6e75fdcdcb718f
Parents: 508eba0
Author: Robert Levas 
Authored: Wed Dec 6 09:20:24 2017 -0500
Committer: Robert Levas 
Committed: Wed Dec 6 09:20:29 2017 -0500

--
 .../KERBEROS/1.10.3-10/configuration/kerberos-env.xml | 3 +--
 .../KERBEROS/1.10.3-30/configuration/kerberos-env.xml | 3 +--
 .../PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e973986e/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index 293bcf8..b144b32 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
@@ -354,12 +354,11 @@
 
   The group in IPA user principals should be member of
 
-ambari-managed-principals
+
 
   true
   false
 
-
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/e973986e/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
index 293bcf8..b144b32 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
@@ -354,12 +354,11 @@
 
   The group in IPA user principals should be member of
 
-ambari-managed-principals
+
 
   true
   false
 
-
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/e973986e/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
index a66a7a6..802b96f 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
@@ -353,11 +353,10 @@
 
   The group in IPA user principals should be member of
 
-ambari-managed-principals
+
 
   true
   false
 
-
   
 

[27/53] [abbrv] ambari git commit: AMBARI-22608. Update HBASE 2.0.0.3.0 with proper pid file name for Phoenix Query Server. (Sergey Soldatov via sshridhar).

[aonishuk]

AMBARI-22608. Update HBASE 2.0.0.3.0 with proper pid file name for Phoenix 
Query Server. (Sergey Soldatov via sshridhar).


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

Branch: refs/heads/branch-3.0-perf
Commit: fcc92aaeea346ebef13a70ed0cfaa686785c6a0d
Parents: 466379c
Author: Swapan Shridhar 
Authored: Wed Dec 6 17:54:40 2017 -0800
Committer: Swapan Shridhar 
Committed: Wed Dec 6 17:54:40 2017 -0800

--
 .../HBASE/2.0.0.3.0/package/scripts/status_params.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fcc92aae/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
 
b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
index bc75c78..90669c5 100644
--- 
a/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
+++ 
b/ambari-server/src/main/resources/common-services/HBASE/2.0.0.3.0/package/scripts/status_params.py
@@ -48,7 +48,7 @@ else:
 
   hbase_master_pid_file = format("{pid_dir}/hbase-{hbase_user}-master.pid")
   regionserver_pid_file = 
format("{pid_dir}/hbase-{hbase_user}-regionserver.pid")
-  phoenix_pid_file = format("{pid_dir}/phoenix-{hbase_user}-server.pid")
+  phoenix_pid_file = format("{pid_dir}/phoenix-{hbase_user}-queryserver.pid")
 
   # Security related/required params
   hostname = config['hostname']

[33/53] [abbrv] ambari git commit: AMBARI-22595. Livy2 keytabs are not getting configured automatically in zeppelin. (prabhjyotsingh via sshridhar).

[aonishuk]

AMBARI-22595. Livy2 keytabs are not getting configured automatically in 
zeppelin. (prabhjyotsingh via sshridhar).


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

Branch: refs/heads/branch-3.0-perf
Commit: 367dd174a5b84eb1764d148da3b29c6c55c58a94
Parents: f4d2739
Author: Swapan Shridhar 
Authored: Thu Dec 7 14:02:58 2017 -0800
Committer: Swapan Shridhar 
Committed: Thu Dec 7 14:02:58 2017 -0800

--
 .../common-services/ZEPPELIN/0.7.0/package/scripts/master.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/367dd174/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index 5efc277..bb4c5b2 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -403,7 +403,7 @@ class Master(Script):
 interpreter_settings = config_data['interpreterSettings']
 for interpreter_setting in interpreter_settings:
   interpreter = interpreter_settings[interpreter_setting]
-  if interpreter['group'] == 'livy' and params.livy_livyserver_host:
+  if interpreter['group'] == 'livy':
 if params.zeppelin_kerberos_principal and 
params.zeppelin_kerberos_keytab and params.security_enabled:
   interpreter['properties']['zeppelin.livy.principal'] = 
params.zeppelin_kerberos_principal
   interpreter['properties']['zeppelin.livy.keytab'] = 
params.zeppelin_kerberos_keytab

[08/53] [abbrv] ambari git commit: AMBARI-22586 - Remove Beacon conf-select Changes Since It's Not Part of HDP (jonathanhurley)

[aonishuk]

AMBARI-22586 - Remove Beacon conf-select Changes Since It's Not Part of HDP 
(jonathanhurley)


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

Branch: refs/heads/branch-3.0-perf
Commit: 0afe0c00d797f22efc94c394de86af2bec94b448
Parents: 2e9c964
Author: Jonathan Hurley 
Authored: Mon Dec 4 12:56:12 2017 -0500
Committer: Jonathan Hurley 
Committed: Mon Dec 4 14:52:43 2017 -0500

--
 .../stacks/HDP/2.0.6/properties/stack_packages.json | 9 -
 .../resources/stacks/HDP/3.0/properties/stack_packages.json | 9 -
 2 files changed, 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0afe0c00/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
index 1783655..946686a 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
@@ -994,12 +994,6 @@
   "current_dir": "{0}/current/atlas-client/conf"
 }
   ],
-  "beacon": [
-{
-  "conf_dir": "/etc/beacon/conf",
-  "current_dir": "{0}/current/beacon-client/conf"
-}
-  ],
   "druid": [
 {
   "conf_dir": "/etc/druid/conf",
@@ -1194,9 +1188,6 @@
   "ATLAS": {
 "packages": ["atlas"]
   },
-  "BEACON": {
-"packages": ["beacon"]
-  },
   "DRUID": {
 "packages": ["druid", "superset"]
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/0afe0c00/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
 
b/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
index 4b4d0bb..4f05377 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
@@ -871,12 +871,6 @@
   "current_dir": "{0}/current/atlas-client/conf"
 }
   ],
-  "beacon": [
-{
-  "conf_dir": "/etc/beacon/conf",
-  "current_dir": "{0}/current/beacon-client/conf"
-}
-  ],
   "druid": [
 {
   "conf_dir": "/etc/druid/conf",
@@ -1071,9 +1065,6 @@
   "ATLAS": {
 "packages": ["atlas"]
   },
-  "BEACON": {
-"packages": ["beacon"]
-  },
   "DRUID": {
 "packages": ["druid", "superset"]
   },

[04/53] [abbrv] ambari git commit: AMBARI-22353. Remove properties.json And Switch To Adding Properties to ResourceProviders Dynamically (dlysnichenko)

[aonishuk]

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProvider.java
index 2a25bc4..db514de 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProvider.java
@@ -18,7 +18,6 @@
 
 package org.apache.ambari.server.controller.internal;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;
@@ -39,6 +38,9 @@ import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ServiceComponentHost;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
+
 /**
  * Resource Provider for HostComponent process resources.
  */
@@ -54,22 +56,36 @@ public class HostComponentProcessResourceProvider extends 
ReadOnlyResourceProvid
   public static final String HC_PROCESS_HOST_NAME_ID = 
"HostComponentProcess/host_name";
   public static final String HC_PROCESS_COMPONENT_NAME_ID = 
"HostComponentProcess/component_name";
 
-  // Primary Key Fields
-  private static Set pkPropertyIds =
-new HashSet<>(Arrays.asList(new String[]{
-  HC_PROCESS_CLUSTER_NAME_ID, HC_PROCESS_HOST_NAME_ID, 
HC_PROCESS_COMPONENT_NAME_ID, HC_PROCESS_NAME_ID}));
+  /**
+   * The key property ids for a HostComponentProcess resource.
+   */
+  private static Map keyPropertyIds = 
ImmutableMap.builder()
+  .put(Resource.Type.Cluster, HC_PROCESS_CLUSTER_NAME_ID)
+  .put(Resource.Type.Host, HC_PROCESS_HOST_NAME_ID)
+  .put(Resource.Type.Component, HC_PROCESS_COMPONENT_NAME_ID)
+  .put(Resource.Type.HostComponent, HC_PROCESS_COMPONENT_NAME_ID)
+  .put(Resource.Type.HostComponentProcess, HC_PROCESS_NAME_ID)
+  .build();
+
+  /**
+   * The property ids for a HostComponentProcess resource.
+   */
+  private static Set propertyIds = Sets.newHashSet(
+  HC_PROCESS_NAME_ID,
+  HC_PROCESS_STATUS_ID,
+  HC_PROCESS_CLUSTER_NAME_ID,
+  HC_PROCESS_HOST_NAME_ID,
+  HC_PROCESS_COMPONENT_NAME_ID);
 
   // - Constructors 
 
   /**
* Create a  new resource provider for the given management controller.
*
-   * @param propertyIds the property ids
-   * @param keyPropertyIds  the key property ids
+   * @param amc the management controller
*/
-  HostComponentProcessResourceProvider(Set propertyIds,
-  Map keyPropertyIds, AmbariManagementController 
amc) {
-super(propertyIds, keyPropertyIds, amc);
+  HostComponentProcessResourceProvider(AmbariManagementController amc) {
+super(Resource.Type.HostComponentProcess, propertyIds, keyPropertyIds, 
amc);
   }
 
 
@@ -77,7 +93,7 @@ public class HostComponentProcessResourceProvider extends 
ReadOnlyResourceProvid
 
   @Override
   protected Set getPKPropertyIds() {
-return pkPropertyIds;
+return new HashSet<>(keyPropertyIds.values());
   }
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
index 94766a5..cf58325 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
@@ -18,7 +18,6 @@
 package org.apache.ambari.server.controller.internal;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumMap;
@@ -69,6 +68,8 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.assistedinject.Assisted;
@@ -84,6 +85,8 @@ public class HostComponentResourceProvider extends 
AbstractControllerResourcePro
   // - Property ID constants 

[14/53] [abbrv] ambari git commit: AMBARI-22590 - Messages for some services during PU package installation indicate circular dependency (jonathanhurley)

[aonishuk]

AMBARI-22590 - Messages for some services during PU package installation 
indicate circular dependency (jonathanhurley)


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

Branch: refs/heads/branch-3.0-perf
Commit: 620543c6c20307b35bd3ff433edf5b5dfdc33599
Parents: a7ac445
Author: Jonathan Hurley 
Authored: Mon Dec 4 17:09:24 2017 -0500
Committer: Jonathan Hurley 
Committed: Tue Dec 5 11:51:05 2017 -0500

--
 .../RequiredServicesInRepositoryCheck.java  | 18 ++
 .../ClusterStackVersionResourceProvider.java| 14 ++---
 .../state/repository/VersionDefinitionXml.java  | 59 ++--
 .../RequiredServicesInRepositoryCheckTest.java  |  6 +-
 .../state/repository/VersionDefinitionTest.java | 55 ++
 5 files changed, 120 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/620543c6/ambari-server/src/main/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheck.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheck.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheck.java
index d911411..ceed53c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheck.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheck.java
@@ -18,7 +18,6 @@
 package org.apache.ambari.server.checks;
 
 import java.util.LinkedHashSet;
-import java.util.Map;
 import java.util.Set;
 
 import org.apache.ambari.server.AmbariException;
@@ -66,23 +65,18 @@ public class RequiredServicesInRepositoryCheck extends 
AbstractCheckDescriptor {
 Cluster cluster = clustersProvider.get().getCluster(clusterName);
 
 VersionDefinitionXml xml = getVersionDefinitionXml(request);
-Map missingDependencies = 
xml.getMissingDependencies(cluster);
+Set missingDependencies = xml.getMissingDependencies(cluster);
 
 if (!missingDependencies.isEmpty()) {
   String failReasonTemplate = getFailReason(prerequisiteCheck, request);
 
-  StringBuilder message = new StringBuilder();
-  for (String failedService : missingDependencies.keySet()) {
-Set servicesRequired = missingDependencies.get(failedService);
+  String message = String.format(
+  "The following services are also required to be included in this 
upgrade: %s",
+  StringUtils.join(missingDependencies, ", "));
 
-message.append(String.format(
-"%s requires the following services which are not included: %s",
-failedService, StringUtils.join(servicesRequired, 
','))).append(System.lineSeparator());
-  }
-
-  prerequisiteCheck.setFailedOn(new 
LinkedHashSet<>(missingDependencies.keySet()));
+  prerequisiteCheck.setFailedOn(new LinkedHashSet<>(missingDependencies));
   prerequisiteCheck.setStatus(PrereqCheckStatus.FAIL);
-  prerequisiteCheck.setFailReason(String.format(failReasonTemplate, 
message.toString()));
+  prerequisiteCheck.setFailReason(String.format(failReasonTemplate, 
message));
   return;
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/620543c6/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index fa13116..b590ee5 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -449,18 +449,12 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 // dependencies
 try {
   if (repoVersionEntity.getType().isPartial()) {
-Map missingDependencies = 
desiredVersionDefinition.getMissingDependencies(cluster);
+Set missingDependencies = 
desiredVersionDefinition.getMissingDependencies(cluster);
 
 if (!missingDependencies.isEmpty()) {
-  StringBuilder message = new StringBuilder(
-  "The following services are included in this repository, but the 
repository is missing 

[06/53] [abbrv] ambari git commit: AMBARI-22582 Clean up Configs page. (atkach)

[aonishuk]

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e9c9646/ambari-web/test/views/common/configs/config_history_flow_test.js
--
diff --git a/ambari-web/test/views/common/configs/config_history_flow_test.js 
b/ambari-web/test/views/common/configs/config_history_flow_test.js
deleted file mode 100644
index 8a6ab4d..000
--- a/ambari-web/test/views/common/configs/config_history_flow_test.js
+++ /dev/null
@@ -1,756 +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.
- */
-
-var App = require('app');
-require('views/common/configs/config_history_flow');
-var testHelpers = require('test/helpers');
-
-describe.skip('App.ConfigHistoryFlowView', function () {
-
-  var view = App.ConfigHistoryFlowView.create({
-controller: Em.Object.create({
-  loadSelectedVersion: Em.K,
-  loadStep: Em.K
-}),
-displayedServiceVersion: Em.Object.create(),
-serviceVersions: []
-  });
-
-  App.TestAliases.testAsComputedAlias(view, 'serviceName', 
'controller.selectedService.serviceName', 'string');
-
-  App.TestAliases.testAsComputedOr(view, 'isSaveDisabled', 
['controller.isSubmitDisabled', '!controller.versionLoaded', 
'!controller.isPropertiesChanged']);
-
-  App.TestAliases.testAsComputedGt(view, 
'displayedServiceVersion.notes.length', 100);
-
-  App.TestAliases.testAsComputedTruncate(view, 'shortNotes', 
'displayedServiceVersion.notes', 100, 100);
-
-  describe('#visibleServiceVersion', function () {
-var testCases = [
-  {
-params: {
-  startIndex: 0,
-  serviceVersions: []
-},
-result: []
-  },
-  {
-params: {
-  startIndex: 0,
-  serviceVersions: [1, 2, 3]
-},
-result: [1, 2, 3]
-  },
-  {
-params: {
-  startIndex: 0,
-  serviceVersions: [1, 2, 3, 4, 5, 6, 7]
-},
-result: [1, 2, 3, 4, 5]
-  },
-  {
-params: {
-  startIndex: 3,
-  serviceVersions: [1, 2, 3, 4, 5, 6, 7]
-},
-result: [4, 5, 6, 7]
-  }
-];
-testCases.forEach(function (test) {
-  it('start index - ' + test.params.startIndex + ', serviceVersions length 
- ' + test.params.serviceVersions.length, function () {
-view.set('serviceVersions', test.params.serviceVersions);
-view.set('startIndex', test.params.startIndex);
-view.propertyDidChange('visibleServiceVersion');
-expect(view.get('visibleServiceVersion')).to.eql(test.result);
-  });
-});
-  });
-
-  describe('#versionActionsDisabled', function () {
-it('versionLoaded is false', function () {
-  view.set('controller.versionLoaded', false);
-  expect(view.get('versionActionsDisabled')).to.be.true;
-});
-it('versionLoaded is true', function () {
-  view.set('controller.versionLoaded', true);
-  expect(view.get('versionActionsDisabled')).to.be.false;
-});
-  });
-
-  describe('#dropDownList', function () {
-var displayedServiceVersion = {version: 1};
-
-it('Only one service version is present', function () {
-  view.set('serviceVersions', [displayedServiceVersion]);
-  view.set('displayedServiceVersion', displayedServiceVersion);
-  view.propertyDidChange('dropDownList');
-  expect(view.get('dropDownList')).to.be.empty;
-});
-it('Three service version', function () {
-  view.set('serviceVersions', [displayedServiceVersion, {version: 2}, 
{version: 3}]);
-  view.set('displayedServiceVersion', displayedServiceVersion);
-  view.propertyDidChange('dropDownList');
-  expect(view.get('dropDownList')).to.eql([{version: 3}, {version: 2}]);
-});
-it('Seven service version, showFullList is false', function () {
-  view.set('serviceVersions', [
-displayedServiceVersion,
-{version: 2},
-{version: 3},
-{version: 4},
-{version: 5},
-{version: 6},
-{version: 7},
-{version: 8}
-  ]);
-  view.set('displayedServiceVersion', displayedServiceVersion);
-  view.set('showFullList', false);
-  view.propertyDidChange('dropDownList');
-  

[12/53] [abbrv] ambari git commit: Revert "AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko)"

[aonishuk]

Revert "AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko)"

This reverts commit f43277ebbe6e675c842be00ff318c966901d4a6f.


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

Branch: refs/heads/branch-3.0-perf
Commit: 1c9aa9d32804abce454c82ce4d75bfac87182b49
Parents: 6613d45
Author: Vivek Ratnavel Subramanian 
Authored: Mon Dec 4 16:44:29 2017 -0800
Committer: Vivek Ratnavel Subramanian 
Committed: Mon Dec 4 16:44:29 2017 -0800

--
 .../src/main/resources/ui/admin-web/app/scripts/app.js   | 2 +-
 .../controllers/stackVersions/StackVersionsEditCtrl.js   | 2 +-
 ambari-admin/src/main/resources/ui/admin-web/bower.json  | 8 
 ambari-admin/src/main/resources/ui/admin-web/package.json| 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9aa9d3/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
index 98b0383..225eb12 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
@@ -63,7 +63,7 @@ angular.module('ambariAdminConsole', [
 };
   }]);
 
-  $httpProvider.interceptors.push(['$rootScope', '$q', function (scope, $q) {
+  $httpProvider.responseInterceptors.push(['$rootScope', '$q', function 
(scope, $q) {
 function success(response) {
   return response;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9aa9d3/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
index a4b121c..542772e 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
@@ -36,7 +36,7 @@ angular.module('ambariAdminConsole')
   $scope.isGPLAccepted = false;
 
   $scope.isGPLRepo = function (repository) {
-return repository.Repositories.tags && 
repository.Repositories.tags.indexOf('GPL') >= 0;
+return repository.Repositories.tags.indexOf('GPL') >= 0;
   };
 
   $scope.showRepo = function (repository) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9aa9d3/ambari-admin/src/main/resources/ui/admin-web/bower.json
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/bower.json 
b/ambari-admin/src/main/resources/ui/admin-web/bower.json
index c9e67f0..c38f464 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/bower.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/bower.json
@@ -3,18 +3,18 @@
   "private": true,
   "dependencies": {
 "bootstrap": "3.3.7",
-"angular": "1.5.11",
-"angular-route": "1.5.11",
+"angular": "1.2.26",
+"angular-route": "1.2.26",
 "angular-bootstrap": "0.11.0",
 "underscore": "1.7.0",
 "restangular": "1.4.0",
 "angular-bootstrap-toggle-switch": "0.5.1",
-"angular-animate": "1.5.11",
+"angular-animate": "1.2.26",
 "angular-translate": "2.2.0",
 "font-awesome": "4.2.0"
   },
   "devDependencies": {
-"angular-mocks": "1.5.11",
+"angular-mocks": "1.2.26",
 "commonjs": "0.2.0",
 "chai": "1.8.0",
 "mocha": "1.14.0",

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c9aa9d3/ambari-admin/src/main/resources/ui/admin-web/package.json
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/package.json 
b/ambari-admin/src/main/resources/ui/admin-web/package.json
index ab117ef..b7c514c 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/package.json
+++ b/ambari-admin/src/main/resources/ui/admin-web/package.json
@@ -14,7 +14,7 @@
 "gulp-flatten": "0.0.2",
 "gulp-load-plugins": "0.5.0",
 "gulp-order": "1.1.1",
-"gulp-plumber": "1.1.0",
+"gulp-plumber": "0.6.6",
 "gulp-size": "0.3.0",
 "gulp-uglify": "0.2.1",
 "gulp-useref": "0.4.2",

[52/53] [abbrv] ambari git commit: AMBARI-22651 Unable to add/change role for user. (atkach)

[aonishuk]

AMBARI-22651 Unable to add/change role for user. (atkach)


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

Branch: refs/heads/branch-3.0-perf
Commit: dc31e516d95a6636a27d5fbadb9b5529983587c2
Parents: 31e8e55
Author: Andrii Tkach 
Authored: Thu Dec 14 12:45:09 2017 +0200
Committer: Andrii Tkach 
Committed: Thu Dec 14 12:45:24 2017 +0200

--
 .../ui/admin-web/app/views/userManagement/groupEdit.html  | 2 +-
 .../ui/admin-web/app/views/userManagement/modals/groupCreate.html | 2 +-
 .../ui/admin-web/app/views/userManagement/modals/userCreate.html  | 3 ++-
 .../resources/ui/admin-web/app/views/userManagement/userEdit.html | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dc31e516/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
index 3eca354..4688eb5 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
@@ -50,7 +50,7 @@
 
   
 
-
+
   
 {{'groups.role' | translate}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/dc31e516/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
index 7692a68..8ea1b37 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/groupCreate.html
@@ -58,7 +58,7 @@
   
 
 
-
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/dc31e516/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
index b1b5876..2e5bba6 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/modals/userCreate.html
@@ -38,6 +38,7 @@
  tooltip="{{'users.userNameTip' | translate}}"
  autocomplete="off"
  tooltip-trigger="focus"
+ tooltip-placement="top"
  class="form-control"
  ng-model="formData.userName"
  name="userName"
@@ -98,7 +99,7 @@
   
 
 
-
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/dc31e516/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
index 300046d..80e2196 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
@@ -70,7 +70,7 @@
   
 
 
-
+
   
 {{'users.role' | translate}}
 

[48/53] [abbrv] ambari git commit: AMBARI-22635. Ambari should create a dummy core-site.xml for Ranger plugins when namenode is not installed. (Vishal Suvagia via swagle)

[aonishuk]

AMBARI-22635. Ambari should create a dummy core-site.xml for Ranger plugins 
when namenode is not installed. (Vishal Suvagia via swagle)


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

Branch: refs/heads/branch-3.0-perf
Commit: a3d4c3da56eeec22e864978a7a8be39586948ff5
Parents: e46575a
Author: Siddharth Wagle 
Authored: Wed Dec 13 13:41:33 2017 -0800
Committer: Siddharth Wagle 
Committed: Wed Dec 13 13:41:33 2017 -0800

--
 .../libraries/functions/setup_ranger_plugin_xml.py  | 14 +++---
 .../package/scripts/setup_ranger_kafka.py   | 14 +++---
 .../0.8.1/package/scripts/setup_ranger_kafka.py | 15 ---
 .../0.5.0.2.2/package/scripts/setup_ranger_knox.py  | 16 
 .../0.5.0.3.0/package/scripts/setup_ranger_knox.py  | 16 
 .../0.9.1/package/scripts/setup_ranger_storm.py | 15 ---
 .../1.0.1.3.0/package/scripts/setup_ranger_storm.py | 15 ---
 7 files changed, 78 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a3d4c3da/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
index 485c1a6..78692cb 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
@@ -240,14 +240,14 @@ def setup_ranger_plugin_keystore(service_name, 
audit_db_is_enabled, stack_versio
 mode = 0640
   )
 
-def setup_core_site_for_required_plugins(component_user, component_group, 
create_core_site_path, config):
+def setup_core_site_for_required_plugins(component_user, component_group, 
create_core_site_path, configurations = {}, configuration_attributes = {}):
   XmlConfig('core-site.xml',
-conf_dir=create_core_site_path,
-configurations=config['configurations']['core-site'],
-configuration_attributes=config['configuration_attributes']['core-site'],
-owner=component_user,
-group=component_group,
-mode=0644
+conf_dir = create_core_site_path,
+configurations = configurations,
+configuration_attributes = configuration_attributes,
+owner = component_user,
+group = component_group,
+mode = 0644
   )
 
 def get_audit_configs(config):

http://git-wip-us.apache.org/repos/asf/ambari/blob/a3d4c3da/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/setup_ranger_kafka.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/setup_ranger_kafka.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/setup_ranger_kafka.py
index e9719aa..3a0b991 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/setup_ranger_kafka.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.10.0.3.0/package/scripts/setup_ranger_kafka.py
@@ -81,9 +81,17 @@ def setup_ranger_kafka():
 group = params.user_group,
 mode = 0755
   )
-if params.stack_supports_core_site_for_ranger_plugin and 
params.enable_ranger_kafka and params.has_namenode and params.security_enabled:
-  Logger.info("Stack supports core-site.xml creation for Ranger plugin, 
creating create core-site.xml from namenode configuraitions")
-  
setup_core_site_for_required_plugins(component_user=params.kafka_user,component_group=params.user_group,create_core_site_path
 = params.conf_dir, config = params.config)
+if params.stack_supports_core_site_for_ranger_plugin and 
params.enable_ranger_kafka and params.security_enabled:
+  if params.has_namenode:
+Logger.info("Stack supports core-site.xml creation for Ranger plugin 
and Namenode is installed, creating create core-site.xml from namenode 
configurations")
+setup_core_site_for_required_plugins(component_user = 
params.kafka_user, component_group = params.user_group,
+ create_core_site_path = 
params.conf_dir, configurations = params.config['configurations']['core-site'],
+ configuration_attributes = 
params.config['configuration_attributes']['core-site'])

[16/53] [abbrv] ambari git commit: AMBARI-22590 - Messages for some services during PU package installation indicate circular dependency (part2) (jonathanhurley)

[aonishuk]

AMBARI-22590 - Messages for some services during PU package installation 
indicate circular dependency (part2) (jonathanhurley)


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

Branch: refs/heads/branch-3.0-perf
Commit: 0fe2f8fa67595c27368acd0c122e04ed11870e4a
Parents: 86a99f2
Author: Jonathan Hurley 
Authored: Tue Dec 5 13:18:39 2017 -0500
Committer: Jonathan Hurley 
Committed: Tue Dec 5 13:19:37 2017 -0500

--
 .../ambari/server/state/repository/VersionDefinitionTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0fe2f8fa/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java
index 0cd2e0f..a293d3a 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/state/repository/VersionDefinitionTest.java
@@ -46,11 +46,11 @@ import org.apache.ambari.server.state.stack.RepositoryXml;
 import org.apache.ambari.server.state.stack.RepositoryXml.Os;
 import org.apache.ambari.server.state.stack.RepositoryXml.Repo;
 import org.apache.commons.io.FileUtils;
-import org.apache.hadoop.metrics2.sink.relocated.google.common.collect.Sets;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 
 /**
  * Tests for repository definitions.

[35/53] [abbrv] ambari git commit: AMBARI-22609. Install wizard stacks on select version step (alexantonenko)

[aonishuk]

AMBARI-22609. Install wizard stacks on select version step (alexantonenko)


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

Branch: refs/heads/branch-3.0-perf
Commit: ed327bd53eb140789b548044ebd207b3c47ccf3b
Parents: 2b285da
Author: Alex Antonenko 
Authored: Fri Dec 8 14:37:44 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Dec 8 14:37:44 2017 +0300

--
 ambari-web/app/models/repository.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ed327bd5/ambari-web/app/models/repository.js
--
diff --git a/ambari-web/app/models/repository.js 
b/ambari-web/app/models/repository.js
index d85c55d..58314cf 100644
--- a/ambari-web/app/models/repository.js
+++ b/ambari-web/app/models/repository.js
@@ -71,7 +71,8 @@ App.Repository = DS.Model.extend({
* @type {boolean}
*/
   isGPL: function () {
-return this.get('tags').contains('GPL');
+var tags = this.get('tags');
+return tags && tags.contains('GPL');
   }.property('tags'),
 
   /**

[46/53] [abbrv] ambari git commit: AMBARI-22628 - YARN Shuffle Service Can't Be Found On Client-Only Nodes After New Cluster Install (jonathanhurley)

[aonishuk]

AMBARI-22628 - YARN Shuffle Service Can't Be Found On Client-Only Nodes After 
New Cluster Install (jonathanhurley)


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

Branch: refs/heads/branch-3.0-perf
Commit: a928a9cd8f0c995e0aa5b9bc52c6b975d7f87edb
Parents: 8e23fa2
Author: Jonathan Hurley 
Authored: Mon Dec 11 09:03:09 2017 -0500
Committer: Jonathan Hurley 
Committed: Wed Dec 13 13:26:56 2017 -0500

--
 .../ambari/server/agent/ExecutionCommand.java   | 37 ++--
 .../internal/ClientConfigResourceProvider.java  |  2 +
 .../org/apache/ambari/server/state/Cluster.java |  9 
 .../server/state/cluster/ClusterImpl.java   | 31 +
 .../2.1.0.2.0/package/scripts/params_linux.py   | 41 +++--
 .../3.0.0.3.0/package/scripts/params_linux.py   | 41 +++--
 .../ExecutionCommandWrapperTest.java|  5 +++
 .../AmbariCustomCommandExecutionHelperTest.java | 46 
 .../apache/ambari/server/orm/OrmTestHelper.java |  3 ++
 9 files changed, 183 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a928a9cd/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
index 5ee4bf6..9093985 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java
@@ -29,8 +29,6 @@ import org.apache.ambari.annotations.ExperimentalFeature;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.RoleCommand;
 import org.apache.ambari.server.state.Cluster;
-import org.apache.ambari.server.state.Service;
-import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.UpgradeContext.UpgradeSummary;
 import org.apache.ambari.server.utils.StageUtils;
 import org.slf4j.Logger;
@@ -553,30 +551,21 @@ public class ExecutionCommand extends AgentCommand {
   }
 
   /**
-   * Used to set a map of {service -> { component -> version}}.  This is 
necessary when performing
-   * an upgrade to correct build paths of required binaries.
-   * @param cluster the cluster from which to build the map
+   * Used to set a map of {service -> { component -> version}}. This is
+   * necessary when performing an upgrade to correct build paths of required
+   * binaries. This method will only set the version information for a 
component
+   * if:
+   * 
+   * The component advertises a version
+   * The repository for the component has been resolved and the version can
+   * be trusted
+   * 
+   *
+   * @param cluster
+   *  the cluster from which to build the map
*/
   public void setComponentVersions(Cluster cluster) throws AmbariException {
-Map> componentVersionMap = new HashMap<>();
-
-for (Service service : cluster.getServices().values()) {
-  Map componentMap = new HashMap<>();
-
-  boolean shouldSet = false;
-  for (ServiceComponent component : 
service.getServiceComponents().values()) {
-if (component.isVersionAdvertised()) {
-  shouldSet = true;
-  componentMap.put(component.getName(), component.getDesiredVersion());
-}
-  }
-
-  if (shouldSet) {
-componentVersionMap.put(service.getName(), componentMap);
-  }
-}
-
-this.componentVersionMap = componentVersionMap;
+componentVersionMap = cluster.getComponentVersionMap();
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/a928a9cd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 75f47ca..dcafdea 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -458,6 +458,8 @@ public class ClientConfigResourceProvider extends 
AbstractControllerResourceProv
 

[02/53] [abbrv] ambari git commit: AMBARI-22353. Remove properties.json And Switch To Adding Properties to ResourceProviders Dynamically (dlysnichenko)

[aonishuk]

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/main/resources/properties.json
--
diff --git a/ambari-server/src/main/resources/properties.json 
b/ambari-server/src/main/resources/properties.json
deleted file mode 100644
index 1d12f83..000
--- a/ambari-server/src/main/resources/properties.json
+++ /dev/null
@@ -1,487 +0,0 @@
-{
-"Cluster":[
-"Clusters/cluster_id",
-"Clusters/cluster_name",
-"Clusters/provisioning_state",
-"Clusters/security_type",
-"Clusters/version",
-"Clusters/state",
-"Clusters/desired_configs",
-"Clusters/desired_service_config_versions",
-"Clusters/total_hosts",
-"Clusters/health_report",
-"_"
-],
-"Host":[
-"Hosts/cluster_name",
-"Hosts/host_name",
-"Hosts/ip",
-"Hosts/attributes",
-"Hosts/total_mem",
-"Hosts/cpu_count",
-"Hosts/ph_cpu_count",
-"Hosts/os_arch",
-"Hosts/os_type",
-"Hosts/os_family",
-"Hosts/rack_info",
-"Hosts/last_heartbeat_time",
-"Hosts/last_agent_env",
-"Hosts/last_registration_time",
-"Hosts/disk_info",
-"Hosts/host_status",
-"Hosts/host_health_report",
-"Hosts/public_host_name",
-"Hosts/host_state",
-"Hosts/maintenance_state",
-"Hosts/desired_configs",
-"Hosts/recovery_report",
-"Hosts/recovery_summary",
-"_"
-],
-"HostComponent":[
-"HostRoles/role_id",
-"HostRoles/cluster_name",
-"HostRoles/host_name",
-"HostRoles/public_host_name",
-"HostRoles/component_name",
-"HostRoles/display_name",
-"HostRoles/state",
-"HostRoles/desired_state",
-"HostRoles/version",
-"HostRoles/desired_stack_id",
-"HostRoles/desired_repository_version",
-"HostRoles/actual_configs",
-"params/run_smoke_test",
-"HostRoles/stale_configs",
-"HostRoles/reload_configs",
-"HostRoles/desired_admin_state",
-"HostRoles/maintenance_state",
-"HostRoles/service_name",
-"HostRoles/upgrade_state",
-"_"
-],
-"ConfigGroup": [
-"ConfigGroup/id",
-"ConfigGroup/cluster_name",
-"ConfigGroup/group_name",
-"ConfigGroup/service_name",
-"ConfigGroup/tag",
-"ConfigGroup/description",
-"ConfigGroup/hosts",
-"ConfigGroup/desired_configs"
-],
-"Action":[
-"Actions/action_name",
-"Actions/action_type",
-"Actions/inputs",
-"Actions/target_service",
-"Actions/target_component",
-"Actions/description",
-"Actions/target_type",
-"Actions/default_timeout",
-"_"
-],
-"Request":[
-"Requests/id",
-"Requests/cluster_name",
-"Requests/request_status",
-"Requests/request_context",
-"Requests/request_schedule",
-"Requests/type",
-"Requests/inputs",
-"Requests/resource_filters",
-"Requests/operation_level",
-"Requests/create_time",
-"Requests/start_time",
-"Requests/end_time",
-"Requests/exclusive",
-"Requests/task_count",
-"Requests/failed_task_count",
-"Requests/aborted_task_count",
-"Requests/timed_out_task_count",
-"Requests/completed_task_count",
-"Requests/queued_task_count",
-"Requests/progress_percent",
-"Requests/abort_reason",
-"Requests/remove_pending_host_requests",
-"Requests/pending_host_request_count",
-"Requests/cluster_host_info",
-"_"
-],
-"RequestSchedule" : [
-"RequestSchedule/id",
-"RequestSchedule/cluster_name",
-"RequestSchedule/description",
-"RequestSchedule/status",
-"RequestSchedule/last_execution_status",
-"RequestSchedule/batch",
-"RequestSchedule/schedule",
-"_"
-],
-"Task":[
-"Tasks/id",
-"Tasks/request_id",
-"Tasks/cluster_name",
-"Tasks/stage_id",
-"Tasks/host_name",
-"Tasks/role",
-"Tasks/command",
-"Tasks/status",
-"Tasks/exit_code",
-"Tasks/stderr",
-"Tasks/stdout",
-"Tasks/output_log",
-"Tasks/error_log",
-"Tasks/start_time",
-"Tasks/end_time",
-"Tasks/structured_out",
-"Tasks/attempt_cnt",
-"Tasks/custom_command_name",
-"Tasks/command_detail",
-"Tasks/ops_display_name",
-"_"
-],
-"User":[
-"Users/user_name",
-"Users/password",
-"Users/old_password",
-"Users/ldap_user",
-"Users/user_type",
-"Users/active",
-"Users/groups",
-"Users/admin",
-"_"
-],
-"Group":[
-  

[31/53] [abbrv] ambari git commit: AMBARI-22610 Log Search UI: fixes for search box autocomplete. (ababiichuk)

[aonishuk]

AMBARI-22610 Log Search UI: fixes for search box autocomplete. (ababiichuk)


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

Branch: refs/heads/branch-3.0-perf
Commit: 862b7d7b17e8e2ad165f548c4f9c328dd9151607
Parents: a9c3bf5
Author: ababiichuk 
Authored: Thu Dec 7 15:23:30 2017 +0200
Committer: ababiichuk 
Committed: Thu Dec 7 19:21:59 2017 +0200

--
 .../ambari-logsearch-web/package.json   |   3 +-
 .../ambari-logsearch-web/src/app/app.module.ts  |   8 +-
 .../src/app/classes/filtering.ts|   2 +-
 .../dropdown-list/dropdown-list.component.less  |  24 ++-
 .../filters-panel/filters-panel.component.html  |   5 +-
 .../filters-panel/filters-panel.component.ts|  23 +-
 .../src/app/components/mixins.less  |  17 +-
 .../search-box/search-box.component.html|  28 ++-
 .../search-box/search-box.component.less|  30 +--
 .../search-box/search-box.component.spec.ts |  79 +++
 .../search-box/search-box.component.ts  | 214 ++-
 .../app/services/component-actions.service.ts   |   9 +-
 .../src/app/services/logs-container.service.ts  |  22 --
 ambari-logsearch/ambari-logsearch-web/yarn.lock |   6 +-
 14 files changed, 259 insertions(+), 211 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/862b7d7b/ambari-logsearch/ambari-logsearch-web/package.json
--
diff --git a/ambari-logsearch/ambari-logsearch-web/package.json 
b/ambari-logsearch/ambari-logsearch-web/package.json
index 2c6aa8d..b9ee179 100644
--- a/ambari-logsearch/ambari-logsearch-web/package.json
+++ b/ambari-logsearch/ambari-logsearch-web/package.json
@@ -34,8 +34,7 @@
 "jquery": "^1.12.4",
 "moment": "^2.18.1",
 "moment-timezone": "^0.5.13",
-"ng2-auto-complete": "^0.12.0",
-"ngx-bootstrap": "^1.6.6",
+"ngx-bootstrap": "^1.9.3",
 "rxjs": "^5.4.3",
 "zone.js": "^0.8.4"
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/862b7d7b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
--
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts 
b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
index 5e43582..b76de20 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
@@ -21,13 +21,12 @@ import {NgModule, CUSTOM_ELEMENTS_SCHEMA, Injector} from 
'@angular/core';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {HttpModule, Http, XHRBackend, BrowserXhr, ResponseOptions, 
XSRFStrategy} from '@angular/http';
 import {InMemoryBackendService} from 'angular-in-memory-web-api';
-import {AlertModule} from 'ngx-bootstrap';
+import {TypeaheadModule} from 'ngx-bootstrap';
 import {TranslateModule, TranslateLoader} from '@ngx-translate/core';
 import {TranslateHttpLoader} from '@ngx-translate/http-loader';
 import {StoreModule} from '@ngrx/store';
 import {MomentModule} from 'angular2-moment';
 import {MomentTimezoneModule} from 'angular-moment-timezone';
-import {Ng2AutoCompleteModule} from 'ng2-auto-complete';
 
 import {environment} from '@envs/environment';
 
@@ -150,7 +149,7 @@ export function getXHRBackend(injector: Injector, browser: 
BrowserXhr, xsrf: XSR
 FormsModule,
 ReactiveFormsModule,
 HttpModule,
-AlertModule.forRoot(),
+TypeaheadModule.forRoot(),
 TranslateModule.forRoot({
   loader: {
 provide: TranslateLoader,
@@ -160,8 +159,7 @@ export function getXHRBackend(injector: Injector, browser: 
BrowserXhr, xsrf: XSR
 }),
 StoreModule.provideStore(reducer),
 MomentModule,
-MomentTimezoneModule,
-Ng2AutoCompleteModule
+MomentTimezoneModule
   ],
   providers: [
 HttpClientService,

http://git-wip-us.apache.org/repos/asf/ambari/blob/862b7d7b/ambari-logsearch/ambari-logsearch-web/src/app/classes/filtering.ts
--
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/classes/filtering.ts 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/filtering.ts
index d92dd41..3348969 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/classes/filtering.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/classes/filtering.ts
@@ -65,6 +65,6 @@ export interface SearchBoxParameterProcessed extends 
SearchBoxParameter {
 }
 
 export interface SearchBoxParameterTriggered {
-  value: string;
+  item: ListItem;
   

[44/53] [abbrv] ambari git commit: AMBARI-22626. Zeppelin Interpreter settings are getting updated after zeppelin restart. (Prabhjyot Singh via yusaku)

[aonishuk]

AMBARI-22626. Zeppelin Interpreter settings are getting updated after zeppelin 
restart. (Prabhjyot Singh via yusaku)


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

Branch: refs/heads/branch-3.0-perf
Commit: 8e90d59c0852ad89391577207989c0f186265701
Parents: 636a2a9
Author: Yusaku Sako 
Authored: Tue Dec 12 08:15:08 2017 -0800
Committer: Yusaku Sako 
Committed: Tue Dec 12 08:15:08 2017 -0800

--
 .../scripts/interpreter_json_template.py| 152 +++
 .../package/scripts/livy2_config_template.py| 112 --
 .../ZEPPELIN/0.7.0/package/scripts/master.py|  22 ---
 .../package/scripts/spark2_config_template.py   |  84 --
 .../2.6/ZEPPELIN/interpreter_json_generated.py  |   2 +-
 5 files changed, 153 insertions(+), 219 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e90d59c/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
index 713db23..b373e22 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
@@ -128,6 +128,68 @@ template = '''
 "isUserImpersonate": false
   }
 },
+"2C4U48MY3_spark2": {
+  "id": "2C4U48MY3_spark2",
+  "name": "spark2",
+  "group": "spark",
+  "properties": {
+"spark.executor.memory": "",
+"args": "",
+"zeppelin.spark.printREPLOutput": "true",
+"spark.cores.max": "",
+"zeppelin.dep.additionalRemoteRepository": 
"spark-packages,http://dl.bintray.com/spark-packages/maven,false;;,
+"zeppelin.spark.importImplicit": "true",
+"zeppelin.spark.sql.stacktrace": "false",
+"zeppelin.spark.concurrentSQL": "false",
+"zeppelin.spark.useHiveContext": "true",
+"zeppelin.pyspark.python": "python",
+"zeppelin.dep.localrepo": "local-repo",
+"zeppelin.R.knitr": "true",
+"zeppelin.spark.maxResult": "1000",
+"master": "local[*]",
+"spark.app.name": "Zeppelin",
+"zeppelin.R.image.width": "100%",
+"zeppelin.R.render.options": "out.format \u003d \u0027html\u0027, 
comment \u003d NA, echo \u003d FALSE, results \u003d \u0027asis\u0027, message 
\u003d F, warning \u003d F",
+"zeppelin.R.cmd": "R"
+  },
+  "status": "READY",
+  "interpreterGroup": [
+{
+  "name": "spark",
+  "class": "org.apache.zeppelin.spark.SparkInterpreter",
+  "defaultInterpreter": true
+},
+{
+  "name": "sql",
+  "class": "org.apache.zeppelin.spark.SparkSqlInterpreter",
+  "defaultInterpreter": false
+},
+{
+  "name": "dep",
+  "class": "org.apache.zeppelin.spark.DepInterpreter",
+  "defaultInterpreter": false
+},
+{
+  "name": "pyspark",
+  "class": "org.apache.zeppelin.spark.PySparkInterpreter",
+  "defaultInterpreter": false
+},
+{
+  "name": "r",
+  "class": "org.apache.zeppelin.spark.SparkRInterpreter",
+  "defaultInterpreter": false
+}
+  ],
+  "dependencies": [],
+  "option": {
+"remote": true,
+"port": -1,
+"perNoteSession": false,
+"perNoteProcess": false,
+"isExistingProcess": false,
+"setPermission": false
+  }
+},
 "2CK8A9MEG": {
   "id": "2CK8A9MEG",
   "name": "jdbc",
@@ -259,6 +321,96 @@ template = '''
 "isUserImpersonate": false
   }
 },
+"2C8A4SZ9T_livy2": {
+  "id": "2C8A4SZ9T_livy2",
+  "status": "READY",
+  "group": "livy",
+  "name": "livy2",
+  "properties": {
+"zeppelin.livy.keytab": "",
+"zeppelin.livy.spark.sql.maxResult": "1000",
+"livy.spark.executor.instances": "",
+"livy.spark.executor.memory": "",
+"livy.spark.dynamicAllocation.enabled": "",
+"livy.spark.dynamicAllocation.cachedExecutorIdleTimeout": "",
+"livy.spark.dynamicAllocation.initialExecutors": "",
+"zeppelin.livy.session.create_timeout": "120",
+"livy.spark.driver.memory": "",
+

[41/53] [abbrv] ambari git commit: AMBARI-22622. NFSGateway start failing with error : "ERROR: You must be a privileged user in order to run a secure service." (aonishuk)

[aonishuk]

AMBARI-22622. NFSGateway start failing with error : "ERROR: You must be a 
privileged user in order to run a secure service." (aonishuk)


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

Branch: refs/heads/branch-3.0-perf
Commit: 096726416556baedbc53f74ee60ea2056df90380
Parents: 45f2a6e
Author: Andrew Onishuk 
Authored: Mon Dec 11 16:15:01 2017 +0200
Committer: Andrew Onishuk 
Committed: Mon Dec 11 16:15:01 2017 +0200

--
 .../HDFS/3.0.0.3.0/package/scripts/status_params.py| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09672641/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/status_params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/status_params.py
 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/status_params.py
index 153f9a6..437ac92 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/status_params.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/status_params.py
@@ -42,7 +42,7 @@ else:
   snamenode_pid_file = 
format("{hadoop_pid_dir}/hadoop-{hdfs_user}-secondarynamenode.pid")
   journalnode_pid_file = 
format("{hadoop_pid_dir}/hadoop-{hdfs_user}-journalnode.pid")
   zkfc_pid_file = format("{hadoop_pid_dir}/hadoop-{hdfs_user}-zkfc.pid")
-  nfsgateway_pid_file = 
format("{hadoop_pid_dir_prefix}/root/hadoop_privileged_nfs3.pid")
+  nfsgateway_pid_file = 
format("{hadoop_pid_dir_prefix}/privileged-root-nfs3.pid")
 
   # Security related/required params
   hostname = config['hostname']

[23/53] [abbrv] ambari git commit: Revert "AMBARI-22583. Ambari should not force accounts created in IPA to be added a user named 'ambari-managed-principals' (rlevas)"

[aonishuk]

Revert "AMBARI-22583. Ambari should not force accounts created in IPA to be 
added a user named 'ambari-managed-principals' (rlevas)"

This reverts commit e973986e2292323e18282ce2fc6e75fdcdcb718f.


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

Branch: refs/heads/branch-3.0-perf
Commit: 9b1fde342378c91859bc60bb442b6f5ae682bec4
Parents: 76c4fa1
Author: Robert Levas 
Authored: Wed Dec 6 12:46:30 2017 -0500
Committer: Robert Levas 
Committed: Wed Dec 6 12:46:30 2017 -0500

--
 .../KERBEROS/1.10.3-10/configuration/kerberos-env.xml | 3 ++-
 .../KERBEROS/1.10.3-30/configuration/kerberos-env.xml | 3 ++-
 .../PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b1fde34/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index b144b32..293bcf8 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
@@ -354,11 +354,12 @@
 
   The group in IPA user principals should be member of
 
-
+ambari-managed-principals
 
   true
   false
 
+
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b1fde34/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
index b144b32..293bcf8 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
@@ -354,11 +354,12 @@
 
   The group in IPA user principals should be member of
 
-
+ambari-managed-principals
 
   true
   false
 
+
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b1fde34/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
index 802b96f..a66a7a6 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
@@ -353,10 +353,11 @@
 
   The group in IPA user principals should be member of
 
-
+ambari-managed-principals
 
   true
   false
 
+
   
 

[18/53] [abbrv] ambari git commit: AMBARI-22598 - Pig service check failed after PU with LzoCodec CNF (jonathanhurley)

[aonishuk]

AMBARI-22598 - Pig service check failed after PU with LzoCodec CNF 
(jonathanhurley)


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

Branch: refs/heads/branch-3.0-perf
Commit: 508eba0c62aa42cea5bcc660a4661ff373a5af91
Parents: 97ceed0
Author: Jonathan Hurley 
Authored: Tue Dec 5 13:30:55 2017 -0500
Committer: Jonathan Hurley 
Committed: Wed Dec 6 08:59:14 2017 -0500

--
 .../MAHOUT/1.0.0.2.3/package/scripts/mahout.py  | 12 +++---
 .../PIG/0.12.0.2.0/package/scripts/pig.py   | 16 +
 .../PIG/0.16.1.3.0/package/scripts/pig.py   | 16 +
 .../SPARK/1.2.1/package/scripts/setup_spark.py  | 20 
 .../SPARK/2.2.0/package/scripts/setup_spark.py  | 25 ++--
 .../SPARK2/2.0.0/package/scripts/setup_spark.py | 22 -
 6 files changed, 65 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/508eba0c/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py
 
b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py
index 68d6844..d2df928 100644
--- 
a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py
+++ 
b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/package/scripts/mahout.py
@@ -20,14 +20,20 @@ Ambari Agent
 """
 import os
 
-from resource_management.core.resources.system import Directory, File
-from resource_management.libraries.resources.xml_config import XmlConfig
-from resource_management.libraries.functions.format import format
+from resource_management.core.resources import Directory
+from resource_management.core.resources import File
+from resource_management.libraries.functions import format
 from resource_management.libraries.functions import is_empty
+from resource_management.libraries.functions import lzo_utils
+from resource_management.libraries.resources import XmlConfig
+
 
 def mahout():
   import params
 
+  # ensure that matching LZO libraries are installed for Mahout
+  lzo_utils.install_lzo_if_needed()
+
   Directory( params.mahout_conf_dir,
  create_parents = True,
  owner = params.mahout_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/508eba0c/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py
 
b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py
index b6825d5..1378fdc 100644
--- 
a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py
+++ 
b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/package/scripts/pig.py
@@ -19,16 +19,22 @@ Ambari Agent
 
 """
 import os
-from resource_management.core.resources.system import Directory, File
-from resource_management.core.source import InlineTemplate
-from resource_management.libraries.functions.format import format
 from ambari_commons import OSConst
 from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
 
+from resource_management.core.resources import Directory
+from resource_management.core.resources import File
+from resource_management.core.source import InlineTemplate
+from resource_management.libraries.functions import format
+from resource_management.libraries.functions import lzo_utils
+
 @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
 def pig():
   import params
 
+  # ensure that matching LZO libraries are installed for Pig
+  lzo_utils.install_lzo_if_needed()
+
   Directory( params.pig_conf_dir,
 create_parents = True,
 owner = params.hdfs_user,
@@ -49,7 +55,7 @@ def pig():
   content=params.pig_properties
   )
 
-  if (params.log4j_props != None):
+  if (params.log4j_props is not None):
 File(format("{params.pig_conf_dir}/log4j.properties"),
   mode=0644,
   group=params.user_group,
@@ -72,7 +78,7 @@ def pig():
content=params.pig_properties
   )
 
-  if (params.log4j_props != None):
+  if (params.log4j_props is not None):
 File(os.path.join(params.pig_conf_dir, "log4j.properties"),
  mode='f',
  owner=params.pig_user,

[25/53] [abbrv] ambari git commit: AMBARI-22492. A bad WebHDFS request is issued when starting Hive Metastore (amagyar)

[aonishuk]

AMBARI-22492. A bad WebHDFS request is issued when starting Hive Metastore 
(amagyar)


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

Branch: refs/heads/branch-3.0-perf
Commit: 420385362200f3f5f714db50a20d3af727767513
Parents: 814f5b4
Author: Attila Magyar 
Authored: Wed Dec 6 22:15:12 2017 +0100
Committer: Attila Magyar 
Committed: Wed Dec 6 22:15:49 2017 +0100

--
 .../libraries/providers/hdfs_resource.py  |  2 ++
 .../HIVE/0.12.0.2.0/package/scripts/hive.py   |  6 +++---
 .../HIVE/2.1.0.3.0/package/scripts/hive.py| 10 +-
 3 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/42038536/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
 
b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
index 0c45719..0028e84 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
@@ -204,6 +204,8 @@ class WebHDFSUtil:
 depending on if query was successful or not, we can assert this for them
 """
 target = HdfsResourceProvider.parse_path(target)
+if not target:
+  raise Fail("Target cannot be empty")
 
 url = format("{address}/webhdfs/v1{target}?op={operation}", 
address=self.address)
 request_args = kwargs

http://git-wip-us.apache.org/repos/asf/ambari/blob/42038536/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index d9cc55f..2d5d703 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -249,7 +249,7 @@ def setup_hiveserver2():
  group=params.hdfs_user,
  mode=0777) # Hive expects this dir to be writeable by 
everyone as it is used as a temp dir
 
-  if params.hive_repl_cmrootdir is not None:
+  if params.hive_repl_cmrootdir:
 params.HdfsResource(params.hive_repl_cmrootdir,
 type = "directory",
 action = "create_on_execute",
@@ -328,7 +328,7 @@ def setup_metastore():
  create_parents = True,
  mode=0777)
 
-  if params.hive_repl_cmrootdir is not None:
+  if params.hive_repl_cmrootdir:
 params.HdfsResource(params.hive_repl_cmrootdir,
 type = "directory",
 action = "create_on_execute",
@@ -342,7 +342,7 @@ def setup_metastore():
 owner = params.hive_user,
 group=params.user_group,
 mode = 0700)
-  if params.hive_repl_cmrootdir is not None or params.hive_repl_rootdir is not 
None:
+  if params.hive_repl_cmrootdir or params.hive_repl_rootdir:
 params.HdfsResource(None, action="execute")
 
 def create_metastore_schema():

http://git-wip-us.apache.org/repos/asf/ambari/blob/42038536/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive.py
index 1724bae..0819f12 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/hive.py
@@ -248,14 +248,14 @@ def setup_hiveserver2():
  group=params.hdfs_user,
  mode=0777) # Hive expects this dir to be writeable by 
everyone as it is used as a temp dir
 
-  if params.hive_repl_cmrootdir is not None:
+  if params.hive_repl_cmrootdir:
 params.HdfsResource(params.hive_repl_cmrootdir,
 type = "directory",
 action = "create_on_execute",
 owner = 

[51/53] [abbrv] ambari git commit: AMBARI-22639. Log Feeder refactor: integrate with spring boot (oleewere)

[aonishuk]

AMBARI-22639. Log Feeder refactor: integrate with spring boot (oleewere)


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

Branch: refs/heads/branch-3.0-perf
Commit: 31e8e55a900e0dd4915810302da22991e7cc54e4
Parents: a3d4c3d
Author: Oliver Szabo 
Authored: Tue Dec 12 22:34:09 2017 +0100
Committer: Oliver Szabo 
Committed: Wed Dec 13 22:44:51 2017 +0100

--
 .../config/api/LogSearchConfigFactory.java  |  49 +-
 .../config/api/LogSearchConfigLogFeeder.java|   3 +-
 .../ambari-logsearch-logfeeder/.gitignore   |   1 +
 .../ambari-logsearch-logfeeder/pom.xml  |  62 ++-
 .../org/apache/ambari/logfeeder/LogFeeder.java  | 167 +--
 .../ambari/logfeeder/LogFeederCommandLine.java  |  28 +-
 .../ambari/logfeeder/common/ConfigHandler.java  |  47 +-
 .../ambari/logfeeder/common/ConfigItem.java |   8 +-
 .../logfeeder/common/LogEntryParseTester.java   |   3 +-
 .../logfeeder/common/LogFeederConstants.java|  50 ++
 .../logfeeder/conf/ApplicationConfig.java   | 107 
 .../logfeeder/conf/InputSimulateConfig.java | 154 ++
 .../logfeeder/conf/LogEntryCacheConfig.java | 118 +
 .../ambari/logfeeder/conf/LogFeederProps.java   | 226 +
 .../logfeeder/conf/LogFeederSecurityConfig.java | 189 +++
 .../logfeeder/conf/MetricsCollectorConfig.java  | 113 +
 .../apache/ambari/logfeeder/filter/Filter.java  |   7 +-
 .../ambari/logfeeder/filter/FilterGrok.java |   7 +-
 .../ambari/logfeeder/filter/FilterKeyValue.java |   5 +-
 .../logfeeder/input/AbstractInputFile.java  |  11 +-
 .../apache/ambari/logfeeder/input/Input.java|  25 +-
 .../logfeeder/input/InputConfigUploader.java|  82 +--
 .../ambari/logfeeder/input/InputManager.java|  28 +-
 .../ambari/logfeeder/input/InputSimulate.java   |  44 +-
 .../logfeeder/loglevelfilter/FilterLogData.java |  73 ---
 .../loglevelfilter/LogLevelFilterHandler.java   |  89 +++-
 .../logfeeder/metrics/LogFeederAMSClient.java   |  22 +-
 .../logfeeder/metrics/MetricsManager.java   |  16 +-
 .../ambari/logfeeder/metrics/StatsLogger.java   |  83 
 .../ambari/logfeeder/output/OutputFile.java |   5 +-
 .../ambari/logfeeder/output/OutputHDFSFile.java |   8 +-
 .../ambari/logfeeder/output/OutputKafka.java|   5 +-
 .../ambari/logfeeder/output/OutputManager.java  |  36 +-
 .../ambari/logfeeder/output/OutputS3File.java   |   8 +-
 .../ambari/logfeeder/output/OutputSolr.java |  10 +-
 .../logfeeder/util/LogFeederPropertiesUtil.java | 498 ---
 .../apache/ambari/logfeeder/util/SSLUtil.java   | 134 -
 .../shipper-conf/input.config-sample.json   |   2 +-
 .../src/main/resources/log4j.xml|  15 +-
 .../src/main/resources/logfeeder.properties |  18 +-
 .../ambari/logfeeder/filter/FilterGrokTest.java |   3 +-
 .../ambari/logfeeder/filter/FilterJSONTest.java |   3 +-
 .../logfeeder/filter/FilterKeyValueTest.java|   3 +-
 .../ambari/logfeeder/input/InputFileTest.java   |  11 +-
 .../logfeeder/input/InputManagerTest.java   |  12 +-
 .../logconfig/LogConfigHandlerTest.java | 148 --
 .../logfeeder/metrics/MetricsManagerTest.java   |   7 -
 .../logfeeder/output/OutputKafkaTest.java   |   7 +-
 .../logfeeder/output/OutputManagerTest.java |  32 +-
 .../logfeeder/output/OutputS3FileTest.java  |   9 +-
 .../ambari/logfeeder/output/OutputSolrTest.java |  10 +-
 51 files changed, 1542 insertions(+), 1259 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/31e8e55a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java
 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java
index a84a97b..c74fad3 100644
--- 
a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java
+++ 
b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactory.java
@@ -37,12 +37,13 @@ public class LogSearchConfigFactory {
* @param properties The properties of the component for which the 
configuration is created. If the properties contain the
*  "logsearch.config.class" entry than the class defined 
there would be used instead of the default class.
* @param defaultClass The 

[22/53] [abbrv] ambari git commit: Revert "AMBARI-22583. Ambari should not force accounts created in IPA to be added a user named 'ambari-managed-principals' [amended] (rlevas)"

[aonishuk]

Revert "AMBARI-22583. Ambari should not force accounts created in IPA to be 
added a user named 'ambari-managed-principals' [amended] (rlevas)"

This reverts commit 9f93a0186c54d66d6da28edf1eeae4a554f8d28d.


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

Branch: refs/heads/branch-3.0-perf
Commit: 76c4fa1cabfb1b68d9cfe1599b874bf764130957
Parents: 9f93a01
Author: Robert Levas 
Authored: Wed Dec 6 12:46:06 2017 -0500
Committer: Robert Levas 
Committed: Wed Dec 6 12:46:06 2017 -0500

--
 .../KERBEROS/1.10.3-10/configuration/kerberos-env.xml   | 1 -
 .../KERBEROS/1.10.3-30/configuration/kerberos-env.xml   | 1 -
 .../PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml   | 1 -
 3 files changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/76c4fa1c/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index 3b9339a..b144b32 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
@@ -359,7 +359,6 @@
   true
   false
 
-
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/76c4fa1c/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
index 3b9339a..b144b32 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
@@ -359,7 +359,6 @@
   true
   false
 
-
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/76c4fa1c/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
index 7250a15..802b96f 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
@@ -358,6 +358,5 @@
   true
   false
 
-
   
 

[03/53] [abbrv] ambari git commit: AMBARI-22353. Remove properties.json And Switch To Adding Properties to ResourceProviders Dynamically (dlysnichenko)

[aonishuk]

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java
index ead4f6d..59b42f1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java
@@ -18,7 +18,6 @@
 
 package org.apache.ambari.server.controller.internal;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
@@ -40,18 +39,29 @@ import 
org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
+
 public class StackResourceProvider extends ReadOnlyResourceProvider {
 
   public static final String STACK_NAME_PROPERTY_ID = PropertyHelper
   .getPropertyId("Stacks", "stack_name");
 
-  private static Set pkPropertyIds = new HashSet<>(
-Arrays.asList(new String[]{STACK_NAME_PROPERTY_ID}));
-
-  protected StackResourceProvider(Set propertyIds,
-  Map keyPropertyIds,
-  AmbariManagementController managementController) {
-super(propertyIds, keyPropertyIds, managementController);
+  /**
+   * The key property ids for a Stack resource.
+   */
+  protected static Map keyPropertyIds = 
ImmutableMap.builder()
+  .put(Type.Stack, STACK_NAME_PROPERTY_ID)
+  .build();
+
+  /**
+   * The property ids for a Stack resource.
+   */
+  protected static Set propertyIds = Sets.newHashSet(
+  STACK_NAME_PROPERTY_ID);
+
+  protected StackResourceProvider(AmbariManagementController 
managementController) {
+super(Type.Stack, propertyIds, keyPropertyIds, managementController);
   }
 
 
@@ -120,6 +130,6 @@ public class StackResourceProvider extends 
ReadOnlyResourceProvider {
 
   @Override
   protected Set getPKPropertyIds() {
-return pkPropertyIds;
+return new HashSet<>(keyPropertyIds.values());
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceComponentResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceComponentResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceComponentResourceProvider.java
index b9661bb..a221248 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceComponentResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceComponentResourceProvider.java
@@ -18,7 +18,6 @@
 
 package org.apache.ambari.server.controller.internal;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
@@ -39,6 +38,9 @@ import 
org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.state.AutoDeployInfo;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
+
 public class StackServiceComponentResourceProvider extends
 ReadOnlyResourceProvider {
   
@@ -102,15 +104,43 @@ public class StackServiceComponentResourceProvider extends
   private static final String AUTO_DEPLOY_LOCATION_ID = 
PropertyHelper.getPropertyId(
   "auto_deploy", "location");
 
-  private static Set pkPropertyIds = new HashSet<>(
-Arrays.asList(new String[]{STACK_NAME_PROPERTY_ID,
-  STACK_VERSION_PROPERTY_ID, SERVICE_NAME_PROPERTY_ID,
-  COMPONENT_NAME_PROPERTY_ID}));
-
-  protected StackServiceComponentResourceProvider(Set propertyIds,
-  Map keyPropertyIds,
-  AmbariManagementController managementController) {
-super(propertyIds, keyPropertyIds, managementController);
+  /**
+   * The key property ids for a StackServiceComponent resource.
+   */
+  private static Map keyPropertyIds = 
ImmutableMap.builder()
+  .put(Type.Stack, STACK_NAME_PROPERTY_ID)
+  .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
+  .put(Type.StackService, SERVICE_NAME_PROPERTY_ID)
+  .put(Type.StackServiceComponent, COMPONENT_NAME_PROPERTY_ID)
+  .build();
+
+  /**
+   * The property ids for a 

[47/53] [abbrv] ambari git commit: AMBARI-22638. yarn.timeline-service property enabled overriding preset secure blueprint config for the same

[aonishuk]

AMBARI-22638. yarn.timeline-service property enabled overriding preset secure 
blueprint config for the same


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

Branch: refs/heads/branch-3.0-perf
Commit: e46575a17d4b9877aa5a67aa87ee690c326f6a64
Parents: a928a9c
Author: Doroszlai, Attila 
Authored: Wed Dec 13 07:14:38 2017 +0100
Committer: Doroszlai, Attila 
Committed: Wed Dec 13 21:22:08 2017 +0100

--
 .../main/resources/common-services/YARN/3.0.0.3.0/kerberos.json  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e46575a1/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
index a3cfaea..a9ad1cc 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
@@ -15,7 +15,7 @@
   "configurations": [
 {
   "yarn-site": {
-"yarn.timeline-service.enabled": "true",
+"yarn.timeline-service.enabled": "false",
 "yarn.timeline-service.http-authentication.type": "kerberos",
 "yarn.acl.enable": "true",
 "yarn.admin.acl": "${yarn-env/yarn_user},dr.who",
@@ -291,4 +291,4 @@
   ]
 }
   ]
-}
\ No newline at end of file
+}

[38/53] [abbrv] ambari git commit: AMBARI-22617. Install Wizard Customize Services step has no vertical scroll (akovalenko)

[aonishuk]

AMBARI-22617. Install Wizard Customize Services step has no vertical scroll 
(akovalenko)


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

Branch: refs/heads/branch-3.0-perf
Commit: ee506295d3d911c4bc9b00233481a1db97cd9289
Parents: 1ed7c08
Author: Aleksandr Kovalenko 
Authored: Fri Dec 8 17:41:13 2017 +0200
Committer: Aleksandr Kovalenko 
Committed: Fri Dec 8 17:41:13 2017 +0200

--
 ambari-web/app/styles/application.less   | 7 ---
 .../app/templates/common/configs/service_config_wizard.hbs   | 8 
 ambari-web/app/templates/main/host/configs_service.hbs   | 2 +-
 ambari-web/app/templates/main/service/info/configs.hbs   | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ee506295/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 7629355..b7c7635 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -602,9 +602,10 @@ h1 {
 }
 
 #serviceConfig {
-  background: white;
-  padding: 15px;
-
+  &.non-wizard {
+background: white;
+padding: 15px;
+  }
   .alert{
 .glyphicon-refresh{
   margin-left:10px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee506295/ambari-web/app/templates/common/configs/service_config_wizard.hbs
--
diff --git a/ambari-web/app/templates/common/configs/service_config_wizard.hbs 
b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
index 57bf5ee..3abd5eb 100644
--- a/ambari-web/app/templates/common/configs/service_config_wizard.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_wizard.hbs
@@ -19,9 +19,9 @@
 {{#if view.supportsHostOverrides}}
   
 {{t common.group}}
- 
- {{selectedConfigGroup.displayNameHosts}}
- 
+ 
+ 
+{{selectedConfigGroup.displayNameHosts}}
 
   
  
@@ -34,7 +34,7 @@
   
 {{/each}}
   
-   
+   
 {{#isAuthorized "SERVICE.MANAGE_CONFIG_GROUPS"}}
   {{#if controller.isHostsConfigsPage}}
 {{t 
common.change}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee506295/ambari-web/app/templates/main/host/configs_service.hbs
--
diff --git a/ambari-web/app/templates/main/host/configs_service.hbs 
b/ambari-web/app/templates/main/host/configs_service.hbs
index 46d7ab5..afeb4b6 100644
--- a/ambari-web/app/templates/main/host/configs_service.hbs
+++ b/ambari-web/app/templates/main/host/configs_service.hbs
@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-
+
   {{#if dataIsLoaded}}
 
 {{view App.ServiceConfigView canEditBinding="view.isConfigsEditable" 
filterBinding="controller.filter" columnsBinding="controller.filterColumns"}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee506295/ambari-web/app/templates/main/service/info/configs.hbs
--
diff --git a/ambari-web/app/templates/main/service/info/configs.hbs 
b/ambari-web/app/templates/main/service/info/configs.hbs
index 738893c..3636ec7 100644
--- a/ambari-web/app/templates/main/service/info/configs.hbs
+++ b/ambari-web/app/templates/main/service/info/configs.hbs
@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-
+
   {{#if dataIsLoaded}}
 {{#if controller.content.isRestartRequired}}
   {{#isAuthorized "SERVICE.START_STOP"}}

[15/53] [abbrv] ambari git commit: AMBARI-22594. Livy server start fails during EU with 'Address already in use' error (dlysnichenko)

[aonishuk]

AMBARI-22594. Livy server start fails during EU with 'Address already in use' 
error (dlysnichenko)


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

Branch: refs/heads/branch-3.0-perf
Commit: 86a99f202614ef9e2022528f011fcd12442e751b
Parents: 620543c
Author: Lisnichenko Dmitro 
Authored: Tue Dec 5 19:32:39 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Tue Dec 5 19:32:39 2017 +0200

--
 .../SPARK/1.2.1/package/scripts/livy_service.py   | 18 ++
 .../SPARK/1.2.1/package/scripts/params.py |  2 ++
 .../SPARK/2.2.0/package/scripts/livy_service.py   | 13 ++---
 .../SPARK/2.2.0/package/scripts/params.py |  2 ++
 .../SPARK2/2.0.0/package/scripts/livy2_service.py | 11 +--
 .../SPARK2/2.0.0/package/scripts/params.py|  2 ++
 6 files changed, 35 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/86a99f20/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_service.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_service.py
index a78f50c..cce2148 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_service.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/livy_service.py
@@ -20,27 +20,29 @@ limitations under the License.
 
 from resource_management.libraries.functions import format
 from resource_management.core.resources.system import File, Execute
+from resource_management.libraries.functions import get_user_call_output
 import threading
 
 def livy_service(name, upgrade_type=None, action=None):
   import params
 
+  livyserver_no_op_test = format(
+'ls {livy_server_pid_file} >/dev/null 2>&1 && ps -p `cat 
{livy_server_pid_file}` >/dev/null 2>&1')
   if action == 'start':
-livyserver_no_op_test = format(
-  'ls {livy_server_pid_file} >/dev/null 2>&1 && ps -p `cat 
{livy_server_pid_file}` >/dev/null 2>&1')
 Execute(format('{livy_server_start}'),
 user=params.livy_user,
 environment={'JAVA_HOME': params.java_home},
 not_if=livyserver_no_op_test)
 
   elif action == 'stop':
+pid = get_user_call_output.get_user_call_output(
+  format("! test -f {livy_server_pid_file} ||  cat 
{livy_server_pid_file}"), user=params.livy_user)[1]
+pid = pid.replace("\n", " ")
 Execute(format('{livy_server_stop}'),
 user=params.livy_user,
+only_if=livyserver_no_op_test,
+timeout=10,
+on_timeout=format("! ( {livyserver_no_op_test} ) || {sudo} -H -E 
kill -9 {pid}"),
 environment={'JAVA_HOME': params.java_home}
 )
-File(params.livy_server_pid_file,
- action="delete"
- )
-
-
-
+File(params.livy_server_pid_file, action="delete")

http://git-wip-us.apache.org/repos/asf/ambari/blob/86a99f20/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
index 691ca2c..726a886 100644
--- 
a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/package/scripts/params.py
@@ -22,6 +22,7 @@ import socket
 import status_params
 
 from setup_spark import *
+from ambari_commons.constants import AMBARI_SUDO_BINARY
 from resource_management.libraries.functions.stack_features import 
check_stack_feature
 from resource_management.libraries.functions.stack_features import 
get_stack_feature_version
 from resource_management.libraries.functions.constants import StackFeature
@@ -48,6 +49,7 @@ SERVER_ROLE_DIRECTORY_MAP = {
   'LIVY_CLIENT' : 'livy-client'
 }
 
+sudo = AMBARI_SUDO_BINARY
 component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "SPARK_CLIENT")
 
 config = Script.get_config()

http://git-wip-us.apache.org/repos/asf/ambari/blob/86a99f20/ambari-server/src/main/resources/common-services/SPARK/2.2.0/package/scripts/livy_service.py
--
diff --git 

[43/53] [abbrv] ambari git commit: AMBARI-22539. Cannot add host with host_name in request body

[aonishuk]

AMBARI-22539. Cannot add host with host_name in request body


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

Branch: refs/heads/branch-3.0-perf
Commit: 636a2a96cc19e7a588f70c9b91735af3008ed0e0
Parents: 4be18df
Author: Doroszlai, Attila 
Authored: Wed Nov 29 09:02:30 2017 +0100
Committer: Doroszlai, Attila 
Committed: Mon Dec 11 20:14:07 2017 +0100

--
 .../internal/HostResourceProvider.java  |  2 +-
 .../internal/ScaleClusterRequest.java   | 17 +
 .../internal/ScaleClusterRequestTest.java   | 38 +++-
 3 files changed, 31 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/636a2a96/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index f683afd..776be0c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -1066,7 +1066,7 @@ public class HostResourceProvider extends 
AbstractControllerResourceProvider {
*
* @return the host name for the host request
*/
-  private String getHostNameFromProperties(Map properties) {
+  public static String getHostNameFromProperties(Map 
properties) {
 String hostname = (String) properties.get(HOST_HOST_NAME_PROPERTY_ID);
 
 return hostname != null ? hostname :

http://git-wip-us.apache.org/repos/asf/ambari/blob/636a2a96/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
index fe33f93..5e5eec8 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
@@ -119,7 +119,7 @@ public class ScaleClusterRequest extends BaseClusterRequest 
{
   "Currently, a scaling request may only refer to a single blueprint");
 }
 
-String hostName = getHostNameFromProperties(properties);
+String hostName = 
HostResourceProvider.getHostNameFromProperties(properties);
 boolean containsHostCount = 
properties.containsKey(HostResourceProvider.HOST_COUNT_PROPERTY_ID);
 boolean containsHostPredicate = 
properties.containsKey(HostResourceProvider.HOST_PREDICATE_PROPERTY_ID);
 
@@ -212,21 +212,6 @@ public class ScaleClusterRequest extends 
BaseClusterRequest {
   }
 
   /**
-   * Get the host name from the request properties.
-   *
-   * @param properties  request properties
-   * @return host name
-   */
-  //todo: this was copied exactly from HostResourceProvider
-  private String getHostNameFromProperties(Map properties) {
-String hostName = (String) 
properties.get(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
-if (hostName == null) {
-  hostName = (String) 
properties.get(HostResourceProvider.HOST_NAME_PROPERTY_ID);
-}
-return hostName;
-  }
-
-  /**
* Get the total number of requested hosts for the request.
* @return  total requested host count
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/636a2a96/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java
index 2a03b1f..b9f32a0 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java
@@ -102,12 +102,17 @@ public class ScaleClusterRequestTest {
 
   @Test
   public void test_basic_hostName() throws Exception {
+Map props = 

[50/53] [abbrv] ambari git commit: AMBARI-22639. Log Feeder refactor: integrate with spring boot (oleewere)

[aonishuk]

http://git-wip-us.apache.org/repos/asf/ambari/blob/31e8e55a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
index 8f8c4fd..e8066be 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/input/InputConfigUploader.java
@@ -27,60 +27,76 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.ambari.logfeeder.util.LogFeederPropertiesUtil;
+import org.apache.ambari.logfeeder.common.ConfigHandler;
+import org.apache.ambari.logfeeder.conf.LogFeederProps;
+import org.apache.ambari.logfeeder.loglevelfilter.LogLevelFilterHandler;
 import org.apache.ambari.logsearch.config.api.LogSearchConfigLogFeeder;
-import org.apache.log4j.Logger;
 
 import com.google.common.io.Files;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 
 public class InputConfigUploader extends Thread {
-  protected static final Logger LOG = 
Logger.getLogger(InputConfigUploader.class);
+
+  protected static final Logger LOG = 
LoggerFactory.getLogger(InputConfigUploader.class);
 
   private static final long SLEEP_BETWEEN_CHECK = 2000;
 
-  private final File configDir;
-  private final FilenameFilter inputConfigFileFilter = new FilenameFilter() {
-@Override
-public boolean accept(File dir, String name) {
-  return name.startsWith("input.config-") && name.endsWith(".json");
-}
-  };
+  private File configDir;
+  private final FilenameFilter inputConfigFileFilter = (dir, name) -> 
name.startsWith("input.config-") && name.endsWith(".json");
   private final Set filesHandled = new HashSet<>();
   private final Pattern serviceNamePattern = 
Pattern.compile("input.config-(.+).json");
-  private final LogSearchConfigLogFeeder config;
-  
-  public static void load(LogSearchConfigLogFeeder config) {
-new InputConfigUploader(config).start();
-  }
-  
-  private InputConfigUploader(LogSearchConfigLogFeeder config) {
+
+  @Inject
+  private LogSearchConfigLogFeeder config;
+
+  @Inject
+  private LogFeederProps logFeederProps;
+
+  @Inject
+  private LogLevelFilterHandler logLevelFilterHandler;
+
+  @Inject
+  private ConfigHandler configHandler;
+
+  public InputConfigUploader() {
 super("Input Config Loader");
 setDaemon(true);
-
-this.configDir = new File(LogFeederPropertiesUtil.getConfigDir());
-this.config = config;
+  }
+
+  @PostConstruct
+  public void init() throws Exception {
+this.configDir = new File(logFeederProps.getConfDir());
+this.start();
+config.monitorInputConfigChanges(configHandler, logLevelFilterHandler, 
logFeederProps.getClusterName());
   }
   
   @Override
   public void run() {
 while (true) {
   File[] inputConfigFiles = configDir.listFiles(inputConfigFileFilter);
-  for (File inputConfigFile : inputConfigFiles) {
-if (!filesHandled.contains(inputConfigFile.getAbsolutePath())) {
-  try {
-Matcher m = serviceNamePattern.matcher(inputConfigFile.getName());
-m.find();
-String serviceName = m.group(1);
-String inputConfig = Files.toString(inputConfigFile, 
Charset.defaultCharset());
-
-if (!config.inputConfigExists(serviceName)) {
-  
config.createInputConfig(LogFeederPropertiesUtil.getClusterName(), serviceName, 
inputConfig);
+  if (inputConfigFiles != null) {
+for (File inputConfigFile : inputConfigFiles) {
+  if (!filesHandled.contains(inputConfigFile.getAbsolutePath())) {
+try {
+  Matcher m = 
serviceNamePattern.matcher(inputConfigFile.getName());
+  m.find();
+  String serviceName = m.group(1);
+  String inputConfig = Files.toString(inputConfigFile, 
Charset.defaultCharset());
+  if (!config.inputConfigExists(serviceName)) {
+config.createInputConfig(logFeederProps.getClusterName(), 
serviceName, inputConfig);
+  }
+  filesHandled.add(inputConfigFile.getAbsolutePath());
+} catch (Exception e) {
+  LOG.warn("Error handling file " + 
inputConfigFile.getAbsolutePath(), e);
 }
-filesHandled.add(inputConfigFile.getAbsolutePath());
-  } catch (Exception e) {
-LOG.warn("Error handling file " + 
inputConfigFile.getAbsolutePath(), e);
   }
 }
+  } else {
+

[10/53] [abbrv] ambari git commit: AMBARI-22585. Fix the wording on IPA integration requirements in the Enable Kerberos Wizard (rlevas)

[aonishuk]

AMBARI-22585. Fix the wording on IPA integration requirements in the Enable 
Kerberos Wizard (rlevas)


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

Branch: refs/heads/branch-3.0-perf
Commit: ddcebe23c1736a4cf2fc212fb419e6b248da4a5c
Parents: c7cc560
Author: Robert Levas 
Authored: Mon Dec 4 18:26:49 2017 -0500
Committer: Robert Levas 
Committed: Mon Dec 4 18:26:49 2017 -0500

--
 ambari-web/app/messages.js | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ddcebe23/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 8b6ce72..74c050f 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1274,9 +1274,9 @@ Em.I18n.translations = {
   'admin.kerberos.wizard.step1.option.ad.condition.4': 'Active Directory 
administrative credentials with delegated control of “Create, delete, and 
manage user accounts” on the previously mentioned User container are 
on-hand.',
   'admin.kerberos.wizard.step1.option.ad.condition.5': 'The Java Cryptography 
Extensions (JCE) have been setup on the Ambari Server host and all hosts in the 
cluster.',
   'admin.kerberos.wizard.step1.option.ipa': 'Existing IPA',
-  'admin.kerberos.wizard.step1.option.ipa.condition.1': 'Cluster hosts are 
joined to the IPA domain and hosts are registered in DNS',
-  'admin.kerberos.wizard.step1.option.ipa.condition.2': 'A password policy in 
place that sets no expiry for created principals',
-  'admin.kerberos.wizard.step1.option.ipa.condition.3': 'The ipa managed 
krb5.conf sets default_ccache_name = /tmp/krb5cc_%{uid}',
+  'admin.kerberos.wizard.step1.option.ipa.condition.1': 'All cluster hosts are 
joined to the IPA domain and hosts are registered in DNS',
+  'admin.kerberos.wizard.step1.option.ipa.condition.2': 'A password policy is 
in place that sets no expiry for created principals',
+  'admin.kerberos.wizard.step1.option.ipa.condition.3': 'If you do not plan on 
using Ambari to manage the krb5.conf, ensure the following is set in each 
krb5.conf file in your cluster: default_ccache_name = /tmp/krb5cc_%{uid}',
   'admin.kerberos.wizard.step1.option.ipa.condition.4': 'The Java Cryptography 
Extensions (JCE) have been setup on the Ambari Server host and all hosts in the 
cluster.',
   'admin.kerberos.wizard.step1.prerequisites.label': 'Following prerequisites 
needs to be checked to progress ahead in the wizard.',
   'admin.kerberos.wizard.step2.info.body': 'Please configure kerberos related 
properties.',
@@ -1311,7 +1311,7 @@ Em.I18n.translations = {
 
   'admin.kerberos.regenerate_keytabs.popup.body': 'Regenerating keytabs for 
all hosts in the cluster is a disruptive operation, and 
requires all components to be restarted. Optionally, keytabs can be regenerated 
only for missing hosts and components, and this operation 
requires selectively restarting those affected hosts and services.',
   'admin.kerberos.regenerate_keytabs.checkbox.label': ' Only regenerate 
keytabs for missing hosts and components',
-  'admin.kerberos.regenerate_keytabs.popup.restart.body': 'After keytab 
regerate is complete, services relying on them must be 
restarted. This can be done automatically, or manually.',
+  'admin.kerberos.regenerate_keytabs.popup.restart.body': 'After keytab 
regenerate is complete, services relying on them must be 
restarted. This can be done automatically, or manually.',
   'admin.kerberos.regenerate_keytabs.checkbox.restart.label': 'Automatically 
restart components after keytab regeneration',
   'admin.kerberos.service.alert.yarn': 'YARN log and local dir will be deleted 
and ResourceManager state will be formatted as part of Enabling/Disabling 
Kerberos.',
 

[01/53] [abbrv] ambari git commit: AMBARI-22353. Remove properties.json And Switch To Adding Properties to ResourceProviders Dynamically (dlysnichenko)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-3.0-perf f51351e54 -> 66a5083c5


http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
index ba67939..50b378c 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
@@ -61,9 +61,7 @@ public class InstanceResourceProviderTest {
 
 Request request = PropertyHelper.getCreateRequest(propertySet, 
Collections.emptyMap());
 
-InstanceResourceProvider provider = new InstanceResourceProvider(service,
-PropertyHelper.getPropertyIds(Resource.Type.DRInstance),
-PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance));
+InstanceResourceProvider provider = new InstanceResourceProvider(service);
 
 try {
   provider.createResources(request);
@@ -106,9 +104,7 @@ public class InstanceResourceProviderTest {
 
 Request request = PropertyHelper.getCreateRequest(propertySet, 
Collections.emptyMap());
 
-InstanceResourceProvider provider = new InstanceResourceProvider(service,
-PropertyHelper.getPropertyIds(Resource.Type.DRInstance),
-PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance));
+InstanceResourceProvider provider = new InstanceResourceProvider(service);
 
 Set resources = provider.getResources(request, null);
 
@@ -147,9 +143,7 @@ public class InstanceResourceProviderTest {
 
 Request request = PropertyHelper.getCreateRequest(propertySet, 
Collections.emptyMap());
 
-InstanceResourceProvider provider = new InstanceResourceProvider(service,
-PropertyHelper.getPropertyIds(Resource.Type.DRInstance),
-PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance));
+InstanceResourceProvider provider = new InstanceResourceProvider(service);
 
 provider.updateResources(request, null);
 
@@ -171,9 +165,7 @@ public class InstanceResourceProviderTest {
 // replay
 replay(service);
 
-InstanceResourceProvider provider = new InstanceResourceProvider(service,
-PropertyHelper.getPropertyIds(Resource.Type.DRInstance),
-PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance));
+InstanceResourceProvider provider = new InstanceResourceProvider(service);
 
 Predicate predicate = new 
PredicateBuilder().property(InstanceResourceProvider.INSTANCE_ID_PROPERTY_ID).equals("Instance1").toPredicate();
 
@@ -182,17 +174,4 @@ public class InstanceResourceProviderTest {
 // verify
 verify(service);
   }
-
-  @Test
-  public void testGetKeyPropertyIds() throws Exception {
-IvoryService service = createMock(IvoryService.class);
-
-Map keyPropertyIds = 
PropertyHelper.getKeyPropertyIds(Resource.Type.DRInstance);
-
-InstanceResourceProvider provider = new InstanceResourceProvider(service,
-PropertyHelper.getPropertyIds(Resource.Type.DRInstance),
-keyPropertyIds);
-
-Assert.assertEquals(keyPropertyIds, provider.getKeyPropertyIds());
-  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e77a31ab/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
index e19ad29..a1def85 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
@@ -44,7 +44,6 @@ import 
org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
 import org.apache.ambari.server.controller.spi.ResourceProvider;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.ambari.server.orm.GuiceJpaInitializer;
 import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
 import org.apache.ambari.server.orm.OrmTestHelper;
@@ -667,9 +666,7 @@ public class JMXHostProviderTest {
 maintenanceStateHelper, repositoryVersionDAO);
 
 ResourceProvider hostCompResourceProvider = new
-  HostComponentResourceProvider(PropertyHelper.getPropertyIds(Resource
-  

[26/53] [abbrv] ambari git commit: AMBARI-22606. Service actions for R4ML not loaded (akovalenko)

[aonishuk]

AMBARI-22606. Service actions for R4ML not loaded (akovalenko)


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

Branch: refs/heads/branch-3.0-perf
Commit: 466379c2f8a9d0a724166bc4b3f3d9ef50bfc877
Parents: 4203853
Author: Aleksandr Kovalenko 
Authored: Wed Dec 6 21:03:29 2017 +0200
Committer: Aleksandr Kovalenko 
Committed: Wed Dec 6 23:58:13 2017 +0200

--
 ambari-web/app/controllers/main/service/item.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/466379c2/ambari-web/app/controllers/main/service/item.js
--
diff --git a/ambari-web/app/controllers/main/service/item.js 
b/ambari-web/app/controllers/main/service/item.js
index fda0dda..4f53391 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -234,7 +234,9 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   var configsByService = allConfigs.filter(function (c) {
 return 
configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename')));
   });
-  
self.get('stepConfigs').pushObject(App.config.createServiceConfig(serviceName, 
[], configsByService));
+  if 
(App.config.get('preDefinedServiceConfigs').someProperty('serviceName', 
serviceName)) {
+
self.get('stepConfigs').pushObject(App.config.createServiceConfig(serviceName, 
[], configsByService));
+  }
 });
 
 self.set('isServiceConfigsLoaded', true);

[09/53] [abbrv] ambari git commit: AMBARI-22587. Storm service check failed during PU due to CNF StormAtlasHook (ncole)

[aonishuk]

AMBARI-22587. Storm service check failed during PU due to CNF StormAtlasHook 
(ncole)


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

Branch: refs/heads/branch-3.0-perf
Commit: c7cc5607e78991726753ef5d968d6cf2378c5f5b
Parents: 0afe0c0
Author: Nate Cole 
Authored: Mon Dec 4 14:58:25 2017 -0500
Committer: Nate Cole 
Committed: Mon Dec 4 14:58:25 2017 -0500

--
 .../main/resources/stacks/HDP/2.0.6/properties/stack_packages.json  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c7cc5607/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
index 946686a..62a46b9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
@@ -1268,6 +1268,7 @@
   }
 },
 "upgrade-dependencies" : {
+  "ATLAS": ["STORM"],
   "HIVE": ["TEZ", "MAPREDUCE2"],
   "TEZ": ["HIVE"],
   "MAPREDUCE2": ["HIVE"],

[30/53] [abbrv] ambari git commit: AMBARI-22605. Tez service check hangs when adding service. (mpapirkovskyy)

[aonishuk]

AMBARI-22605. Tez service check hangs when adding service. (mpapirkovskyy)


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

Branch: refs/heads/branch-3.0-perf
Commit: a9c3bf56a64448708dde677d063619d4c71e3492
Parents: 2460ea1
Author: Myroslav Papirkovskyi 
Authored: Wed Dec 6 18:10:53 2017 +0200
Committer: Myroslav Papirkovskyi 
Committed: Thu Dec 7 17:37:33 2017 +0200

--
 .../AmbariManagementControllerImpl.java |  6 +
 .../upgrade/HostVersionOutOfSyncListener.java   | 24 
 2 files changed, 30 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9c3bf56/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index 232737c..198b617 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -3031,6 +3031,12 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
   continue;
 }
 
+if (StringUtils.isBlank(stage.getHostParamsStage())) {
+  RepositoryVersionEntity repositoryVersion = 
component.getDesiredRepositoryVersion();
+  stage.setHostParamsStage(StageUtils.getGson().toJson(
+  customCommandExecutionHelper.createDefaultHostParams(cluster, 
repositoryVersion.getStackId(;
+}
+
 customCommandExecutionHelper.addServiceCheckAction(stage, clientHost, 
smokeTestRole,
 nowTimestamp, serviceName, componentName, null, false, false);
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/a9c3bf56/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
index 4ce855d..4b3e42a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
@@ -129,6 +129,14 @@ public class HostVersionOutOfSyncListener {
 // stack, but become versionAdvertised in some future (installed, but 
not yet upgraded to) stack
 String serviceName = event.getServiceName();
 String componentName = event.getComponentName();
+
+// Skip lookup if stack does not contain the component
+if (!ami.get().isValidServiceComponent(hostStackId.getStackName(),
+hostStackId.getStackVersion(), serviceName, componentName)) {
+  LOG.debug("Component not found is host stack, stack={}, version={}, 
service={}, component={}",
+  hostStackId.getStackName(), hostStackId.getStackVersion(), 
serviceName, componentName);
+  continue;
+}
 ComponentInfo component = 
ami.get().getComponent(hostStackId.getStackName(),
 hostStackId.getStackVersion(), serviceName, componentName);
 
@@ -215,6 +223,14 @@ public class HostVersionOutOfSyncListener {
 Collection hostComponents = 
host.getHostComponentDesiredStateEntities();
 
 for (HostComponentDesiredStateEntity hostComponent : hostComponents) {
+  // Skip lookup if stack does not contain the component
+  if (!ami.get().isValidServiceComponent(stackId.getStackName(),
+  stackId.getStackVersion(), hostComponent.getServiceName(), 
hostComponent.getComponentName())) {
+LOG.debug("Component not found is host stack, stack={}, version={}, 
service={}, component={}",
+stackId.getStackName(), stackId.getStackVersion(),
+hostComponent.getServiceName(), hostComponent.getComponentName());
+continue;
+  }
   ComponentInfo ci = ami.get().getComponent(stackId.getStackName(), 
stackId.getStackVersion(),
   hostComponent.getServiceName(), hostComponent.getComponentName());
 
@@ -260,6 +276,14 @@ public class HostVersionOutOfSyncListener {
   String 

[49/53] [abbrv] ambari git commit: AMBARI-22639. Log Feeder refactor: integrate with spring boot (oleewere)

[aonishuk]

http://git-wip-us.apache.org/repos/asf/ambari/blob/31e8e55a/ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/logconfig/LogConfigHandlerTest.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/logconfig/LogConfigHandlerTest.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/logconfig/LogConfigHandlerTest.java
deleted file mode 100644
index 46abc63..000
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/test/java/org/apache/ambari/logfeeder/logconfig/LogConfigHandlerTest.java
+++ /dev/null
@@ -1,148 +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.logfeeder.logconfig;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-import org.apache.ambari.logfeeder.input.Input;
-import org.apache.ambari.logfeeder.input.InputMarker;
-import org.apache.ambari.logfeeder.loglevelfilter.FilterLogData;
-import org.apache.ambari.logfeeder.loglevelfilter.LogLevelFilterHandler;
-import org.apache.ambari.logfeeder.util.LogFeederPropertiesUtil;
-import org.apache.ambari.logsearch.config.api.LogSearchConfig;
-import 
org.apache.ambari.logsearch.config.api.model.loglevelfilter.LogLevelFilter;
-import org.apache.commons.lang.time.DateUtils;
-import 
org.apache.ambari.logsearch.config.zookeeper.model.inputconfig.impl.InputDescriptorImpl;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class LogConfigHandlerTest {
-  
-  private static InputMarker inputMarkerAudit;
-  private static InputMarker inputMarkerService;
-  static {
-InputDescriptorImpl auditInputDescriptor = new InputDescriptorImpl() {};
-auditInputDescriptor.setRowtype("audit");
-
-Input auditInput = strictMock(Input.class);
-
expect(auditInput.getInputDescriptor()).andReturn(auditInputDescriptor).anyTimes();
-inputMarkerAudit = new InputMarker(auditInput, null, 0);
-
-InputDescriptorImpl serviceInputDescriptor = new InputDescriptorImpl() {};
-serviceInputDescriptor.setRowtype("service");
-
-Input serviceInput = strictMock(Input.class);
-
expect(serviceInput.getInputDescriptor()).andReturn(serviceInputDescriptor).anyTimes();
-inputMarkerService = new InputMarker(serviceInput, null, 0);
-
-replay(auditInput, serviceInput);
-  }
-  
-  @BeforeClass
-  public static void init() throws Exception {
-LogFeederPropertiesUtil.loadProperties("logfeeder.properties");
-
-LogSearchConfig config = strictMock(LogSearchConfig.class);
-config.createLogLevelFilter(anyString(), anyString(), 
anyObject(LogLevelFilter.class));
-expectLastCall().anyTimes();
-LogLevelFilterHandler.init(config);
-
-LogLevelFilter logLevelFilter1 = new LogLevelFilter();
-logLevelFilter1.setHosts(Collections. emptyList());
-logLevelFilter1.setDefaultLevels(Arrays.asList("FATAL", "ERROR", "WARN", 
"INFO"));
-logLevelFilter1.setOverrideLevels(Collections. emptyList());
-
-LogLevelFilter logLevelFilter2 = new LogLevelFilter();
-logLevelFilter2.setHosts(Arrays.asList("host1"));
-logLevelFilter2.setDefaultLevels(Arrays.asList("FATAL", "ERROR", "WARN", 
"INFO"));
-logLevelFilter2.setOverrideLevels(Arrays.asList("FATAL", "ERROR", "WARN", 
"INFO", "DEBUG", "TRACE"));
-logLevelFilter2.setExpiryTime(DateUtils.addDays(new Date(), 1));
-
-LogLevelFilter logLevelFilter3 = new LogLevelFilter();
-logLevelFilter3.setHosts(Arrays.asList("host1"));
-logLevelFilter3.setDefaultLevels(Arrays.asList("FATAL", "ERROR", "WARN", 
"INFO"));
-logLevelFilter3.setOverrideLevels(Arrays.asList("FATAL", "ERROR", "WARN", 
"INFO", "DEBUG", "TRACE"));
-logLevelFilter3.setExpiryTime(DateUtils.addDays(new Date(), -1));
-
-LogLevelFilterHandler h = new LogLevelFilterHandler();
-h.setLogLevelFilter("configured_log_file1", logLevelFilter1);
-h.setLogLevelFilter("configured_log_file2", logLevelFilter2);
-h.setLogLevelFilter("configured_log_file3", 

[28/53] [abbrv] ambari git commit: AMBARI-22492. A bad WebHDFS request is issued when starting Hive Metastore addendum (amagyar)

[aonishuk]

AMBARI-22492. A bad WebHDFS request is issued when starting Hive Metastore 
addendum (amagyar)


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

Branch: refs/heads/branch-3.0-perf
Commit: 825b97c50ab124a962c731ba0c4113a1b912aaff
Parents: fcc92aa
Author: Attila Magyar 
Authored: Thu Dec 7 11:34:43 2017 +0100
Committer: Attila Magyar 
Committed: Thu Dec 7 11:34:43 2017 +0100

--
 .../common-services/HIVE/0.12.0.2.0/package/scripts/hive.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/825b97c5/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index 2d5d703..0f4a88a 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -256,7 +256,7 @@ def setup_hiveserver2():
 owner = params.hive_user,
 group=params.user_group,
 mode = 01777)
-  if params.hive_repl_rootdir is not None:
+  if params.hive_repl_rootdir:
 params.HdfsResource(params.hive_repl_rootdir,
 type = "directory",
 action = "create_on_execute",
@@ -335,7 +335,7 @@ def setup_metastore():
 owner = params.hive_user,
 group=params.user_group,
 mode = 01777)
-  if params.hive_repl_rootdir is not None:
+  if params.hive_repl_rootdir:
 params.HdfsResource(params.hive_repl_rootdir,
 type = "directory",
 action = "create_on_execute",

[29/53] [abbrv] ambari git commit: AMBARI-22611. Log Search IT: Expose the right port for Selenium in docker-compose file (oleewere)

[aonishuk]

AMBARI-22611. Log Search IT: Expose the right port for Selenium in 
docker-compose file (oleewere)


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

Branch: refs/heads/branch-3.0-perf
Commit: 2460ea1c9ccd609375f774c32283debfd1a91cb5
Parents: 825b97c
Author: Oliver Szabo 
Authored: Thu Dec 7 14:28:00 2017 +0100
Committer: Oliver Szabo 
Committed: Thu Dec 7 14:28:15 2017 +0100

--
 ambari-logsearch/docker/all.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2460ea1c/ambari-logsearch/docker/all.yml
--
diff --git a/ambari-logsearch/docker/all.yml b/ambari-logsearch/docker/all.yml
index 82f0ff9..369db39 100644
--- a/ambari-logsearch/docker/all.yml
+++ b/ambari-logsearch/docker/all.yml
@@ -27,7 +27,7 @@ services:
   - 5006:5006
   - 8886:8886
   - 18886:18886
-  - 4004:4004
+  - :
   - 9983:9983
 environment:
   DISPLAY: $DOCKERIP:0

[20/53] [abbrv] ambari git commit: AMBARI-22597. Jetty Session Timeout Is Overridden By Views Initialization. (mpapirkovskyy)

[aonishuk]

AMBARI-22597. Jetty Session Timeout Is Overridden By Views Initialization. 
(mpapirkovskyy)


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

Branch: refs/heads/branch-3.0-perf
Commit: cfb2321f8769bdc92a1c08ad354e604f104ac629
Parents: e973986
Author: Myroslav Papirkovskyi 
Authored: Tue Nov 21 17:26:06 2017 +0200
Committer: Myroslav Papirkovskyi 
Committed: Wed Dec 6 19:23:12 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/cfb2321f/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 863313b..64a4338 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -561,6 +561,9 @@ public class AmbariServer {
*/
   server.start();
 
+  //views initialization will reset inactive interval with default value, 
so we should set it after
+  configureMaxInactiveInterval();
+
   serverForAgent.start();
   LOG.info("* Started Server **");
 
@@ -851,10 +854,13 @@ public class AmbariServer {
 if (configs.getApiSSLAuthentication()) {
   sessionManager.getSessionCookieConfig().setSecure(true);
 }
+  }
 
+  protected void configureMaxInactiveInterval() {
 // each request that does not use AMBARISESSIONID will create a new
 // HashedSession in Jetty; these MUST be reaped after inactivity in order
 // to prevent a memory leak
+
 int sessionInactivityTimeout = configs.getHttpSessionInactiveTimeout();
 sessionManager.setMaxInactiveInterval(sessionInactivityTimeout);
   }

[32/53] [abbrv] ambari git commit: AMBARI-22589 Ambari web UI stack version page is empty due to NPE when target stack does not contain all services from the current stack (dili)

[aonishuk]

AMBARI-22589 Ambari web UI stack version page is empty due to NPE when target 
stack does not contain all services from the current stack (dili)


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

Branch: refs/heads/branch-3.0-perf
Commit: f4d27390f0de5a0e85c143e783312d03f24adf54
Parents: 862b7d7
Author: Di Li 
Authored: Thu Dec 7 14:05:45 2017 -0500
Committer: Di Li 
Committed: Thu Dec 7 14:05:45 2017 -0500

--
 .../admin/stack_upgrade/upgrade_version_column_view.js   | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f4d27390/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
index 9ddb083..3a406d8 100644
--- 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
+++ 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
@@ -51,12 +51,21 @@ App.UpgradeVersionColumnView = 
App.UpgradeVersionBoxView.extend({
 
   var stackService = originalServices.findProperty('name', 
service.get('serviceName'));
   var isAvailable = this.isStackServiceAvailable(stackService);
+
+  var notUpgradable = false;
+  if (!stackService) {
+console.error(stackService + " definition does not exist in the 
stack.")
+notUpgradable = true;
+  } else {
+notUpgradable = this.getNotUpgradable(isAvailable, 
stackService.get('isUpgradable'));
+  }
+
   return Em.Object.create({
 displayName: service.get('displayName'),
 name: service.get('serviceName'),
 latestVersion: stackService ? stackService.get('latestVersion') : '',
 isVersionInvisible: !stackService,
-notUpgradable: this.getNotUpgradable(isAvailable, 
stackService.get('isUpgradable')),
+notUpgradable: notUpgradable,
 isAvailable: isAvailable
   });
 }, this);

[07/53] [abbrv] ambari git commit: AMBARI-22582 Clean up Configs page. (atkach)

[aonishuk]

AMBARI-22582 Clean up Configs page. (atkach)


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

Branch: refs/heads/branch-3.0-perf
Commit: 2e9c964650665028caa6351eebebe5f55e6d28ca
Parents: e77a31a
Author: Andrii Tkach 
Authored: Mon Dec 4 18:41:04 2017 +0200
Committer: Andrii Tkach 
Committed: Mon Dec 4 18:41:04 2017 +0200

--
 ambari-web/app/assets/test/tests.js |   2 +-
 .../controllers/main/service/info/configs.js|   5 +
 ambari-web/app/messages.js  |   3 +-
 .../mixins/common/configs/configs_comparator.js |   6 +-
 ambari-web/app/styles/application.less  |  24 +-
 ambari-web/app/styles/bootstrap_overrides.less  |   2 +-
 ambari-web/app/styles/config_history_flow.less  | 414 --
 .../app/styles/config_versions_control.less | 144 
 ambari-web/app/styles/widgets.less  |   7 +-
 .../configs/config_history_dropdown_row.hbs |  24 -
 .../common/configs/config_history_flow.hbs  | 148 
 .../common/configs/config_versions_control.hbs  |  42 ++
 .../common/configs/config_versions_dropdown.hbs |  69 ++
 .../templates/common/configs/service_config.hbs |  97 ++-
 ambari-web/app/views.js |   3 +-
 .../views/common/configs/config_history_flow.js | 644 
 .../configs/config_versions_control_view.js | 235 ++
 .../configs/config_versions_dropdown_view.js|  52 ++
 .../views/common/configs/service_config_view.js |  66 ++
 .../common/configs/config_history_flow_test.js  | 756 ---
 .../config_versions_control_view_test.js| 152 
 .../common/configs/service_config_view_test.js  |  52 +-
 .../host_progress_popup_body_view_test.js   |   9 +-
 23 files changed, 896 insertions(+), 2060 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2e9c9646/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js 
b/ambari-web/app/assets/test/tests.js
index de81764..990c489 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -372,7 +372,7 @@ var files = [
   'test/views/main/admin/highAvailability/nameNode/wizard_view_test',
   'test/views/main/admin/highAvailability/progress_view_test',
   'test/views/common/host_progress_popup_body_view_test',
-  'test/views/common/configs/config_history_flow_test',
+  'test/views/common/configs/config_versions_control_view_test',
   'test/views/common/configs/overriddenProperty_view_test',
   'test/views/common/configs/service_config_view_test',
   'test/views/common/configs/service_config_container_view_test',

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e9c9646/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js 
b/ambari-web/app/controllers/main/service/info/configs.js
index 8436086..a3a4206 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -43,6 +43,11 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.AddSecurityConfi
 
   selectedConfigGroup: null,
 
+  /**
+   * currently displayed service config version
+   */
+  displayedVersion: null,
+
   groupsStore: App.ServiceConfigGroup.find(),
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e9c9646/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 06deecb..8b6ce72 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -360,6 +360,7 @@ Em.I18n.translations = {
   'common.express.downgrade': 'Express Downgrade',
   'common.views': 'Views',
   'common.critical.error': 'Critical',
+  'common.with': 'with',
 
   'models.alert_instance.tiggered.verbose': "Occurred on {0}  Checked on 
{1}",
   'models.alert_definition.triggered.verbose': "Occurred on {0}",
@@ -2260,7 +2261,7 @@ Em.I18n.translations = {
   'services.service.config.configHistory.leftArrow.tooltip': 'Show later 
versions',
   'services.service.config.configHistory.dismissIcon.tooltip': 'Dismiss',
   'services.service.config.configHistory.makeCurrent.message': 'Created from 
service config version {0}',
-  'services.service.config.configHistory.comparing': 'Comparing',
+  'services.service.config.configHistory.comparing': 'Comparing Changes',
   'services.service.config.setRecommendedValue': 'Set 

[34/53] [abbrv] ambari git commit: AMBARI-22612 Log Search UI: Fixes for Top-Level Buttons. (Istvan Tobias via ababiichuk)

[aonishuk]

AMBARI-22612 Log Search UI: Fixes for Top-Level Buttons. (Istvan Tobias via 
ababiichuk)


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

Branch: refs/heads/branch-3.0-perf
Commit: 2b285dac1667e80b89c8719f1746cb433bf0d4dc
Parents: 367dd17
Author: Istvan Tobias 
Authored: Thu Dec 7 19:33:00 2017 +0200
Committer: ababiichuk 
Committed: Fri Dec 8 12:33:10 2017 +0200

--
 .../app/components/logs-container/logs-container.component.html | 2 +-
 .../app/components/logs-container/logs-container.component.less | 5 -
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2b285dac/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.html
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.html
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.html
index 13911bd..5e401d8 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.html
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.html
@@ -17,7 +17,7 @@
 
 
   
-
+
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/2b285dac/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
index 9902b79..b4d44fb 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.less
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-@import '../variables';
+@import '../mixins';
 
 :host {
   display: block;
@@ -27,6 +27,9 @@
   }
   .tabs-container {
 border-bottom: 1px solid @table-border-color;
+.tabs-menu-container {
+  .flex-vertical-align;
+}
   }
 
   filters-panel {

[17/53] [abbrv] ambari git commit: AMBARI-22591.MD interpreter fails with NPE (Zeppelin)(Prabhjyot Singh via Venkata Sairam)

[aonishuk]

AMBARI-22591.MD interpreter fails with NPE (Zeppelin)(Prabhjyot Singh via 
Venkata Sairam)


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

Branch: refs/heads/branch-3.0-perf
Commit: 97ceed034a8d23f5caf6276fa48c02332d58c234
Parents: 0fe2f8f
Author: Venkata Sairam 
Authored: Wed Dec 6 14:56:14 2017 +0530
Committer: Venkata Sairam 
Committed: Wed Dec 6 14:56:14 2017 +0530

--
 .../0.7.0/package/scripts/interpreter_json_template.py   | 2 +-
 .../python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/97ceed03/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
index d5a70a7..713db23 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
@@ -264,7 +264,7 @@ template = '''
   "name": "md",
   "group": "md",
   "properties": {
-"markdown.parser.type": "pegdown"
+"markdown.parser.type": "markdown4j"
   },
   "status": "READY",
   "interpreterGroup": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/97ceed03/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py
 
b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py
index 1d2cf86..4b4dc1f 100644
--- 
a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py
+++ 
b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py
@@ -18,10 +18,10 @@ limitations under the License.
 
 """
 
-template = '\n{\n  "interpreterSettings": {\n"2CKEKWY8Z": {\n  "id": 
"2CKEKWY8Z",\n  "name": "angular",\n  "group": "angular",\n  
"properties": {},\n  "status": "READY",\n  "interpreterGroup": [\n  
  {\n  "name": "angular",\n  "class": 
"org.apache.zeppelin.angular.AngularInterpreter",\n  
"defaultInterpreter": false,\n  "editor": {\n
"editOnDblClick": true\n  }\n}\n  ],\n  "dependencies": 
[],\n  "option": {\n"remote": true,\n"port": -1,\n
"perNote": "shared",\n"perUser": "shared",\n
"isExistingProcess": false,\n"setPermission": false,\n"users": 
[],\n"isUserImpersonate": false\n  }\n},\n"2CKX8WPU1": {\n  
"id": "2CKX8WPU1",\n  "name": "spark",\n  "group": "spark",\n  
"properties": {\n"spark.executor.memory": "512m",\n"args": 
"",\n"zeppelin.spark.printREPLOutput": "true",\n
 "spark.cores.max": "",\n
"zeppelin.dep.additionalRemoteRepository": 
"spark-packages,http://dl.bintray.com/spark-packages/maven,false;",\n
"zeppelin.spark.sql.stacktrace": "false",\n
"zeppelin.spark.importImplicit": "true",\n
"zeppelin.spark.concurrentSQL": "false",\n
"zeppelin.spark.useHiveContext": "true",\n"zeppelin.pyspark.python": 
"python",\n"zeppelin.dep.localrepo": "local-repo",\n
"zeppelin.R.knitr": "true",\n"zeppelin.spark.maxResult": "1000",\n  
  "master": "yarn-client",\n"spark.app.name": "Zeppelin",\n
"zeppelin.R.image.width": "100%",\n"zeppelin.R.render.options": 
"out.format \\u003d \\u0027html\\u0027, comment \\u003d NA, echo \\u003d FALSE, 
results \\u003d \\u0027asis\\u0027, message \\u003d F, warning \\u003d F",\n
"zeppelin.R.cmd": "R"\n  },\n  "status": "READY",\n  
"interpreterGroup": [\n{\n  "name": "spark",\n  
"class": "org
 .apache.zeppelin.spark.SparkInterpreter",\n  "defaultInterpreter": 
true,\n  "editor": {\n"language": "scala"\n  }\n
},\n{\n  "name": "sql",\n  "class": 
"org.apache.zeppelin.spark.SparkSqlInterpreter",\n  
"defaultInterpreter": false,\n  "editor": 

[36/53] [abbrv] ambari git commit: AMBARI-22613 - Hive Queries Failing with Missing SnappyCodec Compression Type Due to Hive's Use of MapReduce Admin Env Property (jonathanhurley)

[aonishuk]

AMBARI-22613 - Hive Queries Failing with Missing SnappyCodec Compression Type 
Due to Hive's Use of MapReduce Admin Env Property (jonathanhurley)


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

Branch: refs/heads/branch-3.0-perf
Commit: 348bdd668ecf6964e2c021aeddf547b3f9bb23bf
Parents: ed327bd
Author: Jonathan Hurley 
Authored: Thu Dec 7 15:51:51 2017 -0500
Committer: Jonathan Hurley 
Committed: Fri Dec 8 07:17:51 2017 -0500

--
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py| 2 ++
 .../common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py | 1 +
 .../YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml| 2 +-
 .../YARN/3.0.0.3.0/configuration-mapred/mapred-site.xml| 2 +-
 .../src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml  | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/348bdd66/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index ea8beaf..20e61d3 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -109,7 +109,9 @@ stack_supports_hive_interactive_ga = 
check_stack_feature(StackFeature.HIVE_INTER
 component_directory = status_params.component_directory
 component_directory_interactive = status_params.component_directory_interactive
 
+# used to render hadoop configurations, such as writing out its own mapreduce2 
configs
 hadoop_home = stack_select.get_hadoop_dir("home")
+hadoop_lib_home = stack_select.get_hadoop_dir("lib")
 
 hive_bin = format('{stack_root}/current/{component_directory}/bin')
 hive_cmd = os.path.join(hive_bin, "hive")

http://git-wip-us.apache.org/repos/asf/ambari/blob/348bdd66/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
index 088a540..8bff1c9 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/2.1.0.3.0/package/scripts/params_linux.py
@@ -106,6 +106,7 @@ component_directory = status_params.component_directory
 component_directory_interactive = status_params.component_directory_interactive
 
 hadoop_home = stack_select.get_hadoop_dir("home")
+hadoop_lib_home = stack_select.get_hadoop_dir("lib")
 
 hive_bin = format('{stack_root}/current/{component_directory}/bin')
 hive_cmd = os.path.join(hive_bin, "hive")

http://git-wip-us.apache.org/repos/asf/ambari/blob/348bdd66/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
index 398c9d7..d2359f3 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/configuration-mapred/mapred-site.xml
@@ -438,7 +438,7 @@
   
   
 mapreduce.admin.user.env
-
LD_LIBRARY_PATH=./mr-framework/hadoop/lib/native:./mr-framework/hadoop/lib/native/Linux-{{architecture}}-64:{{hadoop_lib_home}}/native/Linux-{{architecture}}-64
+
LD_LIBRARY_PATH=./mr-framework/hadoop/lib/native:./mr-framework/hadoop/lib/native/Linux-{{architecture}}-64:{{hadoop_lib_home}}/native:{{hadoop_lib_home}}/native/Linux-{{architecture}}-64
 
   Additional execution environment entries for map and reduce task 
processes.
   This is not an additive property. You must preserve the original value if

http://git-wip-us.apache.org/repos/asf/ambari/blob/348bdd66/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration-mapred/mapred-site.xml

[13/53] [abbrv] ambari git commit: AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko)

[aonishuk]

AMBARI-22566. Upgrade Angular for Ambari Admin View (alexantonenko)


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

Branch: refs/heads/branch-3.0-perf
Commit: a7ac44525d430a1f5b5144f1699fac99abf67ebf
Parents: 1c9aa9d
Author: Alex Antonenko 
Authored: Tue Dec 5 17:59:12 2017 +0300
Committer: Alex Antonenko 
Committed: Tue Dec 5 17:59:12 2017 +0300

--
 .../main/resources/ui/admin-web/app/scripts/app.js  |  2 +-
 .../stackVersions/StackVersionsEditCtrl.js  |  2 +-
 .../ui/admin-web/app/views/ambariViews/edit.html|  8 
 .../admin-web/app/views/ambariViews/viewsList.html  |  2 +-
 .../app/views/directives/editableList.html  |  2 +-
 .../app/views/modals/AddRepositoryModal.html|  2 +-
 .../app/views/modals/RoleDetailsModal.html  |  2 +-
 .../ui/admin-web/app/views/remoteClusters/list.html |  2 +-
 .../ui/admin-web/app/views/stackVersions/list.html  |  4 ++--
 .../app/views/stackVersions/stackVersionPage.html   |  4 ++--
 .../app/views/userManagement/groupEdit.html | 12 ++--
 .../app/views/userManagement/groupsList.html|  6 +++---
 .../views/userManagement/modals/changePassword.html |  2 +-
 .../app/views/userManagement/userEdit.html  | 16 
 .../app/views/userManagement/usersList.html |  4 ++--
 .../src/main/resources/ui/admin-web/bower.json  | 11 +++
 .../src/main/resources/ui/admin-web/package.json|  2 +-
 17 files changed, 43 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
index 225eb12..98b0383 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/app.js
@@ -63,7 +63,7 @@ angular.module('ambariAdminConsole', [
 };
   }]);
 
-  $httpProvider.responseInterceptors.push(['$rootScope', '$q', function 
(scope, $q) {
+  $httpProvider.interceptors.push(['$rootScope', '$q', function (scope, $q) {
 function success(response) {
   return response;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
index 542772e..a4b121c 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
@@ -36,7 +36,7 @@ angular.module('ambariAdminConsole')
   $scope.isGPLAccepted = false;
 
   $scope.isGPLRepo = function (repository) {
-return repository.Repositories.tags.indexOf('GPL') >= 0;
+return repository.Repositories.tags && 
repository.Repositories.tags.indexOf('GPL') >= 0;
   };
 
   $scope.showRepo = function (repository) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7ac4452/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
index a86e285..7f2f8a3 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html
@@ -26,8 +26,8 @@
 
   
   
-{{'common.delete' | translate: '{term: instanceType}'}}
-{{'common.delete' | translate: '{term: 
constants.instance}'}}
+{{'common.delete' | translate:{term: instanceType} }}
+{{'common.delete' | translate:{term: 
constants.instance} }}
   
 
 
@@ -241,7 +241,7 @@
   
 
 
-  {{'views.alerts.notDefined' | translate: 
'{term: constants.props}'}}
+  {{'views.alerts.notDefined' | 
translate:{term: constants.props} }}
 
   
 
@@ -296,7 +296,7 @@
   
 
 
-  {{'views.alerts.notDefined' | translate: 
'{term: constants.perms}'}}
+   

[39/53] [abbrv] ambari git commit: AMBARI-22615 Log Search UI: improve histogram display. (Istvan Tobias via ababiichuk)

[aonishuk]

AMBARI-22615 Log Search UI: improve histogram display. (Istvan Tobias via 
ababiichuk)


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

Branch: refs/heads/branch-3.0-perf
Commit: b1fd131f78feda8f9fef6f33dbc8c67e3fdf539f
Parents: ee50629
Author: Istvan Tobias 
Authored: Fri Dec 8 13:32:20 2017 +0200
Committer: ababiichuk 
Committed: Fri Dec 8 19:00:36 2017 +0200

--
 .../src/app/classes/histogram-options.ts|   3 +-
 .../src/app/components/mixins.less  |  18 +-
 .../time-histogram.component.html   |  29 ++
 .../time-histogram.component.less   | 162 +++-
 .../time-histogram.component.spec.ts| 138 ++-
 .../time-histogram/time-histogram.component.ts  | 377 ---
 .../src/app/services/logs-container.service.ts  |   4 +-
 .../src/assets/i18n/en.json |  13 +-
 8 files changed, 669 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b1fd131f/ambari-logsearch/ambari-logsearch-web/src/app/classes/histogram-options.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/histogram-options.ts 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/histogram-options.ts
index dee5d98..15fefde 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/classes/histogram-options.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/classes/histogram-options.ts
@@ -27,8 +27,7 @@ export interface HistogramStyleOptions {
   margin?: HistogramMarginOptions;
   height?: number;
   tickPadding?: number;
-  columnWidth?: number;
-  dragAreaColor?: string;
+  columnWidth?: {[key:string]: number};
 }
 
 export interface HistogramOptions extends HistogramStyleOptions {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b1fd131f/ambari-logsearch/ambari-logsearch-web/src/app/components/mixins.less
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/mixins.less 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/mixins.less
index a6e5616..890887a 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/components/mixins.less
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/mixins.less
@@ -203,25 +203,11 @@
   display: inline-block;
   width: 0;
   height: 0;
-  margin-left: @caret-width * .85;
   vertical-align: @caret-width * .85;
   content: "";
   .caret-direction(@caret-width, @direction, @color);
 }
 // This is the main caret mixin to create the common and the direction related 
css
-.caret(@caret-width; @direction: down; @color: @base-font-color; @position: 
before) {
-
-  &::before when (@position = before) {
-.caret-style(@caret-width, @direction, @color);
-  }
-  &::after when (@position = after) {
-.caret-style(@caret-width, @direction, @color);
-  }
-
-  &:empty::before when (@position = before) {
-margin-left: 0;
-  }
-  &:empty::after when (@position = after) {
-margin-left: 0;
-  }
+.caret-mixin(@caret-width; @direction: down; @color: @base-font-color; 
@position: before) {
+  .caret-style(@caret-width, @direction, @color);
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/b1fd131f/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.html
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.html
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.html
index 299e46e..1193b2e 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.html
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.html
@@ -15,4 +15,33 @@
   limitations under the License.
 -->
 
+
+  
+
+  
+{{chartTimeGap.value}} {{chartTimeGap.label | translate}} 
{{'histogram.gap' | translate}}
+  
+  
+
+  {{ legend.label | translate }}
+
+  
+
+  
+
 
+
+  {{firstDateTick | 
amTz:timeZone | amDateFormat:historyStartEndTimeFormat}}
+  {{lastDateTick | 
amTz:timeZone | amDateFormat:historyStartEndTimeFormat}}
+
+
+  
+{{tooltipInfo.timeStamp | amTz:timeZone | 
amDateFormat:tickTimeFormat}}
+
+  {{data.levelLabel | translate }}
+  {{data.value}}
+
+  
+
+

[53/53] [abbrv] ambari git commit: Merge branch 'trunk' into branch-3.0-perf

[aonishuk]

Merge branch 'trunk' into branch-3.0-perf


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

Branch: refs/heads/branch-3.0-perf
Commit: 66a5083c5e9434586ef53af647081670596d982c
Parents: f51351e dc31e51
Author: Andrew Onishuk 
Authored: Thu Dec 14 16:59:02 2017 +0200
Committer: Andrew Onishuk 
Committed: Thu Dec 14 16:59:02 2017 +0200

--
 .../resources/ui/admin-web/app/scripts/app.js   |   2 +-
 .../stackVersions/StackVersionsCreateCtrl.js|  28 +-
 .../stackVersions/StackVersionsEditCtrl.js  |   2 +-
 .../admin-web/app/views/ambariViews/edit.html   |   8 +-
 .../app/views/ambariViews/viewsList.html|   2 +-
 .../app/views/directives/editableList.html  |   2 +-
 .../app/views/modals/AddRepositoryModal.html|   2 +-
 .../app/views/modals/RoleDetailsModal.html  |   2 +-
 .../app/views/remoteClusters/list.html  |   2 +-
 .../admin-web/app/views/stackVersions/list.html |   4 +-
 .../views/stackVersions/stackVersionPage.html   |   4 +-
 .../app/views/userManagement/groupEdit.html |  14 +-
 .../app/views/userManagement/groupsList.html|   6 +-
 .../userManagement/modals/changePassword.html   |   2 +-
 .../userManagement/modals/groupCreate.html  |   2 +-
 .../views/userManagement/modals/userCreate.html |   3 +-
 .../app/views/userManagement/userEdit.html  |  18 +-
 .../app/views/userManagement/usersList.html |   4 +-
 .../src/main/resources/ui/admin-web/bower.json  |  11 +-
 .../main/resources/ui/admin-web/package.json|   2 +-
 .../core/providers/package/__init__.py  |  15 +
 .../core/providers/package/yumrpm.py| 121 ++-
 .../libraries/functions/constants.py|  12 +-
 .../libraries/functions/lzo_utils.py|   6 +-
 .../functions/setup_ranger_plugin_xml.py|  14 +-
 .../libraries/providers/hdfs_resource.py|   2 +
 .../config/api/LogSearchConfigFactory.java  |  49 +-
 .../config/api/LogSearchConfigLogFeeder.java|   3 +-
 .../ambari-logsearch-logfeeder/.gitignore   |   1 +
 .../ambari-logsearch-logfeeder/pom.xml  |  62 +-
 .../org/apache/ambari/logfeeder/LogFeeder.java  | 167 +---
 .../ambari/logfeeder/LogFeederCommandLine.java  |  28 +-
 .../ambari/logfeeder/common/ConfigHandler.java  |  47 +-
 .../ambari/logfeeder/common/ConfigItem.java |   8 +-
 .../logfeeder/common/LogEntryParseTester.java   |   3 +-
 .../logfeeder/common/LogFeederConstants.java|  50 ++
 .../logfeeder/conf/ApplicationConfig.java   | 107 +++
 .../logfeeder/conf/InputSimulateConfig.java | 154 
 .../logfeeder/conf/LogEntryCacheConfig.java | 118 +++
 .../ambari/logfeeder/conf/LogFeederProps.java   | 226 ++
 .../logfeeder/conf/LogFeederSecurityConfig.java | 189 +
 .../logfeeder/conf/MetricsCollectorConfig.java  | 113 +++
 .../apache/ambari/logfeeder/filter/Filter.java  |   7 +-
 .../ambari/logfeeder/filter/FilterGrok.java |   7 +-
 .../ambari/logfeeder/filter/FilterKeyValue.java |   5 +-
 .../logfeeder/input/AbstractInputFile.java  |  11 +-
 .../apache/ambari/logfeeder/input/Input.java|  25 +-
 .../logfeeder/input/InputConfigUploader.java|  82 +-
 .../ambari/logfeeder/input/InputManager.java|  28 +-
 .../ambari/logfeeder/input/InputSimulate.java   |  44 +-
 .../logfeeder/loglevelfilter/FilterLogData.java |  73 --
 .../loglevelfilter/LogLevelFilterHandler.java   |  89 ++-
 .../logfeeder/metrics/LogFeederAMSClient.java   |  22 +-
 .../logfeeder/metrics/MetricsManager.java   |  16 +-
 .../ambari/logfeeder/metrics/StatsLogger.java   |  83 ++
 .../ambari/logfeeder/output/OutputFile.java |   5 +-
 .../ambari/logfeeder/output/OutputHDFSFile.java |   8 +-
 .../ambari/logfeeder/output/OutputKafka.java|   5 +-
 .../ambari/logfeeder/output/OutputManager.java  |  36 +-
 .../ambari/logfeeder/output/OutputS3File.java   |   8 +-
 .../ambari/logfeeder/output/OutputSolr.java |  10 +-
 .../logfeeder/util/LogFeederPropertiesUtil.java | 498 
 .../apache/ambari/logfeeder/util/SSLUtil.java   | 134 
 .../shipper-conf/input.config-sample.json   |   2 +-
 .../src/main/resources/log4j.xml|  15 +-
 .../src/main/resources/logfeeder.properties |  18 +-
 .../ambari/logfeeder/filter/FilterGrokTest.java |   3 +-
 .../ambari/logfeeder/filter/FilterJSONTest.java |   3 +-
 .../logfeeder/filter/FilterKeyValueTest.java|   3 +-
 .../ambari/logfeeder/input/InputFileTest.java   |  11 +-
 .../logfeeder/input/InputManagerTest.java   |  12 +-
 .../logconfig/LogConfigHandlerTest.java | 148 
 .../logfeeder/metrics/MetricsManagerTest.java   |   7 -
 .../logfeeder/output/OutputKafkaTest.java   |   7 +-
 

[45/53] [abbrv] ambari git commit: AMBARI-22636. UI Changes for Kerberos Wizard (alexantonenko)

[aonishuk]

AMBARI-22636. UI Changes for Kerberos Wizard (alexantonenko)


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

Branch: refs/heads/branch-3.0-perf
Commit: 8e23fa28ca33e57855301ad0255af44dc6068d0b
Parents: 8e90d59
Author: Alex Antonenko 
Authored: Tue Dec 12 20:13:43 2017 +0300
Committer: Alex Antonenko 
Committed: Tue Dec 12 20:13:43 2017 +0300

--
 ambari-web/app/styles/modal_popups.less  |  8 +++-
 .../app/styles/service_configurations.less   |  5 -
 ambari-web/app/styles/wizard.less| 19 ++-
 .../common/configs/service_config_category.hbs   |  8 +---
 4 files changed, 34 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e23fa28/ambari-web/app/styles/modal_popups.less
--
diff --git a/ambari-web/app/styles/modal_popups.less 
b/ambari-web/app/styles/modal_popups.less
index abe1c63..dc951c9 100644
--- a/ambari-web/app/styles/modal_popups.less
+++ b/ambari-web/app/styles/modal_popups.less
@@ -329,6 +329,12 @@
 }
 
 .host-progress-popup {
+  .modal.with-footer{
+padding-right: 0;
+.modal-lg.modal-dialog{
+  width: 98%;
+}
+  }
   .task-detail-info {
 
 .task-detail-log-info {
@@ -425,4 +431,4 @@
 word-wrap:break-word;
 overflow: auto;
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e23fa28/ambari-web/app/styles/service_configurations.less
--
diff --git a/ambari-web/app/styles/service_configurations.less 
b/ambari-web/app/styles/service_configurations.less
index 6da3c04..e4811d0 100644
--- a/ambari-web/app/styles/service_configurations.less
+++ b/ambari-web/app/styles/service_configurations.less
@@ -91,7 +91,6 @@
 margin-left: -5px;
   }
   .checkbox {
-line-height: 0.8em;
 &.list-inline {
   vertical-align: baseline;
   &>.ember-checkbox{
@@ -291,4 +290,8 @@
   .config-controls {
 line-height: 34px;
   }
+  .clear-left{
+clear:left;
+padding-top: 5px;
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e23fa28/ambari-web/app/styles/wizard.less
--
diff --git a/ambari-web/app/styles/wizard.less 
b/ambari-web/app/styles/wizard.less
index cb9eb92..7d425d9 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -237,8 +237,25 @@
   opacity: 0.2;
 }
   }
+  #confirm-configuration{
+.pre-scrollable{
+  margin-top: 10px;
+}
+  }
+  #kerberos-wizard-step6, #kerberos-wizard-step8{
+#common-progress-page{
+  .item{
+i{
+  position:relative;
+  top: 5px;
+  &.glyphicon-ok{
+top: 3px;
+  }
+}
+  }
+}
+  }
   #deploy {
-
 .page-bar {
   border: none;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e23fa28/ambari-web/app/templates/common/configs/service_config_category.hbs
--
diff --git 
a/ambari-web/app/templates/common/configs/service_config_category.hbs 
b/ambari-web/app/templates/common/configs/service_config_category.hbs
index 930e65d..9b86c1f 100644
--- a/ambari-web/app/templates/common/configs/service_config_category.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_category.hbs
@@ -54,14 +54,16 @@
  

   {{/unless}}
 {{/if}}
+{{#if configData.isOriginalSCP}}
+  {{#if configData.rightSideLabel}}
+{{formatWordBreak 
configData.displayName}}
+  {{/if}}
+{{/if}}
 
   {{! Here serviceConfigBinding should ideally be 
serviceConfigPropertyBinding }}
   {{#if configData.isOriginalSCP}}
 
   {{view configData.viewClass 
serviceConfigBinding="configData" 
categoryConfigsAllBinding="view.categoryConfigsAll" }}
-  {{#if configData.rightSideLabel}}
-{{formatWordBreak 
configData.displayName}}
-  {{/if}}
   {{#if configData.hintMessage}}
 

[05/53] [abbrv] ambari git commit: AMBARI-22353. Remove properties.json And Switch To Adding Properties to ResourceProviders Dynamically (dlysnichenko)

[aonishuk]

AMBARI-22353. Remove properties.json And Switch To Adding Properties to 
ResourceProviders Dynamically (dlysnichenko)


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

Branch: refs/heads/branch-3.0-perf
Commit: e77a31ab0aa7edbabba29ba8e4d40becf122deef
Parents: 24c64b4
Author: Lisnichenko Dmitro 
Authored: Mon Dec 4 18:20:26 2017 +0200
Committer: Lisnichenko Dmitro 
Committed: Mon Dec 4 18:21:17 2017 +0200

--
 ...xternalServerAuthenticationProviderTest.java |   1 -
 .../controller/ResourceProviderFactory.java |  17 +-
 .../AbstractAuthorizedResourceProvider.java |  12 +-
 .../AbstractControllerResourceProvider.java |  83 ++--
 .../internal/AbstractDRResourceProvider.java|   9 +-
 .../internal/ActionResourceProvider.java|  34 +-
 .../ActiveWidgetLayoutResourceProvider.java |   2 +-
 .../AlertDefinitionResourceProvider.java|   2 +-
 .../internal/AlertGroupResourceProvider.java|   2 +-
 .../internal/AlertHistoryResourceProvider.java  |   2 +-
 .../internal/AlertNoticeResourceProvider.java   |   2 +-
 .../internal/AlertResourceProvider.java |   2 +-
 .../internal/AlertTargetResourceProvider.java   |   2 +-
 .../AmbariPrivilegeResourceProvider.java|  36 +-
 .../internal/BlueprintResourceProvider.java |  37 +-
 .../internal/ClientConfigResourceProvider.java  |  31 +-
 ...usterKerberosDescriptorResourceProvider.java |   2 +-
 .../ClusterPrivilegeResourceProvider.java   |  31 +-
 .../internal/ClusterResourceProvider.java   |  23 +-
 .../ClusterStackVersionResourceProvider.java|   2 +-
 .../internal/ConfigGroupResourceProvider.java   |  39 +-
 .../internal/ConfigurationResourceProvider.java |   2 +-
 .../internal/CredentialResourceProvider.java|   2 +-
 .../internal/DefaultProviderModule.java |  17 +-
 .../internal/ExtensionLinkResourceProvider.java |  33 +-
 .../internal/ExtensionResourceProvider.java |  27 +-
 .../ExtensionVersionResourceProvider.java   |  32 +-
 .../internal/FeedResourceProvider.java  |  41 +-
 .../GroupPrivilegeResourceProvider.java |  42 +-
 .../internal/GroupResourceProvider.java |  32 +-
 .../HostComponentProcessResourceProvider.java   |  38 +-
 .../internal/HostComponentResourceProvider.java |  49 +-
 .../HostKerberosIdentityResourceProvider.java   |   2 +-
 .../internal/HostResourceProvider.java  |  51 +-
 .../HostStackVersionResourceProvider.java   |   2 +-
 .../internal/InstanceResourceProvider.java  |  35 +-
 .../internal/JobResourceProvider.java   |  57 ++-
 .../KerberosDescriptorResourceProvider.java |  20 +-
 .../internal/LdapSyncEventResourceProvider.java |  47 +-
 .../internal/LoggingResourceProvider.java   |   9 +-
 .../internal/MemberResourceProvider.java|  29 +-
 .../OperatingSystemResourceProvider.java|   2 +-
 .../internal/PermissionResourceProvider.java|  25 +-
 .../internal/PrivilegeResourceProvider.java |   2 +-
 .../QuickLinkArtifactResourceProvider.java  |   2 +-
 .../internal/ReadOnlyResourceProvider.java  |   7 -
 .../RecommendationResourceProvider.java |  65 ++-
 .../internal/RemoteClusterResourceProvider.java |  28 +-
 .../internal/RequestResourceProvider.java   |  25 +-
 .../RequestScheduleResourceProvider.java|  55 ++-
 .../RoleAuthorizationResourceProvider.java  |   2 +-
 ...eComponentConfigurationResourceProvider.java |   2 +-
 .../RootServiceComponentResourceProvider.java   |  31 +-
 ...ootServiceHostComponentResourceProvider.java |  34 +-
 .../internal/RootServiceResourceProvider.java   |  26 +-
 .../ServiceConfigVersionResourceProvider.java   |   2 +-
 .../internal/SettingResourceProvider.java   |   2 +-
 .../internal/StackAdvisorResourceProvider.java  |   7 +-
 .../internal/StackArtifactResourceProvider.java |   2 +-
 ...ConfigurationDependencyResourceProvider.java |  40 +-
 .../StackConfigurationResourceProvider.java |  42 +-
 .../StackDependencyResourceProvider.java|  41 +-
 ...StackLevelConfigurationResourceProvider.java |  40 +-
 .../internal/StackResourceProvider.java |  28 +-
 .../StackServiceComponentResourceProvider.java  |  52 +-
 .../internal/StackServiceResourceProvider.java  |  45 +-
 .../internal/StackVersionResourceProvider.java  |  39 +-
 .../internal/StageResourceProvider.java |   2 +-
 .../internal/TargetClusterResourceProvider.java |  31 +-
 .../internal/TaskAttemptResourceProvider.java   |  53 +-
 .../internal/TaskResourceProvider.java  |  27 +-
 .../internal/ThemeArtifactResourceProvider.java |   2 +-
 .../internal/UpgradeGroupResourceProvider.java  |   2 +-
 

[40/53] [abbrv] ambari git commit: AMBARI-22624 Modify display of compare of config versions. (atkach)

[aonishuk]

AMBARI-22624 Modify display of compare of config versions. (atkach)


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

Branch: refs/heads/branch-3.0-perf
Commit: 45f2a6e44c1b92b1f841fbe5fde762783e41be35
Parents: b1fd131
Author: Andrii Tkach 
Authored: Mon Dec 11 14:23:44 2017 +0200
Committer: Andrii Tkach 
Committed: Mon Dec 11 14:23:44 2017 +0200

--
 .../controllers/main/service/info/configs.js|  46 ++-
 ambari-web/app/messages.js  |   1 +
 .../mixins/common/configs/configs_comparator.js |   1 -
 .../app/mixins/common/configs/configs_loader.js |   8 +-
 ambari-web/app/models/configs/config_group.js   |   8 +
 ambari-web/app/styles/application.less  |   3 +
 ambari-web/app/styles/common.less   |   1 +
 .../app/styles/service_configurations.less  | 292 +++
 ambari-web/app/styles/widgets.less  |   7 +-
 ambari-web/app/templates.js |   2 +
 .../common/configs/compare_property.hbs |  38 ---
 .../common/configs/configs_comparison_cell.hbs  |  26 ++
 .../common/configs/configs_comparison_row.hbs   |  79 +
 .../app/templates/common/configs/controls.hbs   |  12 +-
 .../templates/common/configs/service_config.hbs |  30 +-
 .../common/configs/service_config_category.hbs  | 120 
 .../service_config_layout_tab_compare.hbs   |  80 +
 .../comparison/config_widget_comparison.hbs |  37 ---
 .../common/configs/widgets/controls.hbs |  15 -
 .../templates/common/filter_combo_cleanable.hbs |   7 +-
 ambari-web/app/views.js |   3 +-
 .../common/configs/compare_property_view.js |  25 --
 .../configs/config_versions_control_view.js |  35 +--
 .../configs/overriddenPropertyRow_view.js   |  31 --
 .../service_config_layout_tab_compare_view.js   |  31 ++
 .../views/common/configs/service_config_view.js |   7 +-
 .../configs/service_configs_by_category_view.js |  17 +-
 .../comparison/config_widget_comparison_view.js |  23 --
 .../app/views/common/filter_combo_cleanable.js  |   6 +-
 .../common/configs/configs_comparator_test.js   |   5 -
 .../config_versions_control_view_test.js|   1 -
 .../configs/overriddenProperty_view_test.js |  42 ---
 .../service_configs_by_category_view_test.js|  18 +-
 33 files changed, 699 insertions(+), 358 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/45f2a6e4/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js 
b/ambari-web/app/controllers/main/service/info/configs.js
index a3a4206..e143da8 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -43,11 +43,6 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.AddSecurityConfi
 
   selectedConfigGroup: null,
 
-  /**
-   * currently displayed service config version
-   */
-  displayedVersion: null,
-
   groupsStore: App.ServiceConfigGroup.find(),
 
   /**
@@ -75,6 +70,14 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.AddSecurityConfi
 return this.get('groupsStore').filterProperty('serviceName', 
this.get('content.serviceName'));
   }.property('content.serviceName', 'groupsStore.@each.serviceName'),
 
+  defaultGroup: function() {
+return this.get('configGroups').findProperty('isDefault');
+  }.property('configGroups'),
+
+  isNonDefaultGroupSelectedInCompare: function() {
+return this.get('isCompareMode') && this.get('selectedConfigGroup') && 
!this.get('selectedConfigGroup.isDefault');
+  }.property('selectedConfigGroup', 'isCompareMode'),
+
   dependentConfigGroups: function() {
 if (this.get('dependentServiceNames.length') === 0) return [];
 return this.get('groupsStore').filter(function(group) {
@@ -105,6 +108,14 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.AddSecurityConfi
   selectedVersion: null,
 
   /**
+   * currently displayed service config version
+   * @type {App.ServiceConfigVersion}
+   */
+  selectedVersionRecord: function() {
+return App.ServiceConfigVersion.find().findProperty('version', 
this.get('selectedVersion'));
+  }.property('selectedVersion'),
+
+  /**
* note passed on configs save
* @type {string}
*/
@@ -187,7 +198,9 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.AddSecurityConfi
 {
   attributeName: 'isOverridden',
   attributeValue: true,
-  caption: 'common.combobox.dropdown.overridden'

[21/53] [abbrv] ambari git commit: AMBARI-22583. Ambari should not force accounts created in IPA to be added a user named 'ambari-managed-principals' [amended] (rlevas)

[aonishuk]

AMBARI-22583. Ambari should not force accounts created in IPA to be added a 
user named 'ambari-managed-principals' [amended] (rlevas)


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

Branch: refs/heads/branch-3.0-perf
Commit: 9f93a0186c54d66d6da28edf1eeae4a554f8d28d
Parents: cfb2321
Author: Robert Levas 
Authored: Wed Dec 6 12:43:12 2017 -0500
Committer: Robert Levas 
Committed: Wed Dec 6 12:43:19 2017 -0500

--
 .../KERBEROS/1.10.3-10/configuration/kerberos-env.xml   | 1 +
 .../KERBEROS/1.10.3-30/configuration/kerberos-env.xml   | 1 +
 .../PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml   | 1 +
 3 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9f93a018/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index b144b32..3b9339a 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
@@ -359,6 +359,7 @@
   true
   false
 
+
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f93a018/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
index b144b32..3b9339a 100644
--- 
a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml
@@ -359,6 +359,7 @@
   true
   false
 
+
   
   
 preconfigure_services

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f93a018/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
index 802b96f..7250a15 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml
@@ -358,5 +358,6 @@
   true
   false
 
+
   
 

[2/2] ambari git commit: AMBARI-22650 Add ability to define packages at stack level (dsen)

[dsen]

AMBARI-22650 Add ability to define packages at stack level (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 0b1ce86bb270432b8c58c5f05a18008ea1e864ca
Parents: 481175d
Author: Dmytro Sen 
Authored: Fri Dec 15 14:16:55 2017 +0200
Committer: Dmytro Sen 
Committed: Fri Dec 15 14:16:55 2017 +0200

--
 .../controller/AmbariManagementController.java  |   8 +-
 .../AmbariManagementControllerImpl.java |  63 ++---
 .../internal/ClientConfigResourceProvider.java  |  57 +
 .../ClusterStackVersionResourceProvider.java|   2 -
 .../server/stack/ModuleFileUnmarshaller.java|   4 +-
 .../apache/ambari/server/stack/StackModule.java |   1 +
 .../apache/ambari/server/state/OsSpecific.java  | 250 +++
 .../apache/ambari/server/state/ServiceInfo.java |  12 +-
 .../ambari/server/state/ServiceOsSpecific.java  | 249 --
 .../apache/ambari/server/state/StackInfo.java   |  19 ++
 .../server/state/stack/StackMetainfoXml.java|  44 +++-
 .../stack/upgrade/RepositoryVersionHelper.java  |  16 +-
 .../AmbariManagementControllerImplTest.java |  46 ++--
 .../AmbariManagementControllerTest.java |  27 +-
 .../ClientConfigResourceProviderTest.java   |  30 +--
 ...ClusterStackVersionResourceProviderTest.java |  80 +++---
 .../HostStackVersionResourceProviderTest.java   |  30 ++-
 .../ambari/server/stack/ServiceModuleTest.java  |  10 +-
 .../stack/StackManagerCommonServicesTest.java   |  24 +-
 .../ambari/server/stack/StackManagerTest.java   |  28 ++-
 .../test/resources/stacks/HDP/0.1/metainfo.xml  |  10 +
 .../resources/stacks/HDP/2.0.1/metainfo.xml |  18 ++
 .../stacks/HDP/2.0.1/services/HIVE/metainfo.xml |   8 -
 .../HDP/0.1/metainfo.xml|  10 +
 24 files changed, 573 insertions(+), 473 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
index 6385118..c2bf783 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
@@ -57,6 +57,7 @@ import org.apache.ambari.server.state.Config;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.HostState;
 import org.apache.ambari.server.state.MaintenanceState;
+import org.apache.ambari.server.state.OsSpecific;
 import org.apache.ambari.server.state.Packlet;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
@@ -65,8 +66,8 @@ import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.ServiceFactory;
 import org.apache.ambari.server.state.ServiceGroupFactory;
 import org.apache.ambari.server.state.ServiceInfo;
-import org.apache.ambari.server.state.ServiceOsSpecific;
 import org.apache.ambari.server.state.StackId;
+import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.configgroup.ConfigGroupFactory;
 import 
org.apache.ambari.server.state.quicklinksprofile.QuickLinkVisibilityController;
@@ -870,13 +871,14 @@ public interface AmbariManagementController {
   Set 
getResourceLevelClusterSettings(Set requests) throws 
AmbariException;
 
   /**
+   * @param stackInfo stack info for a given service stack
* @param serviceInfo service info for a given service
* @param hostParams parameter map. May be changed during method execution
* @param osFamily os family for host
-   * @return a full list of package dependencies for a service that should be
+   * @return a full list of package dependencies for a stack service that 
should be
* installed on a host
*/
-  List getPackagesForServiceHost(ServiceInfo 
serviceInfo,
+  List getPackagesForStackServiceHost(StackInfo stackInfo, 
ServiceInfo serviceInfo,
 Map hostParams, String osFamily);
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

[1/2] ambari git commit: AMBARI-22650 Add ability to define packages at stack level (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 481175d12 -> 0b1ce86bb


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
index 6c95c53..9ad233f 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java
@@ -68,11 +68,12 @@ import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.Host;
+import org.apache.ambari.server.state.OsSpecific;
 import org.apache.ambari.server.state.RepositoryVersionState;
 import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.ServiceInfo;
-import org.apache.ambari.server.state.ServiceOsSpecific;
 import org.apache.ambari.server.state.StackId;
+import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.cluster.ClusterImpl;
 import org.apache.ambari.server.topology.TopologyManager;
 import org.apache.ambari.server.utils.StageUtils;
@@ -215,12 +216,12 @@ public class HostStackVersionResourceProviderTest {
 
 
 
-final ServiceOsSpecific.Package hivePackage = new 
ServiceOsSpecific.Package();
+final OsSpecific.Package hivePackage = new OsSpecific.Package();
 hivePackage.setName("hive");
-final ServiceOsSpecific.Package mysqlPackage = new 
ServiceOsSpecific.Package();
+final OsSpecific.Package mysqlPackage = new OsSpecific.Package();
 mysqlPackage.setName("mysql");
 mysqlPackage.setSkipUpgrade(Boolean.TRUE);
-List packages = Arrays.asList(hivePackage, 
mysqlPackage);
+List packages = Arrays.asList(hivePackage, 
mysqlPackage);
 
 AbstractControllerResourceProvider.init(resourceProviderFactory);
 
@@ -231,7 +232,7 @@ public class HostStackVersionResourceProviderTest {
 
expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes();
 
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
 
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
-
expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class),
+
expect(managementController.getPackagesForStackServiceHost(anyObject(StackInfo.class),anyObject(ServiceInfo.class),
 EasyMock.anyObject(), 
anyObject(String.class))).andReturn(packages).anyTimes();
 
 
expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), 
EasyMock.anyObject(),
@@ -241,10 +242,12 @@ public class HostStackVersionResourceProviderTest {
 expect(clusters.getHost(anyObject(String.class))).andReturn(host1);
 
expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce();
 expect(cluster.getServices()).andReturn(new HashMap<>()).anyTimes();
+expect(cluster.getClusterId()).andReturn(1L).anyTimes();
 expect(cluster.getCurrentStackVersion()).andReturn(stackId);
 
expect(cluster.getServiceComponentHosts(anyObject(String.class))).andReturn(schs).anyTimes();
 
 expect(sch.getServiceName()).andReturn("HIVE").anyTimes();
+expect(sch.getServiceType()).andReturn("HIVE").anyTimes();
 
 expect(
 repositoryVersionDAOMock.findByStackAndVersion(
@@ -311,12 +314,12 @@ public class HostStackVersionResourceProviderTest {
 
 ServiceComponentHost sch = createMock(ServiceComponentHost.class);
 
-final ServiceOsSpecific.Package hivePackage = new 
ServiceOsSpecific.Package();
+final OsSpecific.Package hivePackage = new OsSpecific.Package();
 hivePackage.setName("hive");
-final ServiceOsSpecific.Package mysqlPackage = new 
ServiceOsSpecific.Package();
+final OsSpecific.Package mysqlPackage = new OsSpecific.Package();
 mysqlPackage.setName("mysql");
 mysqlPackage.setSkipUpgrade(Boolean.TRUE);
-List packages = Arrays.asList(hivePackage, 
mysqlPackage);
+List packages = Arrays.asList(hivePackage, 
mysqlPackage);
 
 AbstractControllerResourceProvider.init(resourceProviderFactory);
 
@@ -327,7 +330,7 @@ public class HostStackVersionResourceProviderTest {
 
expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes();
 
expect(managementController.getActionManager()).andReturn(actionManager).anyTimes();
 
expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes();
-