ambari git commit: AMBARI-21782 - Service Accounts page shows no data for stack services after Ambari is upgraded on IOP cluster (jonathanhurley)

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 790d52d2c -> 82af190fb


AMBARI-21782 - Service Accounts page shows no data for stack services after 
Ambari is upgraded on IOP cluster (jonathanhurley)


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

Branch: refs/heads/branch-2.6
Commit: 82af190fb5c30e2eb536f0c1f9afe7ec61fe15c5
Parents: 790d52d
Author: Jonathan Hurley 
Authored: Tue Aug 22 14:56:19 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 22 16:31:41 2017 -0400

--
 .../BigInsights/4.0/configuration/cluster-env.xml  |  6 +-
 .../services/AMBARI_METRICS/configuration/ams-env.xml  |  4 
 .../4.0/services/FLUME/configuration/flume-env.xml |  5 +
 .../4.0/services/HBASE/configuration/hbase-env.xml |  4 
 .../4.0/services/HDFS/configuration/hadoop-env.xml |  8 
 .../4.0/services/HIVE/configuration/hive-env.xml   | 13 +
 .../4.0/services/KAFKA/configuration/kafka-env.xml |  4 
 .../4.0/services/KNOX/configuration/knox-env.xml   |  8 
 .../4.0/services/OOZIE/configuration/oozie-env.xml |  4 
 .../4.0/services/SOLR/configuration/solr-env.xml   |  4 
 .../4.0/services/SPARK/configuration/spark-env.xml |  8 
 .../4.0/services/SQOOP/configuration/sqoop-env.xml |  4 
 .../services/YARN/configuration-mapred/mapred-env.xml  |  4 
 .../4.0/services/YARN/configuration/yarn-env.xml   |  4 
 .../services/ZOOKEEPER/configuration/zookeeper-env.xml |  4 
 .../4.2/services/FLUME/configuration/flume-env.xml |  4 
 .../4.2/services/HBASE/configuration/hbase-env.xml |  4 
 .../4.2/services/HDFS/configuration/hadoop-env.xml |  8 
 .../4.2/services/HIVE/configuration/hive-env.xml   | 12 
 .../4.2/services/KAFKA/configuration/kafka-env.xml |  4 
 .../4.2/services/KNOX/configuration/knox-env.xml   |  8 
 .../4.2/services/OOZIE/configuration/oozie-env.xml |  4 
 .../4.2/services/RANGER/configuration/ranger-env.xml   |  1 +
 .../4.2/services/RANGER_KMS/configuration/kms-env.xml  |  8 
 .../4.2/services/SOLR/configuration/solr-env.xml   |  4 
 .../4.2/services/SPARK/configuration/spark-env.xml |  8 
 .../4.2/services/SQOOP/configuration/sqoop-env.xml |  4 
 .../4.2/services/TITAN/configuration/titan-env.xml |  4 
 .../services/YARN/configuration-mapred/mapred-env.xml  |  4 
 .../4.2/services/YARN/configuration/yarn-env.xml   |  4 
 .../services/ZOOKEEPER/configuration/zookeeper-env.xml |  4 
 31 files changed, 168 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/82af190f/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
index 21a180e..7c4a8a1 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/configuration/cluster-env.xml
@@ -88,7 +88,11 @@
 
 USER
 User executing service checks
-
+
+user
+false
+
+  
 
 smokeuser_keytab
 /etc/security/keytabs/smokeuser.headless.keytab

http://git-wip-us.apache.org/repos/asf/ambari/blob/82af190f/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
index 158c68f..a654eec 100755
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/configuration/ams-env.xml
@@ -26,6 +26,10 @@
 
 USER
 Ambari Metrics User Name.
+
+  user
+  false
+
   
   
 metrics_collector_log_dir

http://git-wip-us.apache.org/repos/asf/ambari/blob/82af190f/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/FLUME/configuration/flume-env.xml

ambari git commit: AMBARI-21728. Service and Patch Upgrade Catalog Changes for 2.6 - additional fixes - remove unused imports

[adoroszlai]

Repository: ambari
Updated Branches:
  refs/heads/trunk dee7317e0 -> 18b44d414


AMBARI-21728. Service and Patch Upgrade Catalog Changes for 2.6 - additional 
fixes - remove unused imports


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

Branch: refs/heads/trunk
Commit: 18b44d414f8f5b0e2e47092312473be58848d5d3
Parents: dee7317
Author: Attila Doroszlai 
Authored: Tue Aug 22 21:44:24 2017 +0200
Committer: Attila Doroszlai 
Committed: Tue Aug 22 21:44:24 2017 +0200

--
 .../apache/ambari/server/upgrade/UpgradeCatalog300Test.java| 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/18b44d41/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
index 4de7e11..53518dd 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
@@ -36,19 +36,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.Cache;
 import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
 
 import org.apache.ambari.server.actionmanager.ActionManager;
 import org.apache.ambari.server.configuration.Configuration;

[ambari] Git Push Summary

[avijayan]

Repository: ambari
Updated Tags:  refs/tags/release-2.5.2-rc0 [created] 166a53611

[ambari] Git Push Summary

[avijayan]

Repository: ambari
Updated Tags:  refs/tags/release-2.5.2-rc0 [deleted] f41ace9eb

ambari git commit: AMBARI-21752 : Use Mpack metadata for iterating over list of packlets to expand (mradhakrishnan)

[mradhakrishnan]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 67cacc8ab -> 24f40aa1e


AMBARI-21752 : Use Mpack metadata for iterating over list of packlets to expand 
(mradhakrishnan)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 24f40aa1e815a0deedc709a732cef075bef59521
Parents: 67cacc8
Author: Madhuvanthi Radhakrishnan 
Authored: Tue Aug 22 11:07:06 2017 -0700
Committer: Madhuvanthi Radhakrishnan 
Committed: Tue Aug 22 11:07:06 2017 -0700

--
 .../ambari/server/mpack/MpackManager.java   | 40 +---
 .../org/apache/ambari/server/state/Packlet.java | 33 +---
 .../AmbariManagementControllerImplTest.java |  4 +-
 .../internal/MpackResourceProviderTest.java |  4 +-
 .../apache/ambari/server/state/MpackTest.java   |  8 ++--
 5 files changed, 45 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/24f40aa1/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java 
b/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java
index a8a227b..e475e96 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/mpack/MpackManager.java
@@ -184,7 +184,7 @@ public class MpackManager {
* @param tarPath
* @throws IOException
*/
-  private void extractTar(Path tarPath, File tempOutputDirectory) throws 
IOException{
+  private void extractTar(Path tarPath, File tempOutputDirectory) throws 
IOException {
 TarArchiveInputStream tarFile = new TarArchiveInputStream(new 
GzipCompressorInputStream(new BufferedInputStream(new FileInputStream(new 
File(String.valueOf(tarPath));
 TarArchiveEntry entry = null;
 File outputFile = null;
@@ -228,35 +228,32 @@ public class MpackManager {
 (Paths.get(mpacksStaging + File.separator + 
mpackTarDirectory.substring(mpackTarDirectory.lastIndexOf('/') + 1, 
mpackTarDirectory.indexOf(".tar")) + File.separator),
 Paths.get(mpackDirectory), 
StandardCopyOption.REPLACE_EXISTING);
 
-createServicesDirectory(extractedMpackDirectory);
+createServicesDirectory(extractedMpackDirectory, mpack);
 createSymLinks(mpack);
   }
 
   /***
* Create a services directory and extract all the services tar file inside 
it. This readies it for cluster deployment
* @param extractedMpackDirectory
+   * @param mpack
* @throws IOException
*/
-  private void createServicesDirectory(Path extractedMpackDirectory) throws 
IOException {
+  private void createServicesDirectory(Path extractedMpackDirectory, Mpack 
mpack) throws IOException {
 File servicesDir = new File(extractedMpackDirectory.toAbsolutePath() + 
File.separator + SERVICES_DIRECTORY);
 if (!servicesDir.exists()) {
   servicesDir.mkdir();
 }
-File packletDir = new File(extractedMpackDirectory.toAbsolutePath() + 
File.separator + PACKLETS_DIRECTORY);
-for (final File serviceTar : packletDir.listFiles()) {
-  String serviceName = serviceTar.getName();
-  if (serviceName.contains("tar.gz")) {
-extractTar(serviceTar.toPath(), packletDir);
-String serviceTarDirectory = serviceTar.toString();
-String serviceNameVersion = 
serviceTarDirectory.substring(serviceTarDirectory.lastIndexOf('/') + 1, 
serviceTarDirectory.indexOf(".tar"));
-String serviceFolderName = 
serviceNameVersion.substring(0,serviceNameVersion.indexOf("-packlet")); //Can 
we assume the names of the tar files?
-Path extractedServiceDirectory = Files.move
-(Paths.get(packletDir + File.separator + serviceNameVersion),
-Paths.get(servicesDir.toPath() + File.separator + 
serviceFolderName ), StandardCopyOption.REPLACE_EXISTING);
+ArrayList packletArrayList = mpack.getPacklets();
+
+for (Packlet packlet : packletArrayList) {
+  if (packlet.getType() == Packlet.PackletType.SERVICE_PACKLET) {
+String packletSourceLocation = packlet.getSourceLocation();
+File serviceTargetDir = new File(servicesDir + File.separator + 
packlet.getName());
+extractTar(Paths.get(extractedMpackDirectory + File.separator + 
packlet.getSourceLocation()) , servicesDir );
+Path extractedServiceDirectory = Files.move(Paths.get(servicesDir + 
File.separator + 

ambari git commit: AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined during package installation (ncole)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 6e5fbe519 -> 589d96763


AMBARI-21781. Error: Repositories for os type redhat-ppc7 are not defined 
during package installation (ncole)


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

Branch: refs/heads/branch-2.5
Commit: 589d967638bc72ea1596e60bb0c1b358e888ea09
Parents: 6e5fbe5
Author: Nate Cole 
Authored: Tue Aug 22 12:18:01 2017 -0400
Committer: Nate Cole 
Committed: Tue Aug 22 14:03:59 2017 -0400

--
 .../ClusterStackVersionResourceProvider.java|  52 +
 ...ClusterStackVersionResourceProviderTest.java | 210 +++
 2 files changed, 214 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/589d9676/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 b489d7f..aba8b9c 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
@@ -506,16 +506,15 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 final AmbariManagementController managementController = 
getManagementController();
 final AmbariMetaInfo ami = managementController.getAmbariMetaInfo();
 
-String osFamily = getPowerPCOsFamily(hosts);
 // build the list of OS repos
 List operatingSystems = 
repoVersionEnt.getOperatingSystems();
 Map perOsRepos = new HashMap<>();
 for (OperatingSystemEntity operatingSystem : operatingSystems) {
-  String osType = getOsTypeForRepo(operatingSystem, osFamily);
-  if (operatingSystem.isAmbariManagedRepos()) {
-perOsRepos.put(osType, operatingSystem.getRepositories());
+
+if (operatingSystem.isAmbariManagedRepos()) {
+perOsRepos.put(operatingSystem.getOsType(), 
operatingSystem.getRepositories());
   } else {
-perOsRepos.put(osType, Collections. emptyList());
+perOsRepos.put(operatingSystem.getOsType(), 
Collections. emptyList());
   }
 }
 
@@ -1089,47 +1088,4 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
   amc.getAuthName(), serviceNote);
 }
   }
-
-  /**
-   * Check one host is enough to tell the arch
-   * because all hosts should have the same arch.
-   * @param hosts List
-   * @return osFamily, null if hosts is empty or is X86_64
-
-   */
-  private String getPowerPCOsFamily(List hosts) {
-if (hosts.isEmpty()){
-  return null;
-} else {
-  Host host = hosts.get(0);
-  String osFamily = host.getHostAttributes().get("os_family");
-  if (null != osFamily && osFamily.endsWith("-ppc")){
-return osFamily;
-  } else {
-return null;
-  }
-}
-  }
-
-  /**
-   * Use os type with -ppc post fix for powerpc
-   * in order to have it consistent with the os information
-   * stored in the Hosts table
-   * No need to apply the change if os is x86_64
-   * */
-  private String getOsTypeForRepo(OperatingSystemEntity operatingSystem, 
String osFamily) {
-if (null != osFamily){
-  String osType = operatingSystem.getOsType();
-  int pos = osFamily.indexOf("-ppc");
-  if (pos > 0){
-String os = osType.substring(0, pos);
-String majorVersion = osType.substring(os.length());
-return String.format("%s-ppc%s", os, majorVersion);
-  } else {
-return operatingSystem.getOsType();
-  }
-} else {
-  return operatingSystem.getOsType();
-}
-  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/589d9676/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
index 68596e0..5627756 100644
--- 

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

[ababiichuk]

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


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 5895040c8a3374012c11f0e351c8ba631a689ae7
Parents: d690844
Author: Vitaly Brodetskyi 
Authored: Mon Aug 21 23:57:12 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Mon Aug 21 23:57:12 2017 +0300

--
 .../ambari/server/state/cluster/ClusterImpl.java | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5895040c/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 84b411c..26be06e 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
@@ -1797,22 +1797,29 @@ public class ClusterImpl implements Cluster {
 
 // disable all configs related to service
 if (serviceConfigEntity.getGroupId() == null) {
+  // Here was fixed bug with entity changes revert. More you can find here 
AMBARI-21173.
+  // This issue reproduces only if you are changing same entity in first 
and second loop.
+  // In that case eclipselink will revert changes to cached, if entity has 
fluchGroup and it
+  // needs to be refreshed. Actually we don't need to change same antities 
in few steps, so i
+  // decided to filter out. duplicates and do not change them. It will be 
better for performance and bug will be fixed.
   Collection configTypes = serviceConfigTypes.get(serviceName);
   List enabledConfigs = 
clusterDAO.getEnabledConfigsByTypes(clusterId, configTypes);
   List serviceConfigEntities = 
serviceConfigEntity.getClusterConfigEntities();
   ArrayList duplicatevalues = new 
ArrayList<>(serviceConfigEntities);
   duplicatevalues.retainAll(enabledConfigs);
-  enabledConfigs.removeAll(duplicatevalues);
-  serviceConfigEntities.removeAll(duplicatevalues);
 
   for (ClusterConfigEntity enabledConfig : enabledConfigs) {
-enabledConfig.setSelected(false);
-clusterDAO.merge(enabledConfig);
+if (!duplicatevalues.contains(enabledConfig)) {
+  enabledConfig.setSelected(false);
+  clusterDAO.merge(enabledConfig);
+}
   }
 
   for (ClusterConfigEntity configEntity : serviceConfigEntities) {
-configEntity.setSelected(true);
-clusterDAO.merge(configEntity);
+if (!duplicatevalues.contains(configEntity)) {
+  configEntity.setSelected(true);
+  clusterDAO.merge(configEntity);
+}
   }
 } else {
   Long configGroupId = serviceConfigEntity.getGroupId();

[16/35] ambari git commit: AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in Zeppelin(Prabhjyot Singh via Venkata Sairam)

[ababiichuk]

AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in 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/6fb37195
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6fb37195
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6fb37195

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 6fb371957ad5612e3a6b2c639dec559aacf5a15d
Parents: 705a62b
Author: Venkata Sairam 
Authored: Mon Aug 21 14:03:58 2017 +0530
Committer: Venkata Sairam 
Committed: Mon Aug 21 14:03:58 2017 +0530

--
 .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb37195/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
index 971e4af..742f5be 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
@@ -61,6 +61,12 @@ sessionManager = 
org.apache.shiro.web.session.mgt.DefaultWebSessionManager
 cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager
 securityManager.cacheManager = $cacheManager
 
+cookie = org.apache.shiro.web.servlet.SimpleCookie
+cookie.name = JSESSIONID
+cookie.secure = true
+cookie.httpOnly = true
+sessionManager.sessionIdCookie = $cookie
+
 securityManager.sessionManager = $sessionManager
 # 86,400,000 milliseconds = 24 hour
 securityManager.sessionManager.globalSessionTimeout = 8640

[04/35] ambari git commit: AMBARI-21745 UI: remove code which adds ELExtension properties while adding Falcon. (atkach)

[ababiichuk]

AMBARI-21745 UI: remove code which adds ELExtension properties while adding 
Falcon. (atkach)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 9a08bce35082f7e9ada7022c9e6bbf1b769348c4
Parents: b428fb9
Author: Andrii Tkach 
Authored: Thu Aug 17 19:03:43 2017 +0300
Committer: Andrii Tkach 
Committed: Fri Aug 18 12:14:53 2017 +0300

--
 ambari-web/app/controllers/main/service/item.js | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9a08bce3/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 197eb8e..224f83b 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -148,6 +148,10 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   
App.StackService.find(this.get('content.serviceName')).get('dependentServiceNames')
 : [];
   }.property('content.serviceName', 
'App.router.clusterController.isConfigsPropertiesLoaded'),
 
+  configDependentServiceNames: function() {
+return 
this.get('dependentServiceNames').concat(App.StackService.find(this.get('content.serviceName')).get('requiredServices'))
+  }.property('dependentServiceNames'),
+
   /**
* List of service names that could be deleted
* Common case when there is only current service should be removed
@@ -171,7 +175,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
* @type {String[]}
*/
   sitesToLoad: function() {
-var services = this.get('dependentServiceNames'), configTypeList = [];
+var services = this.get('configDependentServiceNames'), configTypeList = 
[];
 if (services.length) {
   configTypeList = App.StackService.find().filter(function(s) {
 return services.contains(s.get('serviceName'));
@@ -225,7 +229,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   allConfigs = allConfigs.concat(App.config.getConfigsFromJSON(site, 
true));
 });
 
-self.get('dependentServiceNames').forEach(function(serviceName) {
+self.get('configDependentServiceNames').forEach(function(serviceName) {
   var configTypes = 
App.StackService.find(serviceName).get('configTypeList');
   var configsByService = allConfigs.filter(function (c) {
 return 
configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename')));

[24/35] ambari git commit: AMBARI-21765. Missing hdfs_scheme variable in params.py file for Apache Knox (Sandeep More via smohanty)

[ababiichuk]

AMBARI-21765. Missing hdfs_scheme variable in params.py file for Apache Knox 
(Sandeep More via smohanty)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 8e33d8864aa0d1cb5be00241be5900d9fa9310dd
Parents: c129baa
Author: Sumit Mohanty 
Authored: Mon Aug 21 14:00:40 2017 -0700
Committer: Sumit Mohanty 
Committed: Mon Aug 21 14:01:19 2017 -0700

--
 .../0.5.0.2.2/package/scripts/params_linux.py   | 27 
 .../0.5.0.3.0/package/scripts/params_linux.py   | 26 +++
 2 files changed, 53 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e33d886/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 7ddf0c8..97b90af 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -150,17 +150,30 @@ else:
 
 has_namenode = not namenode_host == None
 namenode_http_port = "50070"
+namenode_https_port = "50470"
 namenode_rpc_port = "8020"
 
 if has_namenode:
   if 'dfs.namenode.http-address' in config['configurations']['hdfs-site']:
 namenode_http_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.http-address'])
+  if 'dfs.namenode.https-address' in config['configurations']['hdfs-site']:
+namenode_https_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.https-address'])
   if dfs_ha_enabled and namenode_rpc:
 namenode_rpc_port = get_port_from_url(namenode_rpc)
   else:
 if 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']:
   namenode_rpc_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.rpc-address'])
 
+dfs_http_policy = default('/configurations/hdfs-site/dfs.http.policy', None)
+
+hdfs_https_on = False
+hdfs_scheme = 'http'
+if dfs_http_policy  !=  None :
+   hdfs_https_on = (dfs_http_policy.upper() == 'HTTPS_ONLY')
+   hdfs_scheme = 'http' if not hdfs_https_on else 'https'
+   hdfs_port = str(namenode_http_port)  if not hdfs_https_on else 
str(namenode_https_port)
+   namenode_http_port = hdfs_port
+
 webhdfs_service_urls = ""
 
 def buildUrlElement(protocol, hdfs_host, port, servicePath) :
@@ -181,6 +194,13 @@ else:
   webhdfs_service_urls = buildUrlElement("http", namenode_host, 
namenode_http_port, "/webhdfs")
 
 
+yarn_http_policy = default('/configurations/yarn-site/yarn.http.policy', None )
+yarn_https_on = False
+yarn_scheme = 'http'
+if yarn_http_policy !=  None :
+   yarn_https_on = ( yarn_http_policy.upper() == 'HTTPS_ONLY')
+   yarn_scheme = 'http' if not yarn_https_on else 'https'
+   
 rm_hosts = default("/clusterHostInfo/rm_host", None)
 if type(rm_hosts) is list:
   rm_host = rm_hosts[0]
@@ -220,17 +240,24 @@ if type(hbase_master_hosts) is list:
 else:
   hbase_master_host = hbase_master_hosts
 
+oozie_https_port = None
 oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
 if type(oozie_server_hosts) is list:
   oozie_server_host = oozie_server_hosts[0]
 else:
   oozie_server_host = oozie_server_hosts
 
+oozie_scheme = 'http'
 has_oozie = not oozie_server_host == None
 oozie_server_port = "11000"
 
 if has_oozie:
   oozie_server_port = 
get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
+  oozie_https_port = default("/configurations/oozie-site/oozie.https.port", 
None)
+  
+if oozie_https_port is not None:
+   oozie_scheme = 'https'
+   oozie_server_port = oozie_https_port
 
 # Knox managed properties
 knox_managed_pid_symlink= format('{stack_root}/current/knox-server/pids')

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e33d886/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
index b39123d..f0fef6e 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
+++ 

[05/35] ambari git commit: AMBARI-21754 /v1/persist API call is made 1000 times per minute after Ambari upgrade. (atkach)

[ababiichuk]

AMBARI-21754 /v1/persist API call is made 1000 times per minute after Ambari 
upgrade. (atkach)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 7ffda34d6120c65c2a546f0208c1d495e52aa666
Parents: 9a08bce
Author: Andrii Tkach 
Authored: Fri Aug 18 13:23:14 2017 +0300
Committer: Andrii Tkach 
Committed: Fri Aug 18 13:52:21 2017 +0300

--
 ambari-web/app/controllers/main/host/details.js | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ffda34d/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 20b14ee..abf7673 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -369,13 +369,17 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
 var dfd = $.Deferred();
 var miscController = App.MainAdminServiceAccountsController.create();
 miscController.loadUsers();
-var interval = setInterval(function () {
+miscController.addObserver('dataIsLoaded', this, function() {
   if (miscController.get('dataIsLoaded') && miscController.get('users')) {
-self.set('hdfsUser', miscController.get('users').findProperty('name', 
'hdfs_user').get('value'));
+if (miscController.get('users').someProperty('name', 'hdfs_user')) {
+  self.set('hdfsUser', 
miscController.get('users').findProperty('name', 'hdfs_user').get('value'));
+} else {
+  self.set('hdfsUser', 'hdfs-user');
+}
 dfd.resolve();
-clearInterval(interval);
+miscController.destroy();
   }
-}, 10);
+});
 return dfd.promise();
   },
 

[09/35] ambari git commit: Revert "AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg (dlysnichenko)"

[ababiichuk]

Revert "AMBARI-21744. package_regex in get_package_from_available() can match 
wrong pkg (dlysnichenko)"

This reverts commit aa4807ca3a850d3275b11c9ee41a0cb6c5328b9c.


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: ca8ae51afeff209657c19182d77e59a34cf6c0ae
Parents: 5f6ce4e
Author: Lisnichenko Dmitro 
Authored: Fri Aug 18 18:14:55 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Fri Aug 18 18:16:12 2017 +0300

--
 .../src/main/python/resource_management/libraries/script/script.py  | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ca8ae51a/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 6e26d99..90337f4 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -473,7 +473,6 @@ class Script(object):
   return name
 package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
 package_regex = name.replace(STACK_VERSION_PLACEHOLDER, 
'(\d|{0})+'.format(package_delimiter))
-package_regex = "^{0}$".format(package_regex)
 for package in available_packages_in_repos:
   if re.match(package_regex, package):
 return package

[35/35] ambari git commit: Merge branch 'trunk' into branch-feature-logsearch-ui

[ababiichuk]

Merge branch 'trunk' into branch-feature-logsearch-ui


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 0e5bf39010f5cb6258d91526e6cf5bc58295110a
Parents: 01a3bc7 dee7317
Author: ababiichuk 
Authored: Tue Aug 22 20:49:15 2017 +0300
Committer: ababiichuk 
Committed: Tue Aug 22 20:49:15 2017 +0300

--
 .../core/providers/package/__init__.py  |  17 +-
 .../core/providers/package/yumrpm.py|  32 +-
 .../ambari-logsearch-assembly/pom.xml   |   3 +-
 ambari-metrics/ambari-metrics-assembly/pom.xml  |   2 +
 .../conf/unix/metric_monitor.ini|   2 +
 .../src/main/python/core/config_reader.py   |   8 +
 .../src/main/python/core/emitter.py |  58 +-
 .../src/main/python/core/krberr.py  |  42 ++
 .../main/python/core/spnego_kerberos_auth.py| 164 ++
 .../src/test/python/core/TestEmitter.py |  24 +
 ambari-project/pom.xml  |   1 +
 ambari-server/pom.xml   |   2 +-
 .../server/api/services/AmbariMetaInfo.java |   9 +-
 .../checks/DatabaseConsistencyCheckHelper.java  |  62 ---
 .../AmbariManagementControllerImpl.java |  15 +-
 .../internal/ServiceResourceProvider.java   |  10 +
 .../VersionDefinitionResourceProvider.java  |  10 +-
 .../apache/ambari/server/orm/DBAccessor.java|  55 ++
 .../ambari/server/orm/DBAccessorImpl.java   | 119 +
 .../server/orm/dao/RepositoryVersionDAO.java|  20 +
 .../orm/entities/RepositoryVersionEntity.java   |  11 +-
 .../server/orm/helpers/dbms/DbmsHelper.java |  27 +
 .../orm/helpers/dbms/GenericDbmsHelper.java |  14 +
 .../server/orm/helpers/dbms/H2Helper.java   |  16 +
 .../server/orm/helpers/dbms/MySqlHelper.java|  16 +
 .../server/orm/helpers/dbms/OracleHelper.java   |  16 +
 .../server/orm/helpers/dbms/PostgresHelper.java |  15 +
 .../kerberos/DeconstructedPrincipal.java|   2 +-
 .../apache/ambari/server/state/StackInfo.java   |  17 +
 .../server/state/cluster/ClusterImpl.java   |  19 +-
 .../state/repository/VersionDefinitionXml.java  |   7 +
 .../server/state/stack/LatestRepoCallable.java  |  80 ++-
 .../ambari/server/topology/AmbariContext.java   |  58 +-
 .../server/topology/PersistedStateImpl.java |  23 +-
 .../server/upgrade/SchemaUpgradeHelper.java |   1 +
 .../server/upgrade/UpgradeCatalog252.java   | 225 
 .../server/upgrade/UpgradeCatalog260.java   | 325 
 .../server/upgrade/UpgradeCatalog300.java   |  97 +---
 .../python/ambari_server/serverConfiguration.py |   4 +-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |   5 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   4 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   2 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql|   2 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   2 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   9 +-
 .../AMBARI_METRICS/0.1.0/kerberos.json  |  26 +
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |   8 +
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |  33 +-
 .../0.1.0/package/scripts/params.py |   7 +-
 .../package/templates/metric_monitor.ini.j2 |   2 +
 .../DRUID/0.9.2/package/scripts/druid.py|  38 +-
 .../DRUID/0.9.2/package/scripts/params.py   |  13 +
 .../0.5.0.2.1/configuration/oozie-site.xml  | 208 
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 218 
 .../HIVE/0.12.0.2.0/metainfo.xml|   1 +
 .../0.12.0.2.0/package/scripts/params_linux.py  |  11 +
 .../0.5.0.2.2/package/scripts/params_linux.py   |  27 +
 .../0.5.0.3.0/package/scripts/params_linux.py   |  26 +
 .../SPARK/2.2.0/service_advisor.py  |  48 +-
 .../0.6.0.2.5/configuration/zeppelin-env.xml|   5 +-
 .../configuration/zeppelin-shiro-ini.xml|   6 +
 .../0.6.0.3.0/configuration/zeppelin-env.xml|  13 +-
 .../ZEPPELIN/0.6.0.3.0/service_advisor.py   |  46 +-
 .../FALCON/configuration/oozie-site.xml | 198 ---
 .../FALCON/configuration/oozie-site.xml | 197 ---
 .../stacks/HDP/2.3/services/stack_advisor.py| 113 
 .../FALCON/configuration/oozie-site.xml |  47 --
 .../stacks/HDP/2.5/services/SPARK/kerberos.json |   3 +-
 .../stacks/HDP/2.5/services/stack_advisor.py|  76 ++-
 .../stacks/HDP/2.6/services/SPARK/kerberos.json |   3 +-
 .../HDP/2.6/services/SPARK2/kerberos.json   |   3 +-
 .../stacks/HDP/2.6/services/stack_advisor.py| 109 +++-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  14 +
 

[20/35] ambari git commit: AMBARI-21756. Use latest-vdf for default when version is unspecified (ncole)

[ababiichuk]

AMBARI-21756. Use latest-vdf for default when version is unspecified (ncole)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 15aa0375e8c79bbaab237a28c1f0b78275f551f6
Parents: 28a4223
Author: Nate Cole 
Authored: Mon Aug 21 13:01:34 2017 -0400
Committer: Nate Cole 
Committed: Mon Aug 21 13:01:34 2017 -0400

--
 .../server/api/services/AmbariMetaInfo.java |  9 ++-
 .../VersionDefinitionResourceProvider.java  |  6 +-
 .../apache/ambari/server/state/StackInfo.java   | 17 +
 .../state/repository/VersionDefinitionXml.java  |  7 ++
 .../server/state/stack/LatestRepoCallable.java  | 80 +++-
 .../ambari/server/topology/AmbariContext.java   | 50 +++-
 .../server/api/services/AmbariMetaInfoTest.java | 30 
 .../AmbariManagementControllerTest.java |  2 +-
 .../VersionDefinitionResourceProviderTest.java  | 14 +---
 .../ambari/server/stack/StackManagerTest.java   |  5 +-
 .../server/topology/AmbariContextTest.java  | 40 --
 .../resources/stacks/HDP/2.2.0/repos/hdp.json   |  4 +
 .../stacks/HDP/2.2.0/repos/repoinfo.xml |  8 ++
 .../stacks/HDP/2.2.0/repos/version-2.2.0.5.xml  | 51 +
 .../resources/stacks/HDP/2.2.1/metainfo.xml | 24 ++
 .../resources/stacks/HDP/2.2.1/repos/hdp.json   |  7 ++
 .../stacks/HDP/2.2.1/repos/repoinfo.xml | 36 +
 .../HDP/2.2.1/services/RANGER/alerts.json   | 74 ++
 18 files changed, 418 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/15aa0375/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index eb97ee3..7eb82e4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -1381,7 +1381,14 @@ public class AmbariMetaInfo {
 
   if (stack.isActive() && stack.isValid()) {
 try {
-  VersionDefinitionXml xml = VersionDefinitionXml.build(stack);
+  // !!! check for a "latest-vdf" one.  This will be used for the 
default if one is not found.
+  VersionDefinitionXml xml = stack.getLatestVersionDefinition();
+
+  if (null == xml) {
+// !!! "latest-vdf" was not found, use the stack.  this is the 
last-ditch effort
+xml = VersionDefinitionXml.build(stack);
+  }
+
   versionDefinitions.put(String.format("%s-%s", stack.getName(), 
stack.getVersion()), xml);
 } catch (Exception e) {
   LOG.warn("Could not make a stack VDF for {}-{}: {}",

http://git-wip-us.apache.org/repos/asf/ambari/blob/15aa0375/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index c789096..162c8df 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -91,10 +91,10 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
   public static final String VERSION_DEF_STACK_NAME  = 
"VersionDefinition/stack_name";
   public static final String VERSION_DEF_STACK_VERSION   = 
"VersionDefinition/stack_version";
 
-  protected static final String VERSION_DEF_ID   = 
"VersionDefinition/id";
+  public static final String VERSION_DEF_ID   = 
"VersionDefinition/id";
   protected static final String VERSION_DEF_TYPE_PROPERTY_ID = 
"VersionDefinition/type";
   protected static final String VERSION_DEF_DEFINITION_URL   = 
"VersionDefinition/version_url";
-  protected static final String VERSION_DEF_AVAILABLE_DEFINITION = 
"VersionDefinition/available";
+  public static final String VERSION_DEF_AVAILABLE_DEFINITION = 
"VersionDefinition/available";
  

[10/35] ambari git commit: Add hadoop LZO jars if installed in the cluster. (Slim Bouguerra via Swapan Shridhar).

[ababiichuk]

Add hadoop LZO jars if installed in the cluster. (Slim Bouguerra via Swapan 
Shridhar).


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: bbec0d3751b9aad709d8fbf86c2744b4bb412e2d
Parents: ca8ae51
Author: Swapan Shridhar 
Authored: Fri Aug 18 14:10:55 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Aug 18 14:10:55 2017 -0700

--
 .../DRUID/0.9.2/package/scripts/druid.py| 12 ++
 .../DRUID/0.9.2/package/scripts/params.py   | 13 +++
 .../test/python/stacks/2.6/DRUID/test_druid.py  | 24 +---
 3 files changed, 41 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bbec0d37/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
index cc02519..fa52247 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
@@ -18,6 +18,7 @@ limitations under the License.
 """
 import json
 import os
+from resource_management import Fail
 from resource_management.libraries.resources.properties_file import 
PropertiesFile
 from resource_management.core.resources.system import Directory, Execute, File
 from resource_management.core.source import DownloadSource
@@ -113,6 +114,17 @@ def druid(upgrade_type=None, nodeType=None):

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

http://git-wip-us.apache.org/repos/asf/ambari/blob/bbec0d37/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index d47e604..7e90475 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -18,6 +18,7 @@ limitations under the License.
 
 """
 from ambari_commons import OSCheck
+from resource_management.libraries.functions.get_lzo_packages import 
get_lzo_packages
 from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
 from resource_management.libraries.resources.hdfs_resource import HdfsResource
@@ -26,6 +27,7 @@ from resource_management.libraries.script.script import Script
 from resource_management.libraries.functions import format
 from resource_management.libraries.functions.get_not_managed_resources import 
get_not_managed_resources
 from resource_management.libraries.functions.default import default
+from ambari_commons.constants import AMBARI_SUDO_BINARY
 
 import status_params
 
@@ -50,10 +52,14 @@ stack_name = default("/hostLevelParams/stack_name", None)
 # stack version
 stack_version = default("/commandParams/version", None)
 
+# un-formatted stack version
+stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+
 # default role to coordinator needed for service checks
 component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "DRUID_COORDINATOR")
 
 hostname = config['hostname']
+sudo = AMBARI_SUDO_BINARY
 
 # default druid parameters
 druid_home = 

[30/35] ambari git commit: AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD Types (jonathanhurley)

[ababiichuk]

AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD 
Types (jonathanhurley)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: d2e0c42a1d6f67ade14e867d069d73b2567d685b
Parents: 6f9f87c
Author: Jonathan Hurley 
Authored: Mon Aug 21 11:52:03 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 22 11:34:06 2017 -0400

--
 .../VersionDefinitionResourceProvider.java  |  4 +++-
 .../server/orm/dao/RepositoryVersionDAO.java| 20 
 .../orm/entities/RepositoryVersionEntity.java   |  3 +++
 .../orm/dao/RepositoryVersionDAOTest.java   | 12 
 4 files changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index 162c8df..394a0bf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -437,7 +437,9 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
   return;
 }
 
-List entities = 
s_repoVersionDAO.findByStack(entity.getStackId());
+List entities = 
s_repoVersionDAO.findByStackAndType(
+entity.getStackId(), RepositoryType.STANDARD);
+
 if (entities.isEmpty()) {
   throw new IllegalArgumentException(String.format("Patch %s was uploaded, 
but there are no repositories for %s",
   entity.getVersion(), entity.getStackId().toString()));

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
index d59d229..c83375b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
@@ -134,6 +134,26 @@ public class RepositoryVersionDAO extends 
CrudDAO
   }
 
   /**
+   * Retrieves repository version by stack.
+   *
+   * @param stackId
+   *  stack id stack with major version (like HDP-2.2)
+   * @param type
+   *  the repository type
+   *
+   * @return null if there is no suitable repository version
+   */
+  @RequiresSession
+  public List findByStackAndType(StackId stackId, 
RepositoryType type) {
+final TypedQuery query = 
entityManagerProvider.get().createNamedQuery(
+"repositoryVersionByStackAndType", RepositoryVersionEntity.class);
+query.setParameter("stackName", stackId.getStackName());
+query.setParameter("stackVersion", stackId.getStackVersion());
+query.setParameter("type", type);
+return daoUtils.selectList(query);
+  }
+  
+  /**
* Validates and creates an object.
* The version must be unique within this stack name (e.g., HDP, HDPWIN, 
BIGTOP).
* @param stackEntity Stack entity.

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index c746363..c7c6ff4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -80,6 +80,9 @@ import com.google.inject.Provider;
 name = "repositoryVersionByStack",
 query = "SELECT repoversion FROM RepositoryVersionEntity repoversion 
WHERE repoversion.stack.stackName=:stackName AND 
repoversion.stack.stackVersion=:stackVersion"),
   

[25/35] ambari git commit: AMBARI-21771 : Maven cleanup of ambari-metrics and ambari-logsearch modules. (avijayan)

[ababiichuk]

AMBARI-21771 : Maven cleanup of ambari-metrics and ambari-logsearch modules. 
(avijayan)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: d5904b9a956026b9a0dcb9d5acfd6af22d3dcb67
Parents: 8e33d88
Author: Aravindan Vijayan 
Authored: Mon Aug 21 14:05:10 2017 -0700
Committer: Aravindan Vijayan 
Committed: Mon Aug 21 14:05:10 2017 -0700

--
 ambari-logsearch/ambari-logsearch-assembly/pom.xml | 3 ++-
 ambari-metrics/ambari-metrics-assembly/pom.xml | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d5904b9a/ambari-logsearch/ambari-logsearch-assembly/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-assembly/pom.xml 
b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
index 5d15b7c..e8a9426 100644
--- a/ambari-logsearch/ambari-logsearch-assembly/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
@@ -141,6 +141,7 @@
 classes/log4j.xml
 classes/logfeeder.properties
 classes/grok-patterns
+libs/checkstyle*.jar
   
 
   
@@ -294,7 +295,7 @@
 root
   
   
-
classes/log4j.xml,classes/logfeeder.properties,classes/grok-patterns
+
classes/log4j.xml,classes/logfeeder.properties,classes/grok-patterns,libs/checkstyle*.jar
   
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d5904b9a/ambari-metrics/ambari-metrics-assembly/pom.xml
--
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml 
b/ambari-metrics/ambari-metrics-assembly/pom.xml
index 6b81de5..d9875ce 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -244,6 +244,7 @@
   ${collector.dir}/target/lib
   
 *tests.jar
+findbugs*.jar
   
 
 
@@ -263,6 +264,7 @@
 bin/**
 bin/*
 lib/*tests.jar
+lib/findbugs*.jar
   
 
   

[08/35] ambari git commit: AMBARI-21749. Remove DB consistency check for topology tables (magyari_sandor)

[ababiichuk]

AMBARI-21749. Remove DB consistency check for topology tables (magyari_sandor)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 5f6ce4ea53bcaaec35040c08600d606d7d194460
Parents: 1dba778
Author: Sandor Magyari 
Authored: Fri Aug 18 13:13:29 2017 +0200
Committer: Sandor Magyari 
Committed: Fri Aug 18 15:45:14 2017 +0200

--
 .../checks/DatabaseConsistencyCheckHelper.java  | 62 ---
 .../server/topology/PersistedStateImpl.java | 23 +++
 .../DatabaseConsistencyCheckHelperTest.java | 63 
 3 files changed, 13 insertions(+), 135 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5f6ce4ea/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 66baf8e..aae34ae 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
@@ -182,7 +182,6 @@ public class DatabaseConsistencyCheckHelper {
   checkForHostsWithoutState();
   checkHostComponentStates();
   checkServiceConfigs();
-  checkTopologyTables();
   checkForLargeTables();
   LOG.info("*** Check database completed 
***");
   return checkResult;
@@ -446,67 +445,6 @@ public class DatabaseConsistencyCheckHelper {
 }
   }
 
-
-  /**
-   * This method checks that for each row in topology_request there is at 
least one row in topology_logical_request,
-   * topology_host_request, topology_host_task, topology_logical_task.
-   * */
-  static void checkTopologyTables() {
-LOG.info("Checking Topology tables");
-
-String SELECT_REQUEST_COUNT_QUERY = "select count(tpr.id) from 
topology_request tpr";
-
-String SELECT_JOINED_COUNT_QUERY = "select count(DISTINCT tpr.id) from 
topology_request tpr join " +
-  "topology_logical_request tlr on tpr.id = tlr.request_id";
-
-String SELECT_HOST_REQUEST_COUNT_QUERY = "select count(thr.id) from 
topology_host_request thr";
-
-String SELECT_HOST_JOINED_COUNT_QUERY = "select count(DISTINCT thr.id) 
from topology_host_request thr join " +
-"topology_host_task tht on thr.id = tht.host_request_id join 
topology_logical_task " +
-"tlt on tht.id = tlt.host_task_id";
-
-Statement statement = null;
-
-if (connection == null) {
-  if (dbAccessor == null) {
-dbAccessor = injector.getInstance(DBAccessor.class);
-  }
-  connection = dbAccessor.getConnection();
-}
-
-try {
-  statement = connection.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, 
ResultSet.CONCUR_UPDATABLE);
-
-  int topologyRequestCount = runQuery(statement, 
SELECT_REQUEST_COUNT_QUERY);
-  int topologyRequestTablesJoinedCount = runQuery(statement, 
SELECT_JOINED_COUNT_QUERY);
-
-  if (topologyRequestCount != topologyRequestTablesJoinedCount) {
-error("Your topology request hierarchy is not complete for each row in 
topology_request should exist " +
-  "at least one row in topology_logical_request");
-  }
-
-  int topologyHostRequestCount = runQuery(statement, 
SELECT_HOST_REQUEST_COUNT_QUERY);
-  int topologyHostRequestTablesJoinedCount = runQuery(statement, 
SELECT_HOST_JOINED_COUNT_QUERY);
-
-  if (topologyHostRequestCount != topologyHostRequestTablesJoinedCount) {
-error("Your topology request hierarchy is not complete for each row in 
topology_host_request should exist " +
-"at least one row in topology_host_task, 
topology_logical_task.");
-  }
-
-} catch (SQLException e) {
-  LOG.error("Exception occurred during topology request tables check: ", 
e);
-} finally {
-  if (statement != null) {
-try {
-  statement.close();
-} catch (SQLException e) {
-  LOG.error("Exception occurred during statement closing procedure: ", 
e);
-}
-  }
-}
-
-  }
-
   private static int runQuery(Statement statement, String query) {
 ResultSet rs = null;
 int result = 0;

[15/35] ambari git commit: AMBARI-21761. VDF should support redhat-ppc6 and redhat-ppc7 OS types (ncole)

[ababiichuk]

AMBARI-21761. VDF should support redhat-ppc6 and redhat-ppc7 OS types (ncole)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 705a62be23e9388e602319056b83d86282b520c9
Parents: a0ae01d
Author: Nate Cole 
Authored: Sat Aug 19 08:04:00 2017 -0400
Committer: Nate Cole 
Committed: Sat Aug 19 08:04:00 2017 -0400

--
 ambari-server/src/main/resources/version_definition.xsd | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/705a62be/ambari-server/src/main/resources/version_definition.xsd
--
diff --git a/ambari-server/src/main/resources/version_definition.xsd 
b/ambari-server/src/main/resources/version_definition.xsd
index 9710c90..851e0d5 100644
--- a/ambari-server/src/main/resources/version_definition.xsd
+++ b/ambari-server/src/main/resources/version_definition.xsd
@@ -52,6 +52,8 @@
 
   
   
+  
+  
   
   
   

[28/35] ambari git commit: AMBARI-21585.Remove environment variables from zeppelin-env.sh(Prabhjyot Singh via Venkata Sairam)

[ababiichuk]

AMBARI-21585.Remove environment variables from zeppelin-env.sh(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/8dfdf5ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8dfdf5ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8dfdf5ec

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 8dfdf5ec275849597884508ad1bc1b5846d007cf
Parents: d260c89
Author: Venkata Sairam 
Authored: Tue Aug 22 16:48:39 2017 +0530
Committer: Venkata Sairam 
Committed: Tue Aug 22 16:48:39 2017 +0530

--
 .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml  | 5 +
 .../ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml  | 6 +-
 2 files changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8dfdf5ec/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index 80ac2bb..7f0d9e4 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -66,7 +66,6 @@ export JAVA_HOME={{java64_home}}
 export MASTER=yarn-client
 export SPARK_YARN_JAR={{spark_jar}}
 # export ZEPPELIN_JAVA_OPTS   # Additional jvm options. for 
example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g 
-Dspark.cores.max=16"
-export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}} 
-Dspark.executor.instances={{executor_instances}} 
-Dspark.yarn.queue={{spark_queue}}"
 # export ZEPPELIN_MEM # Zeppelin jvm mem options 
Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
 # export ZEPPELIN_INTP_MEM# zeppelin interpreter process 
jvm mem options. Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
 # export ZEPPELIN_INTP_JAVA_OPTS  # zeppelin interpreter process 
jvm options.
@@ -101,7 +100,7 @@ export KERBEROS_REFRESH_INTERVAL=1d
 ## defining SPARK_HOME makes Zeppelin run spark interpreter process using 
spark-submit
 ##
 # export SPARK_HOME   # (required) When it is defined, 
load it instead of Zeppelin embedded Spark libraries
-#export SPARK_HOME={{spark_home}}
+# export SPARK_HOME={{spark_home}}
 # export SPARK_SUBMIT_OPTIONS # (optional) extra options to 
pass to spark submit. eg) "--driver-memory 512M --executor-memory 1G".
 # export SPARK_APP_NAME   # (optional) The name of spark 
application.
 
@@ -117,8 +116,6 @@ export HADOOP_CONF_DIR=/etc/hadoop/conf
 # export PYSPARK_PYTHON   # path to the python command. 
must be the same path on the driver(Zeppelin) and all workers.
 # export PYTHONPATH
 
-export 
PYTHONPATH="${SPARK_HOME}/python:${SPARK_HOME}/python/lib/py4j-0.8.2.1-src.zip"
-export SPARK_YARN_USER_ENV="PYTHONPATH=${PYTHONPATH}"
 
 ## Spark interpreter options ##
 ##

http://git-wip-us.apache.org/repos/asf/ambari/blob/8dfdf5ec/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
index 7bd597f..1edd991 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
@@ -68,7 +68,6 @@ export JAVA_HOME={{java64_home}}
 export MASTER=yarn-client
 export SPARK_YARN_JAR={{spark_jar}}
 # export ZEPPELIN_JAVA_OPTS   # Additional jvm options. for 
example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g 
-Dspark.cores.max=16"
-export ZEPPELIN_JAVA_OPTS="-Dhdp.version={{full_stack_version}} 
-Dspark.executor.memory={{executor_mem}} 
-Dspark.executor.instances={{executor_instances}} 
-Dspark.yarn.queue={{spark_queue}}"
 # export ZEPPELIN_MEM # Zeppelin jvm mem options 
Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
 # export ZEPPELIN_INTP_MEM# zeppelin interpreter process 
jvm mem options. Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
 # export ZEPPELIN_INTP_JAVA_OPTS  # zeppelin 

[26/35] ambari git commit: AMBARI-21755 Unexpected Package Names in CentOS Cause Installation Failures (dgrinenko)

[ababiichuk]

AMBARI-21755 Unexpected Package Names in CentOS Cause Installation Failures 
(dgrinenko)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 6de8094a45c536340b56d73d4b0116c68349096c
Parents: d5904b9
Author: Dmytro Grinenko 
Authored: Tue Aug 22 06:14:31 2017 +0300
Committer: Dmytro Grinenko 
Committed: Tue Aug 22 06:14:31 2017 +0300

--
 .../core/providers/package/__init__.py | 17 ++---
 .../python/custom_actions/TestInstallPackages.py   | 10 ++
 2 files changed, 20 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6de8094a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
index 9793a84..9404757 100644
--- 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
+++ 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
@@ -23,9 +23,6 @@ Ambari Agent
 import time
 import re
 import logging
-import sys
-
-import subprocess
 
 from resource_management.core.exceptions import ExecutionFailed
 from resource_management.core.providers import Provider
@@ -344,6 +341,7 @@ class RPMBasedPackageProvider(PackageProvider):
   """
RPM Based abstract package provider
   """
+  INSTALLED_PACKAGE_VERSION_COMMAND = "rpm -q --queryformat 
'%{{version}}-%{{release}}' \"{0}\""
 
   def rpm_check_package_available(self, name):
 import rpm # this is faster then calling 'rpm'-binary externally.
@@ -359,8 +357,13 @@ class RPMBasedPackageProvider(PackageProvider):
 return False
 
   def get_installed_package_version(self, package_name):
-result = self.checked_call("rpm -q --queryformat 
'%{{version}}-%{{release}}' {0} | sed -e 
's/\.el[0-9]//g'".format(package_name), stderr=subprocess.PIPE)
-if len(result) >= 2:
-  return result[1]
+version = None
 
-return None
+result = 
self.checked_call(self.INSTALLED_PACKAGE_VERSION_COMMAND.format(package_name))
+try:
+  if result[0] == 0:
+version = result[1].strip().partition(".el")[0]
+except IndexError:
+  pass
+
+return version

http://git-wip-us.apache.org/repos/asf/ambari/blob/6de8094a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
--
diff --git 
a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py 
b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
index b31e2f5..de2cced 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -75,6 +75,16 @@ class TestInstallPackages(RMFTestCase):
   def _add_packages_lookUpYum(*args):
 return TestInstallPackages._add_packages_available(*args)
 
+  def test_get_installed_package_version(self):
+from resource_management.core.providers.package.yumrpm import YumProvider
+
+provider = YumProvider(None)
+with patch.object(provider, "checked_call") as checked_call_mock:
+  checked_call_mock.return_value = 0, "3.1.0.0-54.el7.centos"
+  expected_version = provider.get_installed_package_version("test")
+  self.assertEquals("3.1.0.0-54", expected_version)
+
+
   
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
   @patch("resource_management.core.providers.get_provider")
   @patch("resource_management.libraries.script.Script.put_structured_out")

[27/35] ambari git commit: AMBARI-17898. Add Kerberos HTTP SPNEGO authentication support to Ambari Metrics Monitor. (Qin Liu via Eric Yang)

[ababiichuk]

AMBARI-17898. Add Kerberos HTTP SPNEGO authentication support to Ambari Metrics 
Monitor.  (Qin Liu via Eric Yang)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: d260c89263ee0471514b4cfb8ce938134eceea12
Parents: 6de8094
Author: Eric Yang 
Authored: Mon Aug 21 20:57:34 2017 -0700
Committer: Eric Yang 
Committed: Mon Aug 21 20:57:34 2017 -0700

--
 .../conf/unix/metric_monitor.ini|   2 +
 .../src/main/python/core/config_reader.py   |   8 +
 .../src/main/python/core/emitter.py |  58 ++-
 .../src/main/python/core/krberr.py  |  42 +
 .../main/python/core/spnego_kerberos_auth.py| 164 +++
 .../src/test/python/core/TestEmitter.py |  24 +++
 .../AMBARI_METRICS/0.1.0/kerberos.json  |  26 +++
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |   8 +
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |  33 +++-
 .../0.1.0/package/scripts/params.py |   7 +-
 .../package/templates/metric_monitor.ini.j2 |   2 +
 11 files changed, 360 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d260c892/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini 
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
index 7fe7397..38fff1e 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
+++ b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
@@ -27,6 +27,8 @@ skip_network_interfaces_patterns =
 
 [emitter]
 send_interval = 60
+kinit_cmd = /usr/bin/kinit -kt /etc/security/keytabs/ams.monitor.keytab 
amsmon/localhost
+klist_cmd = /usr/bin/klist
 
 [collector]
 collector_sleep_interval = 5

http://git-wip-us.apache.org/repos/asf/ambari/blob/d260c892/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
index d1429ed..017ad24 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
@@ -115,6 +115,8 @@ enable_value_threshold = false
 
 [emitter]
 send_interval = 60
+kinit_cmd = /usr/bin/kinit -kt /etc/security/keytabs/ams.monitor.keytab 
amsmon/localhost
+klist_cmd = /usr/bin/klist
 
 [collector]
 collector_sleep_interval = 5
@@ -218,6 +220,12 @@ class Configuration:
   def get_send_interval(self):
 return int(self.get("emitter", "send_interval", 60))
 
+  def get_kinit_cmd(self):
+return self.get("emitter", "kinit_cmd")
+
+  def get_klist_cmd(self):
+return self.get("emitter", "klist_cmd")
+
   def get_collector_sleep_interval(self):
 return int(self.get("collector", "collector_sleep_interval", 10))
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d260c892/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
index 77b8c23..f19434d 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
@@ -24,6 +24,7 @@ import threading
 from security import CachedHTTPSConnection, CachedHTTPConnection
 from blacklisted_set import BlacklistedSet
 from config_reader import ROUND_ROBIN_FAILOVER_STRATEGY
+from spnego_kerberos_auth import SPNEGOKerberosAuth
 
 logger = logging.getLogger()
 
@@ -31,6 +32,10 @@ class Emitter(threading.Thread):
   AMS_METRICS_POST_URL = "/ws/v1/timeline/metrics/"
   RETRY_SLEEP_INTERVAL = 5
   MAX_RETRY_COUNT = 3
+  cookie_cached = {}
+  kinit_cmd = None
+  klist_cmd = None
+  spnego_krb_auth = None
   """
   Wake up every send interval seconds and empty the application metric map.
   """
@@ -39,6 +44,10 @@ class Emitter(threading.Thread):
 logger.debug('Initializing Emitter thread.')
 self.lock = threading.Lock()
 self.send_interval = config.get_send_interval()
+

[34/35] ambari git commit: AMBARI-21783 Log Search UI: implement timezone picker. (ababiichuk)

[ababiichuk]

AMBARI-21783 Log Search UI: implement timezone picker. (ababiichuk)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 01a3bc7af63178af3032d868d80794fda0a0185e
Parents: f3c1039
Author: ababiichuk 
Authored: Tue Aug 22 20:46:01 2017 +0300
Committer: ababiichuk 
Committed: Tue Aug 22 20:46:01 2017 +0300

--
 .../src/app/app.module.ts   |   9 +-
 .../src/app/components/app.component.html   |   1 -
 .../src/app/components/app.component.ts |   4 +-
 .../filters-panel/filters-panel.component.html  |   3 +-
 .../filters-panel/filters-panel.component.less  |   2 +-
 .../filters-panel/filters-panel.component.ts|   4 -
 .../login-form/login-form.component.ts  |   2 +-
 .../logs-container/logs-container.component.ts  |   2 +-
 .../main-container/main-container.component.ts  |   4 +-
 .../app/components/modal/modal.component.html   |  40 ++
 .../components/modal/modal.component.spec.ts|  57 +
 .../src/app/components/modal/modal.component.ts | 122 +++
 .../time-histogram/time-histogram.component.ts  |   2 +-
 .../timezone-picker.component.html  |  26 
 .../timezone-picker.component.less  |  45 +++
 .../timezone-picker.component.spec.ts   |  73 +++
 .../timezone-picker.component.ts|  77 
 .../src/app/components/variables.less   |   2 +
 .../src/app/mock-data.ts|   4 +-
 .../src/app/pipes/timezone-abbr.pipe.spec.ts|  26 
 .../src/app/pipes/timezone-abbr.pipe.ts |  31 +
 .../src/app/services/filtering.service.ts   |  21 +---
 .../src/app/services/utils.service.ts   |   5 -
 .../src/assets/i18n/en.json |   3 +
 .../src/vendor/js/WorldMapGenerator.min.js  |  11 ++
 .../ambari-logsearch-web-new/tsconfig.json  |   3 +
 26 files changed, 539 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/01a3bc7a/ambari-logsearch/ambari-logsearch-web-new/src/app/app.module.ts
--
diff --git a/ambari-logsearch/ambari-logsearch-web-new/src/app/app.module.ts 
b/ambari-logsearch/ambari-logsearch-web-new/src/app/app.module.ts
index 775ac55..b883c75 100644
--- a/ambari-logsearch/ambari-logsearch-web-new/src/app/app.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web-new/src/app/app.module.ts
@@ -66,6 +66,10 @@ import {PaginationComponent} from 
'@app/components/pagination/pagination.compone
 import {PaginationControlsComponent} from 
'@app/components/pagination-controls/pagination-controls.component';
 import {TimeHistogramComponent} from 
'@app/components/time-histogram/time-histogram.component';
 import {LogsContainerComponent} from 
'@app/components/logs-container/logs-container.component';
+import {ModalComponent} from '@app/components/modal/modal.component';
+import {TimeZonePickerComponent} from 
'@app/components/timezone-picker/timezone-picker.component';
+
+import {TimeZoneAbbrPipe} from '@app/pipes/timezone-abbr.pipe';
 
 export function HttpLoaderFactory(http: Http) {
   // adding 'static' parameter to step over mock data request
@@ -105,7 +109,10 @@ export function getXHRBackend(injector: Injector, browser: 
BrowserXhr, xsrf: XSR
 PaginationComponent,
 PaginationControlsComponent,
 TimeHistogramComponent,
-LogsContainerComponent
+LogsContainerComponent,
+ModalComponent,
+TimeZonePickerComponent,
+TimeZoneAbbrPipe
   ],
   imports: [
 BrowserModule,

http://git-wip-us.apache.org/repos/asf/ambari/blob/01a3bc7a/ambari-logsearch/ambari-logsearch-web-new/src/app/components/app.component.html
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web-new/src/app/components/app.component.html
 
b/ambari-logsearch/ambari-logsearch-web-new/src/app/components/app.component.html
index a353f4d..a0444c9 100644
--- 
a/ambari-logsearch/ambari-logsearch-web-new/src/app/components/app.component.html
+++ 
b/ambari-logsearch/ambari-logsearch-web-new/src/app/components/app.component.html
@@ -24,7 +24,6 @@
   
 
 
-
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/01a3bc7a/ambari-logsearch/ambari-logsearch-web-new/src/app/components/app.component.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web-new/src/app/components/app.component.ts 

[23/35] ambari git commit: AMBARI-21769. zeppelin principal and livy.superusers property do not match on upgraded cluster from Ambari 2.4.2 -and HDP 2.5.5 (rlevas)

[ababiichuk]

AMBARI-21769. zeppelin principal and livy.superusers property do not match on 
upgraded cluster from Ambari 2.4.2 -and HDP 2.5.5 (rlevas)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: c129baa1f6e4438b7af9e7a01735d8ead05df1be
Parents: 5895040
Author: Robert Levas 
Authored: Mon Aug 21 17:00:52 2017 -0400
Committer: Robert Levas 
Committed: Mon Aug 21 17:00:52 2017 -0400

--
 .../kerberos/DeconstructedPrincipal.java|   2 +-
 .../server/upgrade/UpgradeCatalog252.java   | 174 +++
 .../SPARK/2.2.0/service_advisor.py  |  48 +-
 .../ZEPPELIN/0.6.0.3.0/service_advisor.py   |  46 +-
 .../stacks/HDP/2.5/services/SPARK/kerberos.json |   3 +-
 .../stacks/HDP/2.5/services/stack_advisor.py|  58 ++-
 .../stacks/HDP/2.6/services/SPARK/kerberos.json |   3 +-
 .../HDP/2.6/services/SPARK2/kerberos.json   |   3 +-
 .../stacks/HDP/2.6/services/stack_advisor.py|  60 ++-
 .../src/main/resources/stacks/stack_advisor.py  |   6 +-
 .../server/upgrade/UpgradeCatalog252Test.java   | 203 
 .../SPARK/2.2.0/test_service_advisor.py | 289 
 .../stacks/2.5/common/test_stack_advisor.py | 197 
 .../stacks/2.6/common/test_stack_advisor.py | 471 +++
 14 files changed, 1545 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c129baa1/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
index 764324b..692b130 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
@@ -36,7 +36,7 @@ import javax.annotation.Nullable;
  * This class will create a DeconstructedPrincipal from a String containing a 
principal using
  * {@link DeconstructedPrincipal#valueOf(String, String)}
  */
-class DeconstructedPrincipal {
+public class DeconstructedPrincipal {
   /**
* Regular expression to parse the different principal formats:
* 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c129baa1/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
index 2227675..1192c11 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
@@ -18,18 +18,30 @@
 package org.apache.ambari.server.upgrade;
 
 import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
+import org.apache.ambari.server.orm.dao.ArtifactDAO;
+import org.apache.ambari.server.orm.entities.ArtifactEntity;
+import org.apache.ambari.server.serveraction.kerberos.DeconstructedPrincipal;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.PropertyInfo;
+import 
org.apache.ambari.server.state.kerberos.AbstractKerberosDescriptorContainer;
+import org.apache.ambari.server.state.kerberos.KerberosConfigurationDescriptor;
+import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
+import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
@@ -46,6 +58,11 @@ public class UpgradeCatalog252 extends 
AbstractUpgradeCatalog {
   private static final String CLUSTER_ENV = "cluster-env";
 
   /**
+   * Logger.
+   */
+  private static final Logger LOG = 

[07/35] ambari git commit: AMBARI-21753. Unable to add new host to the upgraded PPC cluster due to exception:Local OS is not compatible with cluster primary OS family (aonishuk)

[ababiichuk]

AMBARI-21753. Unable to add new host to the upgraded PPC cluster due to 
exception:Local OS is not compatible with cluster primary OS family (aonishuk)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 1dba7786f7bb8f99251fd5c74a3ddeb0bf2fb118
Parents: 09fed27
Author: Andrew Onishuk 
Authored: Fri Aug 18 16:40:56 2017 +0300
Committer: Andrew Onishuk 
Committed: Fri Aug 18 16:40:56 2017 +0300

--
 .../src/main/python/ambari_server/serverConfiguration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1dba7786/ambari-server/src/main/python/ambari_server/serverConfiguration.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py 
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index 631c9a7..c2ecb01 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -1182,8 +1182,8 @@ def update_ambari_properties():
 if NR_USER_PROPERTY not in new_properties.keys():
   new_properties.process_pair(NR_USER_PROPERTY, "root")
 
-if OS_FAMILY_PROPERTY not in new_properties.keys():
-  new_properties.process_pair(OS_FAMILY_PROPERTY, OS_FAMILY + OS_VERSION)
+# update the os. In case os detection routine changed
+new_properties.process_pair(OS_FAMILY_PROPERTY, OS_FAMILY + OS_VERSION)
 
 with open(conf_file, 'w') as hfW:
   new_properties.store(hfW)

[03/35] ambari git commit: AMBARI-21735 - Parameterize Maven Surefire Build argLine (jonathanhurley)

[ababiichuk]

AMBARI-21735 - Parameterize Maven Surefire Build argLine (jonathanhurley)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: b428fb9be84af73e5931d6d81908c3372b711420
Parents: f2cc609
Author: Jonathan Hurley 
Authored: Wed Aug 16 20:12:49 2017 -0400
Committer: Jonathan Hurley 
Committed: Thu Aug 17 11:40:20 2017 -0400

--
 ambari-project/pom.xml  |  1 +
 ambari-server/pom.xml   |  2 +-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  5 +++--
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  4 ++--
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  2 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  2 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  2 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  9 
 .../apache/ambari/server/orm/db/DDLTests.java   | 22 +---
 .../server/testing/DBInconsistencyTests.java|  2 ++
 pom.xml |  2 +-
 11 files changed, 27 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b428fb9b/ambari-project/pom.xml
--
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 524a8f7..00ba1bc 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -37,6 +37,7 @@
 1.7.20
 4
 false
+-Xmx1024m -Xms512m
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b428fb9b/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 3c966f2..29a820a 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -719,7 +719,7 @@
 maven-surefire-plugin
 
   ${skipSurefireTests}
-  -Xmx1024m -Xms512m
+  ${surefire.argLine}
 
   
   ${testcase.groups}

http://git-wip-us.apache.org/repos/asf/ambari/blob/b428fb9b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
index 89bc4a4..5fcb03e 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
@@ -228,7 +228,7 @@ CREATE TABLE host_version (
   CONSTRAINT PK_host_version PRIMARY KEY (id),
   CONSTRAINT FK_host_version_host_id FOREIGN KEY (host_id) REFERENCES hosts 
(host_id),
   CONSTRAINT FK_host_version_repovers_id FOREIGN KEY (repo_version_id) 
REFERENCES repo_version (repo_version_id),
-  CONSTRAINT UQ_host_repo UNIQUE(host_id, repo_version_id, state));
+  CONSTRAINT UQ_host_repo UNIQUE(host_id, repo_version_id));
 
 CREATE TABLE servicedesiredstate (
   cluster_id BIGINT NOT NULL,
@@ -272,6 +272,7 @@ CREATE TABLE groups (
   principal_id BIGINT NOT NULL,
   group_name VARCHAR(255) NOT NULL,
   ldap_group INTEGER NOT NULL DEFAULT 0,
+  group_type VARCHAR(255) NOT NULL DEFAULT 'LOCAL',
   CONSTRAINT PK_groups PRIMARY KEY (group_id),
   UNIQUE (ldap_group, group_name),
   CONSTRAINT FK_groups_principal_id FOREIGN KEY (principal_id) REFERENCES 
adminprincipal(principal_id));
@@ -553,7 +554,7 @@ CREATE table viewurl(
   url_id BIGINT ,
   url_name VARCHAR(255) NOT NULL ,
   url_suffix VARCHAR(255) NOT NULL,
-  PRIMARY KEY(url_id)
+  CONSTRAINT PK_viewurl PRIMARY KEY(url_id)
 );
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b428fb9b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 22dad9b..7c0e8d3 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -572,7 +572,7 @@ CREATE table viewurl(
   url_id BIGINT ,
   url_name VARCHAR(255) NOT NULL ,
   url_suffix VARCHAR(255) NOT NULL,
-  PRIMARY KEY(url_id)
+  CONSTRAINT PK_viewurl PRIMARY KEY(url_id)
 );
 
 
@@ -1101,7 +1101,7 @@ INSERT INTO ambari_sequences(sequence_name, 
sequence_value) VALUES
   ('setting_id_seq', 0),
   ('hostcomponentstate_id_seq', 0),
   ('servicecomponentdesiredstate_id_seq', 0),
-  ('servicecomponent_history_id_seq', 0),
+  ('upgrade_history_id_seq', 0),
   ('blueprint_setting_id_seq', 0),

[18/35] ambari git commit: AMBARI-21762 Sometimes alerts order is not correctly arranged if ordering by Status. (atkach)

[ababiichuk]

AMBARI-21762 Sometimes alerts order is not correctly arranged if ordering by 
Status. (atkach)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: f901e15bac6728215ab5adea54775565bb8bdd46
Parents: 13589bb
Author: Andrii Tkach 
Authored: Mon Aug 21 15:17:50 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Aug 21 15:17:50 2017 +0300

--
 ambari-web/app/views/common/sort_view.js| 26 ++-
 .../app/views/main/alert_definitions_view.js|  7 ++-
 ambari-web/test/views/common/sort_view_test.js  | 49 +++-
 .../views/main/alert_definitions_view_test.js   |  2 +-
 4 files changed, 78 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f901e15b/ambari-web/app/views/common/sort_view.js
--
diff --git a/ambari-web/app/views/common/sort_view.js 
b/ambari-web/app/views/common/sort_view.js
index 0fc1db7..290a12f 100644
--- a/ambari-web/app/views/common/sort_view.js
+++ b/ambari-web/app/views/common/sort_view.js
@@ -30,6 +30,8 @@ var App = require('app');
 var wrapperView = Em.View.extend({
   tagName: 'tr',
 
+  name: 'SortWrapperView',
+
   classNames: ['sort-wrapper'],
 
   willInsertElement: function () {
@@ -87,9 +89,10 @@ var wrapperView = Em.View.extend({
* @param property {object}
* @param order {Boolean} true - DESC, false - ASC
* @param returnSorted {Boolean}
+   * @param content {Array}
*/
-  sort: function (property, order, returnSorted) {
-var content = this.get('content').toArray();
+  sort: function (property, order, returnSorted, content) {
+content = content || this.get('content').toArray();
 var sortFunc = this.getSortFunc(property, order);
 var status = order ? 'sorting_desc' : 'sorting_asc';
 
@@ -122,6 +125,25 @@ var wrapperView = Em.View.extend({
   }.observes('controller.contentUpdater'),
 
   /**
+   *
+   * @param {Em.Object[]} content
+   * @returns {Em.Object[]}
+   */
+  getSortedContent: function(content) {
+if (!this.get('isSorting') && content.get('length')) {
+  var activeSortViews = this.get('childViews').rejectProperty('status', 
'sorting');
+  if (activeSortViews[0]) {
+var status = activeSortViews[0].get('status');
+this.set('isSorting', true);
+content = this.sort(activeSortViews[0], status === 'sorting_desc', 
true, content);
+this.set('isSorting', false);
+activeSortViews[0].set('status', status);
+  }
+}
+return content;
+  },
+
+  /**
* reset all sorts fields
*/
   resetSort: function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/f901e15b/ambari-web/app/views/main/alert_definitions_view.js
--
diff --git a/ambari-web/app/views/main/alert_definitions_view.js 
b/ambari-web/app/views/main/alert_definitions_view.js
index 530bca7..f7515bc 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -32,7 +32,10 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 
   contentObsOnce: function() {
 var content = this.get('controller.content') && 
App.get('router.clusterController.isAlertsLoaded') ?
-  
this.get('controller.content').toArray().sort(App.AlertDefinition.getSortDefinitionsByStatus(true))
 : [];
+  this.get('controller.content').toArray() : [];
+if (this.get('childViews').someProperty('name', 'SortWrapperView')) {
+  content = this.get('childViews').findProperty('name', 
'SortWrapperView').getSortedContent(content);
+}
 this.set('content', content);
   },
 
@@ -46,7 +49,7 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 if (savedSortConditions.everyProperty('status', 'sorting')) {
   savedSortConditions.push({
 name: "summary",
-status: "sorting_asc"
+status: "sorting_desc"
   });
   App.db.setSortingStatuses(controllerName, savedSortConditions);
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/f901e15b/ambari-web/test/views/common/sort_view_test.js
--
diff --git a/ambari-web/test/views/common/sort_view_test.js 
b/ambari-web/test/views/common/sort_view_test.js
index a21a352..9d095ec 100644
--- a/ambari-web/test/views/common/sort_view_test.js
+++ b/ambari-web/test/views/common/sort_view_test.js
@@ -182,6 +182,53 @@ describe('#wrapperView', function () {
   });
 
 })
-  })
+  });
+
+  

[19/35] ambari git commit: AMBARI-21758 - Prevent New Clusters from Being Provisioned With PATCH/MAINT Repos (jonathanhurley)

[ababiichuk]

AMBARI-21758 - Prevent New Clusters from Being Provisioned With PATCH/MAINT 
Repos (jonathanhurley)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 28a42236a1dfc924fed73edfaf4ea6d896f16f02
Parents: f901e15
Author: Jonathan Hurley 
Authored: Fri Aug 18 15:38:17 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Aug 21 09:31:10 2017 -0400

--
 .../controller/AmbariManagementControllerImpl.java   | 15 ++-
 .../controller/internal/ServiceResourceProvider.java | 10 ++
 .../server/orm/entities/RepositoryVersionEntity.java |  8 +++-
 .../apache/ambari/server/topology/AmbariContext.java |  8 
 .../ambari/server/topology/AmbariContextTest.java|  2 ++
 5 files changed, 29 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/28a42236/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 d3b6d7c..96280ea 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
@@ -39,7 +39,6 @@ import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_R
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.UNLIMITED_KEY_JCE_REQUIRED;
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.USER_GROUPS;
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.USER_LIST;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.VERSION;
 import static 
org.apache.ambari.server.controller.AmbariCustomCommandExecutionHelper.masterToSlaveMappingForDecom;
 
 import java.io.File;
@@ -434,18 +433,19 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 if (request.getClusterName() == null
 || request.getClusterName().isEmpty()
 || request.getClusterId() != null) {
-  throw new IllegalArgumentException("Cluster name should be provided" +
-  " and clusterId should be null");
+  throw new IllegalArgumentException(
+  "Cluster name should be provided and clusterId should be null");
 }
 
 if (LOG.isDebugEnabled()) {
-  LOG.debug("Received a createCluster request, clusterName={}, 
request={}", request.getClusterName(), request);
+  LOG.debug("Received a createCluster request, clusterName={}, request={}",
+  request.getClusterName(), request);
 }
 
 if (request.getStackVersion() == null
 || request.getStackVersion().isEmpty()) {
-  throw new IllegalArgumentException("Stack information should be"
-  + " provided when creating a cluster");
+  throw new IllegalArgumentException(
+  "Stack information should be provided when creating a cluster");
 }
 
 StackId stackId = new StackId(request.getStackVersion());
@@ -2418,9 +2418,6 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 commandParams.put(MAX_DURATION_OF_RETRIES, 
Integer.toString(retryMaxTime));
 commandParams.put(COMMAND_RETRY_ENABLED, 
Boolean.toString(retryEnabled));
 
-if (repoVersion != null) {
- commandParams.put(VERSION, repoVersion.getVersion());
-}
 if (script.getTimeout() > 0) {
   scriptCommandTimeout = String.valueOf(script.getTimeout());
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/28a42236/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index 818017e..e65693b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
@@ -68,6 +68,7 @@ import 
org.apache.ambari.server.serveraction.kerberos.KerberosMissingAdminCreden
 import 

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

[ababiichuk]

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


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: e99f8e86fd41ccf88a1c50b6cf603f03b9006bc6
Parents: b0f21da
Author: Swapan Shridhar 
Authored: Fri Aug 18 14:56:42 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Aug 18 14:56:42 2017 -0700

--
 .../DRUID/0.9.2/package/scripts/druid.py| 12 ++
 .../DRUID/0.9.2/package/scripts/params.py   | 13 +++
 .../test/python/stacks/2.6/DRUID/test_druid.py  | 24 +---
 3 files changed, 41 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e99f8e86/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
index cc02519..fa52247 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
@@ -18,6 +18,7 @@ limitations under the License.
 """
 import json
 import os
+from resource_management import Fail
 from resource_management.libraries.resources.properties_file import 
PropertiesFile
 from resource_management.core.resources.system import Directory, Execute, File
 from resource_management.core.source import DownloadSource
@@ -113,6 +114,17 @@ def druid(upgrade_type=None, nodeType=None):

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

http://git-wip-us.apache.org/repos/asf/ambari/blob/e99f8e86/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index d47e604..7e90475 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -18,6 +18,7 @@ limitations under the License.
 
 """
 from ambari_commons import OSCheck
+from resource_management.libraries.functions.get_lzo_packages import 
get_lzo_packages
 from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
 from resource_management.libraries.resources.hdfs_resource import HdfsResource
@@ -26,6 +27,7 @@ from resource_management.libraries.script.script import Script
 from resource_management.libraries.functions import format
 from resource_management.libraries.functions.get_not_managed_resources import 
get_not_managed_resources
 from resource_management.libraries.functions.default import default
+from ambari_commons.constants import AMBARI_SUDO_BINARY
 
 import status_params
 
@@ -50,10 +52,14 @@ stack_name = default("/hostLevelParams/stack_name", None)
 # stack version
 stack_version = default("/commandParams/version", None)
 
+# un-formatted stack version
+stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+
 # default role to coordinator needed for service checks
 component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "DRUID_COORDINATOR")
 
 hostname = config['hostname']
+sudo = AMBARI_SUDO_BINARY
 
 # default druid parameters
 

[13/35] ambari git commit: AMBARI-21620. Set the needed druid/hive properties via ambari (Slim Bouguerra via Swapan Shridhar).

[ababiichuk]

AMBARI-21620. Set the needed druid/hive properties via ambari (Slim Bouguerra 
via Swapan Shridhar).


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 79ff23fac2aa08f151781565a59fcbf80061b9f0
Parents: e99f8e8
Author: Swapan Shridhar 
Authored: Fri Aug 18 15:06:29 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Aug 18 15:06:29 2017 -0700

--
 .../DRUID/0.9.2/package/scripts/druid.py|  26 ++-
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 218 +++
 .../HIVE/0.12.0.2.0/metainfo.xml|   1 +
 .../0.12.0.2.0/package/scripts/params_linux.py  |  11 +
 .../stacks/HDP/2.6/services/stack_advisor.py|  49 -
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  14 ++
 .../test/python/stacks/2.6/DRUID/test_druid.py  |   8 +-
 .../stacks/2.6/common/test_stack_advisor.py |  60 -
 8 files changed, 371 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/79ff23fa/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
index fa52247..ec98c3c 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
@@ -161,24 +161,25 @@ def ensure_hadoop_directories():
 type="directory",
 action="create_on_execute",
 owner=params.druid_user,
+group='hadoop',
 recursive_chown=True,
 recursive_chmod=True
 )
 
-# create the segment storage dir
-create_hadoop_directory(storage_dir)
+# create the segment storage dir, users like hive from group hadoop need 
to write to this directory
+create_hadoop_directory(storage_dir, mode=0775)
 
   # Create HadoopIndexTask hadoopWorkingPath
   hadoop_working_path = 
druid_middlemanager_config['druid.indexer.task.hadoopWorkingPath']
   if hadoop_working_path is not None:
 if hadoop_working_path.startswith(params.hdfs_tmp_dir):
-  params.HdfsResource(params.hdfs_tmp_dir,
-   type="directory",
-   action="create_on_execute",
-   owner=params.hdfs_user,
-   mode=0777,
-  )
-create_hadoop_directory(hadoop_working_path)
+params.HdfsResource(params.hdfs_tmp_dir,
+type="directory",
+action="create_on_execute",
+owner=params.hdfs_user,
+mode=0777,
+)
+create_hadoop_directory(hadoop_working_path, mode=0775)
 
   # If HDFS is used for storing logs, create Index Task log directory
   indexer_logs_type = druid_common_config['druid.indexer.logs.type']
@@ -187,15 +188,16 @@ def ensure_hadoop_directories():
 create_hadoop_directory(indexer_logs_directory)
 
 
-def create_hadoop_directory(hadoop_dir):
+def create_hadoop_directory(hadoop_dir, mode=0755):
   import params
   params.HdfsResource(hadoop_dir,
   type="directory",
   action="create_on_execute",
   owner=params.druid_user,
-  mode=0755
+  group='hadoop',
+  mode=mode
   )
-  Logger.info(format("Created Hadoop Directory [{hadoop_dir}]"))
+  Logger.info(format("Created Hadoop Directory [{hadoop_dir}], with mode 
[{mode}]"))
 
 
 def ensure_base_directories():

http://git-wip-us.apache.org/repos/asf/ambari/blob/79ff23fa/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
index ab5c279..d66cf4c 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -450,6 +450,224 

[02/35] ambari git commit: AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg (dlysnichenko)

[ababiichuk]

AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg 
(dlysnichenko)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: f2cc609b0033d59130cb00d14ff8d2c8db6e1392
Parents: 8c5b03b
Author: Lisnichenko Dmitro 
Authored: Thu Aug 17 18:04:09 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Thu Aug 17 18:05:12 2017 +0300

--
 .../src/main/python/resource_management/libraries/script/script.py  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cc609b/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 90337f4..6e26d99 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -473,6 +473,7 @@ class Script(object):
   return name
 package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
 package_regex = name.replace(STACK_VERSION_PLACEHOLDER, 
'(\d|{0})+'.format(package_delimiter))
+package_regex = "^{0}$".format(package_regex)
 for package in available_packages_in_repos:
   if re.match(package_regex, package):
 return package

[11/35] ambari git commit: Revert "Add hadoop LZO jars if installed in the cluster. (Slim Bouguerra via Swapan Shridhar)."

[ababiichuk]

Revert "Add hadoop LZO jars if installed in the cluster. (Slim Bouguerra via 
Swapan Shridhar)."

This reverts commit bbec0d3751b9aad709d8fbf86c2744b4bb412e2d.


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: b0f21da12b6266191fc0669d4dc69ff945a9b785
Parents: bbec0d3
Author: Swapan Shridhar 
Authored: Fri Aug 18 14:56:00 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Aug 18 14:56:00 2017 -0700

--
 .../DRUID/0.9.2/package/scripts/druid.py| 12 --
 .../DRUID/0.9.2/package/scripts/params.py   | 13 ---
 .../test/python/stacks/2.6/DRUID/test_druid.py  | 24 +++-
 3 files changed, 8 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f21da1/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
index fa52247..cc02519 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
@@ -18,7 +18,6 @@ limitations under the License.
 """
 import json
 import os
-from resource_management import Fail
 from resource_management.libraries.resources.properties_file import 
PropertiesFile
 from resource_management.core.resources.system import Directory, Execute, File
 from resource_management.core.source import DownloadSource
@@ -114,17 +113,6 @@ def druid(upgrade_type=None, nodeType=None):

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

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f21da1/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index 7e90475..d47e604 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -18,7 +18,6 @@ limitations under the License.
 
 """
 from ambari_commons import OSCheck
-from resource_management.libraries.functions.get_lzo_packages import 
get_lzo_packages
 from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
 from resource_management.libraries.resources.hdfs_resource import HdfsResource
@@ -27,7 +26,6 @@ from resource_management.libraries.script.script import Script
 from resource_management.libraries.functions import format
 from resource_management.libraries.functions.get_not_managed_resources import 
get_not_managed_resources
 from resource_management.libraries.functions.default import default
-from ambari_commons.constants import AMBARI_SUDO_BINARY
 
 import status_params
 
@@ -52,14 +50,10 @@ stack_name = default("/hostLevelParams/stack_name", None)
 # stack version
 stack_version = default("/commandParams/version", None)
 
-# un-formatted stack version
-stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
-
 # default role to coordinator needed for service checks
 component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "DRUID_COORDINATOR")
 
 hostname = config['hostname']

[32/35] ambari git commit: AMBARI-21783 Log Search UI: implement timezone picker. (ababiichuk)

[ababiichuk]

http://git-wip-us.apache.org/repos/asf/ambari/blob/01a3bc7a/ambari-logsearch/ambari-logsearch-web-new/tsconfig.json
--
diff --git a/ambari-logsearch/ambari-logsearch-web-new/tsconfig.json 
b/ambari-logsearch/ambari-logsearch-web-new/tsconfig.json
index fc7c1f7..094fb6d 100644
--- a/ambari-logsearch/ambari-logsearch-web-new/tsconfig.json
+++ b/ambari-logsearch/ambari-logsearch-web-new/tsconfig.json
@@ -9,6 +9,9 @@
   ],
   "@envs/*": [
 "environments/*"
+  ],
+  "@vendor/*": [
+"vendor/*"
   ]
 },
 "sourceMap": true,

[29/35] ambari git commit: AMBARI-21586.Apply zeppelin.server.kerberos.principal related changes to 0.6.0.3.0(Prabhjyot Singh via Venkata Sairam)

[ababiichuk]

AMBARI-21586.Apply zeppelin.server.kerberos.principal related changes to 
0.6.0.3.0(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/6f9f87c6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f9f87c6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f9f87c6

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 6f9f87c663e1d5bd7cef5078e2a222700873c195
Parents: 8dfdf5e
Author: Venkata Sairam 
Authored: Tue Aug 22 17:01:24 2017 +0530
Committer: Venkata Sairam 
Committed: Tue Aug 22 17:01:24 2017 +0530

--
 .../ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6f9f87c6/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
index 1edd991..b393def 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
@@ -91,9 +91,13 @@ export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}}
 # export ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC   # If there are multiple notebook 
storages, should we treat the first one as the only source of truth?
 # export ZEPPELIN_NOTEBOOK_PUBLIC # Make notebook public by 
default when created, private otherwise
 export ZEPPELIN_INTP_CLASSPATH_OVERRIDES="{{external_dependency_conf}}"
-
  Spark interpreter configuration 
 
+## Kerberos ticket refresh setting
+##
+export KINIT_FAIL_THRESHOLD=5
+export KERBEROS_REFRESH_INTERVAL=1d
+
 ## Use provided spark installation ##
 ## defining SPARK_HOME makes Zeppelin run spark interpreter process using 
spark-submit
 ##
@@ -165,6 +169,7 @@ export HADOOP_CONF_DIR=/etc/hadoop/conf
 
   Kerberos principal name for the Zeppelin.
 
+KERBEROS_PRINCIPAL
 
   
   

[06/35] ambari git commit: AMBARI-21525. EU failure: Oozie service check fails if Falcon is not installed.(vbrodetskyi)

[ababiichuk]

AMBARI-21525. EU failure: Oozie service check fails if Falcon is not 
installed.(vbrodetskyi)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 09fed274ba869e7fb38a91d2795d54f08c132ca5
Parents: 7ffda34
Author: Vitaly Brodetskyi 
Authored: Fri Aug 18 14:21:56 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Fri Aug 18 14:21:56 2017 +0300

--
 .../0.5.0.2.1/configuration/oozie-site.xml  | 208 ---
 .../FALCON/configuration/oozie-site.xml | 198 --
 .../FALCON/configuration/oozie-site.xml | 197 --
 .../stacks/HDP/2.3/services/stack_advisor.py| 113 ++
 .../FALCON/configuration/oozie-site.xml |  47 -
 .../stacks/HDP/2.5/services/stack_advisor.py|  18 ++
 6 files changed, 131 insertions(+), 650 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09fed274/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
 
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
deleted file mode 100644
index d46069d..000
--- 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-
-
-
-  
-
oozie.service.ELService.ext.functions.coord-job-submit-instances
-
-  now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
-  today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
-  
yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
-  
currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_currentWeek_echo,
-  lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_lastWeek_echo,
-  
currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
-  
lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
-  
currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
-  lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
-  
formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
-  latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
-  future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo
-
-
-  EL functions declarations, separated by commas, format is 
[PREFIX:]NAME=CLASS#METHOD.
-  This property is a convenience property to add extensions to the built 
in executors without having to
-  include all the built in ones.
-
-
-  custom
-
-
-  
-  
-oozie.service.ELService.ext.functions.coord-action-create-inst
-
-  now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst,
-  today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst,
-  
yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst,
-  
currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek_inst,
-  lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek_inst,
-  
currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth_inst,
-  
lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth_inst,
-  
currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear_inst,
-  lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear_inst,
-  latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
-  future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
-  formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
-  user=org.apache.oozie.coord.CoordELFunctions#coord_user
-
-
-  EL functions declarations, separated by commas, format is 
[PREFIX:]NAME=CLASS#METHOD.
-  This property is a convenience property to add extensions to the built 
in executors without having to
-  include all the built in ones.
-
-
-  custom
-
-
-  
-  
-oozie.service.ELService.ext.functions.coord-action-create
-
-  now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
-  today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
-  yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
-  

[21/35] ambari git commit: AMBARI-21718. Unable to remove ZooKeeper on heartbeat lost hosts. (Ishan Bhatt via Jaimin)

[ababiichuk]

AMBARI-21718. Unable to remove ZooKeeper on heartbeat lost hosts. (Ishan Bhatt 
via Jaimin)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: d69084461998ad33c233bb33734b7935681df086
Parents: 15aa037
Author: Jaimin Jetly 
Authored: Mon Aug 21 12:12:50 2017 -0700
Committer: Jaimin Jetly 
Committed: Mon Aug 21 12:14:13 2017 -0700

--
 ambari-web/app/controllers/main/host/details.js | 32 ---
 ambari-web/app/messages.js  |  4 +-
 .../test/controllers/main/host/details_test.js  | 59 ++--
 3 files changed, 69 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d6908446/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index abf7673..cf223d7 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -2490,6 +2490,8 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
   zkServerInstalled: false,
   lastComponents: [],
   masterComponents: [],
+  nonAddableMasterComponents: [],
+  lastMasterComponents: [],
   runningComponents: [],
   nonDeletableComponents: [],
   unknownComponents: [],
@@ -2500,12 +2502,22 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
 if (cInstance.get('componentName') === 'ZOOKEEPER_SERVER') {
   container.zkServerInstalled = true;
 }
+var isLastComponent = false;
 if (this.getTotalComponent(cInstance) === 1) {
   container.lastComponents.push(cInstance.get('displayName'));
+  isLastComponent = true;
 }
 var workStatus = cInstance.get('workStatus');
+
 if (cInstance.get('isMaster')) {
-  container.masterComponents.push(cInstance.get('displayName'));
+  var displayName = cInstance.get('displayName')
+  container.masterComponents.push(displayName);
+  if 
(!App.StackServiceComponent.find(cInstance.get('componentName')).get('isMasterAddableInstallerWizard'))
  {
+container.nonAddableMasterComponents.push(displayName);
+  }
+  if(isLastComponent) {
+container.lastMasterComponents.push(displayName);
+  }
 }
 if (stoppedStates.indexOf(workStatus) < 0) {
   container.runningComponents.push(cInstance.get('displayName'));
@@ -2650,16 +2662,20 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
   validateAndDeleteHost: function () {
 var container = this.getHostComponentsInfo();
 
-if (container.masterComponents.length > 0) {
-  this.raiseDeleteComponentsError(container, 'masterList');
-  return;
-} else if (container.nonDeletableComponents.length > 0) {
+if (container.nonDeletableComponents.length > 0) {
   this.raiseDeleteComponentsError(container, 'nonDeletableList');
   return;
+} else if (container.nonAddableMasterComponents.length > 0) {
+  this.raiseDeleteComponentsError(container, 'masterList');
+  return;
 } else if (container.runningComponents.length > 0) {
   this.raiseDeleteComponentsError(container, 'runningList');
   return;
+} else if(container.lastMasterComponents.length > 0) {
+  this.raiseDeleteComponentsError(container, 'lastMasterList');
+  return;
 }
+
 if (container.zkServerInstalled) {
   var self = this;
   return App.showConfirmationPopup(function () {
@@ -2680,17 +2696,19 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
 App.ModalPopup.show({
   header: Em.I18n.t('hosts.cant.do.popup.title'),
   type: type,
-  showBodyEnd: Em.computed.existsIn('type', ['runningList', 'masterList']),
+  showBodyEnd: Em.computed.existsIn('type', ['runningList', 'masterList', 
'lastMasterList']),
   container: container,
   components: function(){
 var container = this.get('container');
 switch (this.get('type')) {
   case 'masterList':
-return container.masterComponents;
+return container.nonAddableMasterComponents;
   case 'nonDeletableList':
 return container.nonDeletableComponents;
   case 'runningList':
 return container.runningComponents;
+  case 'lastMasterList':
+

[17/35] ambari git commit: AMBARI-21525. Test Fix. EU failure: Oozie service check fails if Falcon is not installed.(vbrodetskyi)

[ababiichuk]

AMBARI-21525. Test Fix. EU failure: Oozie service check fails if Falcon is not 
installed.(vbrodetskyi)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 13589bbdf9c22f91740519ef63fcfbf9c2aacc4b
Parents: 6fb3719
Author: Vitaly Brodetskyi 
Authored: Mon Aug 21 14:20:48 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Mon Aug 21 14:21:45 2017 +0300

--
 .../stacks/2.5/common/test_stack_advisor.py | 107 ++-
 1 file changed, 105 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/13589bbd/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index fc5f220..51d1678 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -5892,12 +5892,32 @@ class TestHDP25StackAdvisor(TestCase):
 clusterData = {
   "components" : []
 }
+services = {
+  "services": [
+{
+  "StackServices": {
+"service_name": "OOZIE"
+  }, "components": []
+},
+],
+  "configurations": configurations,
+  "forced-configurations": []
+}
 expected = {
-  "oozie-site": {"properties":{}},
+  "oozie-site": {"properties":{}, 'property_attributes':
+{'oozie.service.ELService.ext.functions.workflow': {'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-job-submit-instances': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-action-start': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-job-submit-data': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-sla-submit': {'delete': 
'true'},
+ 'oozie.service.ELService.ext.functions.coord-action-create': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-action-create-inst': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-sla-create': {'delete': 
'true'},
+ 'oozie.service.HadoopAccessorService.supported.filesystems': 
{'delete': 'true'}}},
   "oozie-env": {"properties":{}}
 }
 
-self.stackAdvisor.recommendOozieConfigurations(configurations, 
clusterData, {"configurations":{}}, None)
+self.stackAdvisor.recommendOozieConfigurations(configurations, 
clusterData, services, None)
 self.assertEquals(configurations, expected)
 
 
@@ -5928,6 +5948,89 @@ class TestHDP25StackAdvisor(TestCase):
 expected = {
   "oozie-site": {
 "properties": {
+  "oozie.service.ELService.ext.functions.coord-action-create" : 
'now=org.apache.oozie.extensions.OozieELExtensions#ph2_now, \
+
today=org.apache.oozie.extensions.OozieELExtensions#ph2_today, \
+
yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday, \
+
currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek, \
+
lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek, \
+
currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth, \
+
lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth, \
+
currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear, \
+
lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear, \
+
latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo, \
+
future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo, \
+
formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime, \
+
user=org.apache.oozie.coord.CoordELFunctions#coord_user',
+  "oozie.service.ELService.ext.functions.coord-action-create-inst" : 
'now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst, \
+
today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst, \
+
yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst, \
+

[14/35] ambari git commit: AMBARI-21759 yumrpm provider doesn't parses installed packages in a same way on different CentOS versions (dgrinenko)

[ababiichuk]

AMBARI-21759 yumrpm provider doesn't parses installed packages in a same way on 
different CentOS versions (dgrinenko)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: a0ae01d883eaaecb4542e990389ea9483c63eac9
Parents: 79ff23f
Author: Dmytro Grinenko 
Authored: Sat Aug 19 05:47:22 2017 +0300
Committer: Dmytro Grinenko 
Committed: Sat Aug 19 05:47:22 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/a0ae01d8/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 26fbc3e..8c02992 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
@@ -119,36 +119,10 @@ class YumProvider(RPMBasedPackageProvider):
 :type repo_filter str|None
 :rtype list[list,]
 """
-packages = []
-cmd_filter = "| grep \"{0}\"".format(repo_filter) if repo_filter else ""
-
-# tr '\n' '#' %s | sed -e 's/# / /g' | tr '#' '\n' - fix yum formatted 
output for default console width
-cmd = AMBARI_SUDO_BINARY + " yum list installed {filter}|tr '\\n' '#' | 
sed -e 's/# / /g' | tr '#' '\\n'|awk '{printf \"%s;%s;%s\\n\", 
$1,$2,$3}'".replace("{filter}", cmd_filter)
-result = self._call_with_timeout(cmd)
-col_sep = ";"
-
-"""
-command would return everything in following format:
-
-Loaded;plugins:;fastestmirror
-Installed;Packages;
-package_name;version;@Repo
-
-"""
-
-if result and 0 == result['retCode']:
-  raw_pkgs = result['out'].split("\n")
-
-  for line in raw_pkgs:
-package_item = line.split(col_sep)
-
-if len(package_item) < 3:
-  continue
-elif not package_item[2].startswith("@"):
-  continue
 
-package_item[2] = package_item[2][1:]
-packages.append(package_item)
+packages = self._lookup_packages([AMBARI_SUDO_BINARY, "yum", "list", 
"installed"], "Installed Packages")
+if repo_filter:
+  packages = [item for item in packages if item[2].lower() == 
repo_filter.lower()]
 
 return packages
 

[33/35] ambari git commit: AMBARI-21783 Log Search UI: implement timezone picker. (ababiichuk)

[ababiichuk]

http://git-wip-us.apache.org/repos/asf/ambari/blob/01a3bc7a/ambari-logsearch/ambari-logsearch-web-new/src/vendor/js/WorldMapGenerator.min.js
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web-new/src/vendor/js/WorldMapGenerator.min.js
 
b/ambari-logsearch/ambari-logsearch-web-new/src/vendor/js/WorldMapGenerator.min.js
new file mode 100644
index 000..0b54091
--- /dev/null
+++ 
b/ambari-logsearch/ambari-logsearch-web-new/src/vendor/js/WorldMapGenerator.min.js
@@ -0,0 +1,11 @@
+/**
+ * @version: 1.0.1
+ * @author: Keval Bhatt 
+ * @copyright: Copyright (c) 2015 Keval Bhatt. All rights reserved.
+ * @license: Licensed under the MIT license. See 
http://www.opensource.org/licenses/mit-license.php
+ * @website: http://kevalbhatt.github.io/WorldMapGenerator/
+ */
+"use strict";!function(e,n){if("function"==typeof 
define&)define(["moment","jquery"],function(o,t){e.worldMapTime={},n(o,t,e.worldMapTime)});else{if("undefined"==typeof
 e.moment){var o=!1;console.log("Day light feature requires moment.js")}else 
if(!e.moment.tz)throw new Error("moment-timezone dependency not 
found");if("undefined"==e.jQuery&&"undefined"==e.Zepto&&"undefined"==e.ender&&"undefined"==e.$)throw
 new Error("jQuery dependnecy not found");var 
t=e.worldMapTime={};n(e.moment||o,e.jQuery||e.Zepto||e.ender||e.$,t)}}(this,function(e,n,o){function
 t(e){return this.each(function(){var 
o=n(this),t=n.extend({},a.DEFAULTS,o.data(),"object"==typeof 
e&);o.data("WorldMapGenerator",new a(o,t)),o.trigger("map:loaded")})}var 
i=function(e,o){for(var t=[],i=(a.timeZoneValue.filter(function(i){return 
i[e]===o?(t.push(n.extend(!0,{},i)),i):void 0}),0);i0){for(var r in 
n.quickLink[0])i.push(this.genrateElement("span",{"data-select":n.quickLink[0][r]},r));var
 p=this.genrateElement("div",{"cl
 ass":"quickLink"},i);s.push(p)}var 
z=this.genrateElement("svg",{"class":"timezone-map",viewBox:"0 0 "+n.width+" 
"+n.height},o,!0);if(s.length>0){var 
c=this.genrateElement("div",{"class":"Cbox"},s);this.$el.append(c)}if(this.$el.append(z),n.showHoverText){var
 
u=this.genrateElement("span",{"class":"hoverZone"});this.$el.append(u)}n.defaultCss&(n),this.bindEvent(n)},bindEvent:function(){var
 e=this;this.$el.on("mouseenter","svg polygon",function(o){var 
t=n(this).data();n('.timezone-map 
polygon[data-zonename="'+t.zonename+'"]').attr("class","active"),e.$el.find(".hoverZone").text(t.timezone+"
 ("+t.zonename+")")}),this.$el.on("mouseleave","svg 
polygon",function(o){n(".timezone-map 
polygon").attr("class",""),e.$el.find(".hoverZone").text("")}),this.$el.on("click","svg
 
polygon",function(){e.setValue(n(this).attr("data-timezone")),e.$el.trigger("map:clicked")}),this.$el.on("change","select",function(){e.setValue(n(this).val()),e.$el.trigger("map:clicked")}),this.$el.on("click"
 ,".quickLink span",function(){var 

[31/35] ambari git commit: AMBARI-21728. Service and Patch Upgrade Catalog Changes for 2.6 - additional fixes (dlysnichenko)

[ababiichuk]

AMBARI-21728. Service and Patch Upgrade Catalog Changes for 2.6 - additional 
fixes (dlysnichenko)


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

Branch: refs/heads/branch-feature-logsearch-ui
Commit: dee7317e000879313da9d7a08614331daae57e3a
Parents: d2e0c42
Author: Lisnichenko Dmitro 
Authored: Tue Aug 22 19:26:30 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Tue Aug 22 19:26:30 2017 +0300

--
 .../apache/ambari/server/orm/DBAccessor.java|  55 +++
 .../ambari/server/orm/DBAccessorImpl.java   | 119 +
 .../server/orm/helpers/dbms/DbmsHelper.java |  27 ++
 .../orm/helpers/dbms/GenericDbmsHelper.java |  14 +
 .../server/orm/helpers/dbms/H2Helper.java   |  16 +
 .../server/orm/helpers/dbms/MySqlHelper.java|  16 +
 .../server/orm/helpers/dbms/OracleHelper.java   |  16 +
 .../server/orm/helpers/dbms/PostgresHelper.java |  15 +
 .../server/upgrade/SchemaUpgradeHelper.java |   1 +
 .../server/upgrade/UpgradeCatalog252.java   |  51 ++
 .../server/upgrade/UpgradeCatalog260.java   | 325 +
 .../server/upgrade/UpgradeCatalog300.java   |  97 +---
 .../ambari/server/orm/DBAccessorImplTest.java   |  88 
 .../server/upgrade/UpgradeCatalog260Test.java   | 468 +++
 .../server/upgrade/UpgradeCatalog300Test.java   |  74 ---
 15 files changed, 1212 insertions(+), 170 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dee7317e/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index ef343d5..549c0fd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -367,6 +367,21 @@ public interface DBAccessor {
   void executePreparedUpdate(String query, boolean ignoreFailure, 
Object...arguments) throws SQLException;
 
   /**
+   * Execute select {@code columnName} from {@code tableName}
+   * where {@code columnNames} values = {@code values}
+   *
+   * @param tableName
+   * @param columnName
+   * @param columnNames
+   * @param values
+   * @param ignoreFailure
+   * @return
+   * @throws SQLException
+   */
+  List getIntColumnValues(String tableName, String columnName, 
String[] columnNames,
+   String[] values, boolean ignoreFailure) 
throws SQLException;
+
+  /**
* Drop table from schema
* @param tableName
* @throws SQLException
@@ -689,6 +704,46 @@ public interface DBAccessor {
   void moveColumnToAnotherTable(String sourceTableName, DBColumnInfo 
sourceColumn, String sourceIDFieldName,
String targetTableName, DBColumnInfo targetColumn, String 
targetIDFieldName, Object initialValue) throws SQLException;
 
+  /**
+   * Copy column from {@code targetTable} by matching
+   * table keys {@code sourceIDColumnName} and {@code targetIDColumnName}
+   * and condition {@code sourceConditionFieldName} = {@code condition}
+   *
+   * @param sourceTableName  the source table name
+   * @param sourceColumn the source column name
+   * @param sourceIDFieldName1   the source id key filed name matched with 
{@code targetIDFieldName1}
+   * @param sourceIDFieldName2   the source id key filed name matched with 
{@code targetIDFieldName2}
+   * @param sourceIDFieldName3   the source id key filed name matched with 
{@code targetIDFieldName3}
+   * @param targetTableName  the target table name
+   * @param targetColumn the target column name
+   * @param targetIDFieldName1   the target id key name matched with 
{@code sourceIDFieldName1}
+   * @param targetIDFieldName2   the target id key name matched with 
{@code sourceIDFieldName2}
+   * @param targetIDFieldName3   the target id key name matched with 
{@code sourceIDFieldName3}
+   * @param sourceConditionFieldName source key column name which should match 
{@code condition}
+   * @param conditionvalue which should match {@code 
sourceConditionFieldName}
+   * @param initialValue initial value for null-contained cells
+   * @throws SQLException
+   */
+  void copyColumnToAnotherTable(String sourceTableName, DBColumnInfo 
sourceColumn, String sourceIDFieldName1, String sourceIDFieldName2, String 
sourceIDFieldName3,
+String targetTableName, DBColumnInfo 

[01/35] ambari git commit: AMBARI-21488 Default Base URL should be there for OS_TYPE=redhat-ppc6 in IBM Power and change the OS _TYPE to redhat7-ppc64, second patch. (atkach)

[ababiichuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-logsearch-ui f3c103926 -> 0e5bf3901


AMBARI-21488 Default Base URL should be there for OS_TYPE=redhat-ppc6 in IBM 
Power and change the OS _TYPE to redhat7-ppc64, 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/8c5b03b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8c5b03b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8c5b03b6

Branch: refs/heads/branch-feature-logsearch-ui
Commit: 8c5b03b6e51b0fd2db8a237c60d24673cc66a1cd
Parents: 3f6c4ca
Author: Andrii Tkach 
Authored: Thu Aug 17 16:14:31 2017 +0300
Committer: Andrii Tkach 
Committed: Thu Aug 17 17:42:31 2017 +0300

--
 ambari-web/app/controllers/installer.js | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8c5b03b6/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js 
b/ambari-web/app/controllers/installer.js
index 9d7fcd8..d149379 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -708,9 +708,6 @@ App.InstallerController = 
App.WizardController.extend(App.Persist, {
 response.operating_systems.forEach(function(supportedOS) {
   if(!existedMap[supportedOS.OperatingSystems.os_type]) {
 supportedOS.isSelected = false;
-supportedOS.repositories.forEach(function(repo) {
-  repo.Repositories.base_url = '';
-});
 existedOS.push(supportedOS);
   } else if (stack_default) { // only overwrite if it is stack default, 
otherwise use url from /version_definition
 
existedMap[supportedOS.OperatingSystems.os_type].repositories.forEach(function 
(repo) {

[ambari] Git Push Summary

[avijayan]

Repository: ambari
Updated Tags:  refs/tags/release-2.5.2-rc0 [created] f41ace9eb

ambari git commit: Update ambari.version to 2.5.2.0.0 in pom.xml files. (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 24debeed1 -> 6e5fbe519


Update ambari.version to 2.5.2.0.0 in pom.xml files. (avijayan)


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

Branch: refs/heads/branch-2.5
Commit: 6e5fbe519f6b94ed7626d13491b9fe889492f034
Parents: 24debee
Author: Aravindan Vijayan 
Authored: Tue Aug 22 10:21:34 2017 -0700
Committer: Aravindan Vijayan 
Committed: Tue Aug 22 10:21:34 2017 -0700

--
 ambari-admin/pom.xml| 4 ++--
 ambari-agent/pom.xml| 4 ++--
 ambari-client/groovy-client/pom.xml | 4 ++--
 ambari-client/pom.xml   | 4 ++--
 ambari-client/python-client/pom.xml | 4 ++--
 ambari-funtest/pom.xml  | 4 ++--
 ambari-logsearch/ambari-infra-solr-plugin/pom.xml   | 2 +-
 ambari-logsearch/ambari-logsearch-appender/pom.xml  | 4 ++--
 ambari-logsearch/ambari-logsearch-assembly/pom.xml  | 2 +-
 ambari-logsearch/ambari-logsearch-it/pom.xml| 2 +-
 ambari-logsearch/ambari-logsearch-logfeeder/pom.xml | 4 ++--
 ambari-logsearch/ambari-logsearch-portal/pom.xml| 4 ++--
 ambari-logsearch/ambari-logsearch-solr-client/pom.xml   | 2 +-
 ambari-logsearch/pom.xml| 4 ++--
 ambari-metrics/ambari-metrics-assembly/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-common/pom.xml| 2 +-
 ambari-metrics/ambari-metrics-flume-sink/pom.xml| 4 ++--
 ambari-metrics/ambari-metrics-grafana/pom.xml   | 2 +-
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml   | 4 ++--
 ambari-metrics/ambari-metrics-host-monitoring/pom.xml   | 4 ++--
 ambari-metrics/ambari-metrics-kafka-sink/pom.xml| 4 ++--
 ambari-metrics/ambari-metrics-storm-sink-legacy/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-storm-sink/pom.xml| 4 ++--
 ambari-metrics/ambari-metrics-timelineservice/pom.xml   | 6 +++---
 ambari-metrics/pom.xml  | 2 +-
 ambari-project/pom.xml  | 4 ++--
 ambari-server/pom.xml   | 4 ++--
 ambari-shell/ambari-groovy-shell/pom.xml| 6 +++---
 ambari-shell/ambari-python-shell/pom.xml| 4 ++--
 ambari-shell/pom.xml| 4 ++--
 ambari-views/examples/calculator-view/pom.xml   | 4 ++--
 ambari-views/examples/cluster-view/pom.xml  | 6 +++---
 ambari-views/examples/favorite-view/pom.xml | 4 ++--
 ambari-views/examples/hello-servlet-view/pom.xml| 6 +++---
 ambari-views/examples/hello-spring-view/pom.xml | 6 +++---
 ambari-views/examples/helloworld-view/pom.xml   | 6 +++---
 ambari-views/examples/phone-list-upgrade-view/pom.xml   | 6 +++---
 ambari-views/examples/phone-list-view/pom.xml   | 4 ++--
 ambari-views/examples/pom.xml   | 4 ++--
 ambari-views/examples/property-validator-view/pom.xml   | 6 +++---
 ambari-views/examples/property-view/pom.xml | 6 +++---
 ambari-views/examples/restricted-view/pom.xml   | 4 ++--
 ambari-views/examples/simple-view/pom.xml   | 6 +++---
 ambari-views/examples/weather-view/pom.xml  | 4 ++--
 ambari-views/pom.xml| 4 ++--
 ambari-web/pom.xml  | 4 ++--
 contrib/ambari-log4j/pom.xml| 2 +-
 contrib/ambari-scom/ambari-scom-server/pom.xml  | 4 ++--
 contrib/ambari-scom/metrics-sink/pom.xml| 2 +-
 contrib/ambari-scom/pom.xml | 2 +-
 contrib/management-packs/microsoft-r_mpack/pom.xml  | 2 +-
 contrib/management-packs/pom.xml| 2 +-
 contrib/views/ambari-views-package/pom.xml  | 4 ++--
 contrib/views/capacity-scheduler/pom.xml| 4 ++--
 contrib/views/commons/pom.xml   | 6 +++---
 contrib/views/files/pom.xml | 6 +++---
 contrib/views/hawq/pom.xml  | 4 ++--
 contrib/views/hive-next/pom.xml | 8 
 contrib/views/hive20/pom.xml| 8 
 contrib/views/hueambarimigration/pom.xml| 4 ++--
 contrib/views/jobs/pom.xml  | 4 ++--
 contrib/views/pig/pom.xml   | 8 
 contrib/views/pom.xml   | 8 
 contrib/views/slider/pom.xml 

ambari git commit: AMBARI-21728. Service and Patch Upgrade Catalog Changes for 2.6 - additional fixes (dlysnichenko)

[dmitriusan]

Repository: ambari
Updated Branches:
  refs/heads/trunk d2e0c42a1 -> dee7317e0


AMBARI-21728. Service and Patch Upgrade Catalog Changes for 2.6 - additional 
fixes (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: dee7317e000879313da9d7a08614331daae57e3a
Parents: d2e0c42
Author: Lisnichenko Dmitro 
Authored: Tue Aug 22 19:26:30 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Tue Aug 22 19:26:30 2017 +0300

--
 .../apache/ambari/server/orm/DBAccessor.java|  55 +++
 .../ambari/server/orm/DBAccessorImpl.java   | 119 +
 .../server/orm/helpers/dbms/DbmsHelper.java |  27 ++
 .../orm/helpers/dbms/GenericDbmsHelper.java |  14 +
 .../server/orm/helpers/dbms/H2Helper.java   |  16 +
 .../server/orm/helpers/dbms/MySqlHelper.java|  16 +
 .../server/orm/helpers/dbms/OracleHelper.java   |  16 +
 .../server/orm/helpers/dbms/PostgresHelper.java |  15 +
 .../server/upgrade/SchemaUpgradeHelper.java |   1 +
 .../server/upgrade/UpgradeCatalog252.java   |  51 ++
 .../server/upgrade/UpgradeCatalog260.java   | 325 +
 .../server/upgrade/UpgradeCatalog300.java   |  97 +---
 .../ambari/server/orm/DBAccessorImplTest.java   |  88 
 .../server/upgrade/UpgradeCatalog260Test.java   | 468 +++
 .../server/upgrade/UpgradeCatalog300Test.java   |  74 ---
 15 files changed, 1212 insertions(+), 170 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dee7317e/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index ef343d5..549c0fd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -367,6 +367,21 @@ public interface DBAccessor {
   void executePreparedUpdate(String query, boolean ignoreFailure, 
Object...arguments) throws SQLException;
 
   /**
+   * Execute select {@code columnName} from {@code tableName}
+   * where {@code columnNames} values = {@code values}
+   *
+   * @param tableName
+   * @param columnName
+   * @param columnNames
+   * @param values
+   * @param ignoreFailure
+   * @return
+   * @throws SQLException
+   */
+  List getIntColumnValues(String tableName, String columnName, 
String[] columnNames,
+   String[] values, boolean ignoreFailure) 
throws SQLException;
+
+  /**
* Drop table from schema
* @param tableName
* @throws SQLException
@@ -689,6 +704,46 @@ public interface DBAccessor {
   void moveColumnToAnotherTable(String sourceTableName, DBColumnInfo 
sourceColumn, String sourceIDFieldName,
String targetTableName, DBColumnInfo targetColumn, String 
targetIDFieldName, Object initialValue) throws SQLException;
 
+  /**
+   * Copy column from {@code targetTable} by matching
+   * table keys {@code sourceIDColumnName} and {@code targetIDColumnName}
+   * and condition {@code sourceConditionFieldName} = {@code condition}
+   *
+   * @param sourceTableName  the source table name
+   * @param sourceColumn the source column name
+   * @param sourceIDFieldName1   the source id key filed name matched with 
{@code targetIDFieldName1}
+   * @param sourceIDFieldName2   the source id key filed name matched with 
{@code targetIDFieldName2}
+   * @param sourceIDFieldName3   the source id key filed name matched with 
{@code targetIDFieldName3}
+   * @param targetTableName  the target table name
+   * @param targetColumn the target column name
+   * @param targetIDFieldName1   the target id key name matched with 
{@code sourceIDFieldName1}
+   * @param targetIDFieldName2   the target id key name matched with 
{@code sourceIDFieldName2}
+   * @param targetIDFieldName3   the target id key name matched with 
{@code sourceIDFieldName3}
+   * @param sourceConditionFieldName source key column name which should match 
{@code condition}
+   * @param conditionvalue which should match {@code 
sourceConditionFieldName}
+   * @param initialValue initial value for null-contained cells
+   * @throws SQLException
+   */
+  void copyColumnToAnotherTable(String sourceTableName, DBColumnInfo 
sourceColumn, String sourceIDFieldName1, String sourceIDFieldName2, String 
sourceIDFieldName3,
+   

ambari git commit: AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD Types (jonathanhurley)

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/trunk 6f9f87c66 -> d2e0c42a1


AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD 
Types (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: d2e0c42a1d6f67ade14e867d069d73b2567d685b
Parents: 6f9f87c
Author: Jonathan Hurley 
Authored: Mon Aug 21 11:52:03 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 22 11:34:06 2017 -0400

--
 .../VersionDefinitionResourceProvider.java  |  4 +++-
 .../server/orm/dao/RepositoryVersionDAO.java| 20 
 .../orm/entities/RepositoryVersionEntity.java   |  3 +++
 .../orm/dao/RepositoryVersionDAOTest.java   | 12 
 4 files changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index 162c8df..394a0bf 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -437,7 +437,9 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
   return;
 }
 
-List entities = 
s_repoVersionDAO.findByStack(entity.getStackId());
+List entities = 
s_repoVersionDAO.findByStackAndType(
+entity.getStackId(), RepositoryType.STANDARD);
+
 if (entities.isEmpty()) {
   throw new IllegalArgumentException(String.format("Patch %s was uploaded, 
but there are no repositories for %s",
   entity.getVersion(), entity.getStackId().toString()));

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
index d59d229..c83375b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
@@ -134,6 +134,26 @@ public class RepositoryVersionDAO extends 
CrudDAO
   }
 
   /**
+   * Retrieves repository version by stack.
+   *
+   * @param stackId
+   *  stack id stack with major version (like HDP-2.2)
+   * @param type
+   *  the repository type
+   *
+   * @return null if there is no suitable repository version
+   */
+  @RequiresSession
+  public List findByStackAndType(StackId stackId, 
RepositoryType type) {
+final TypedQuery query = 
entityManagerProvider.get().createNamedQuery(
+"repositoryVersionByStackAndType", RepositoryVersionEntity.class);
+query.setParameter("stackName", stackId.getStackName());
+query.setParameter("stackVersion", stackId.getStackVersion());
+query.setParameter("type", type);
+return daoUtils.selectList(query);
+  }
+  
+  /**
* Validates and creates an object.
* The version must be unique within this stack name (e.g., HDP, HDPWIN, 
BIGTOP).
* @param stackEntity Stack entity.

http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e0c42a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index c746363..c7c6ff4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -80,6 +80,9 @@ import com.google.inject.Provider;
 name = "repositoryVersionByStack",
 query = "SELECT repoversion FROM RepositoryVersionEntity repoversion 
WHERE 

ambari git commit: AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD Types (jonathanhurley)

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 4f6b67f84 -> 92d307c91


AMBARI-21766 - When Matching New VDFs for Parent Repos only Consider STANDARD 
Types (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 92d307c91ccfdfdabb505fbb454997374a2327e6
Parents: 4f6b67f
Author: Jonathan Hurley 
Authored: Mon Aug 21 11:52:03 2017 -0400
Committer: Jonathan Hurley 
Committed: Tue Aug 22 11:03:56 2017 -0400

--
 .../VersionDefinitionResourceProvider.java  |  4 +++-
 .../server/orm/dao/RepositoryVersionDAO.java| 20 
 .../orm/entities/RepositoryVersionEntity.java   |  3 +++
 .../orm/dao/RepositoryVersionDAOTest.java   | 12 
 4 files changed, 38 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/92d307c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index ea592e5..e676056 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -433,7 +433,9 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
   return;
 }
 
-List entities = 
s_repoVersionDAO.findByStack(entity.getStackId());
+List entities = 
s_repoVersionDAO.findByStackAndType(
+entity.getStackId(), RepositoryType.STANDARD);
+
 if (entities.isEmpty()) {
   throw new IllegalArgumentException(String.format("Patch %s was uploaded, 
but there are no repositories for %s",
   entity.getVersion(), entity.getStackId().toString()));

http://git-wip-us.apache.org/repos/asf/ambari/blob/92d307c9/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
index 40bbd07..d4497b6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAO.java
@@ -134,6 +134,26 @@ public class RepositoryVersionDAO extends 
CrudDAO
   }
 
   /**
+   * Retrieves repository version by stack.
+   *
+   * @param stackId
+   *  stack id stack with major version (like HDP-2.2)
+   * @param type
+   *  the repository type
+   *
+   * @return null if there is no suitable repository version
+   */
+  @RequiresSession
+  public List findByStackAndType(StackId stackId, 
RepositoryType type) {
+final TypedQuery query = 
entityManagerProvider.get().createNamedQuery(
+"repositoryVersionByStackAndType", RepositoryVersionEntity.class);
+query.setParameter("stackName", stackId.getStackName());
+query.setParameter("stackVersion", stackId.getStackVersion());
+query.setParameter("type", type);
+return daoUtils.selectList(query);
+  }
+
+  /**
* Gets the first repository which matches the specified version. There can 
be
* multiple repositories matching a single version as long as they have
* different stacks. This method is a fallback mechanism if the repository

http://git-wip-us.apache.org/repos/asf/ambari/blob/92d307c9/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index aed0aaf..f84f3a4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -79,6 +79,9 @@ import com.google.inject.Provider;
 name = "repositoryVersionByStack",
   

ambari git commit: AMBARI-21778. Patch Confirmation Message Incorrectly Lists All Hosts (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 fc0140930 -> 4f6b67f84


AMBARI-21778. Patch Confirmation Message Incorrectly Lists All Hosts 
(alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 4f6b67f844d2d394a54c4c0e09e841d70573d526
Parents: fc01409
Author: Alex Antonenko 
Authored: Tue Aug 22 14:35:30 2017 +0300
Committer: Alex Antonenko 
Committed: Tue Aug 22 14:35:30 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/4f6b67f8/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 2839fe2..9eb0c02 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1707,7 +1707,7 @@ Em.I18n.translations = {
   'admin.stackVersions.editRepositories.info': 'Provide Base URLs for the 
Operating Systems you are configuring. Uncheck all other Operating Systems.',
   'admin.stackVersions.editRepositories.validation.warning': 'Some of the 
repositories failed validation. Make changes to the base url or skip validation 
if you are sure that urls are correct',
   'admin.stackVersions.version.install.confirm': 'You are about to install 
packages for version {0} on all hosts.',
-  'admin.stackVersions.version.install.patch.confirm': 'You are about to 
install packages for version {0} on all hosts for the 
following services:',
+  'admin.stackVersions.version.install.patch.confirm': 'You are about to 
install packages for version {0} on hosts which contain the 
following services:',
   'admin.stackVersions.version.install.skipDependencies': 'Skip Dependency 
Check',
   'admin.stackVersions.version.install.skipDependencies.tooltip': 'When 
selected, Ambari will not verify that all package dependencies have been 
satisfied after installing the new stack.',
   'admin.stackVersions.version.linkTooltip': 'Click to Edit Repositories',

[1/3] ambari git commit: AMBARI-21307 LDAP config rest service implementation extends the ambari config rest implementaiton

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 2e5b3e67a -> 1c0658f74


AMBARI-21307 LDAP config rest  service implementation extends the ambari config 
rest implementaiton


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 8ca72fcc64b17f60f7adac1354be9b42b3d3114c
Parents: 6ff3ec6
Author: lpuskas 
Authored: Mon Aug 21 15:53:45 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:13:23 2017 +0200

--
 .../services/ldap/LdapConfigurationService.java | 208 +++
 .../api/services/ldap/LdapRestService.java  | 149 -
 2 files changed, 208 insertions(+), 149 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8ca72fcc/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
new file mode 100644
index 000..52244bc
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
@@ -0,0 +1,208 @@
+/*
+ * Licensed 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.
+ */
+
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services.ldap;
+
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.ambari.annotations.ApiIgnore;
+import org.apache.ambari.server.StaticallyInject;
+import org.apache.ambari.server.api.services.AmbariConfigurationService;
+import org.apache.ambari.server.api.services.Result;
+import org.apache.ambari.server.api.services.ResultImpl;
+import org.apache.ambari.server.api.services.ResultStatus;
+import org.apache.ambari.server.controller.internal.ResourceImpl;
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.ldap.AmbariLdapConfiguration;
+import org.apache.ambari.server.ldap.LdapConfigurationFactory;
+import org.apache.ambari.server.ldap.service.LdapFacade;
+import org.apache.ambari.server.security.authorization.AuthorizationException;
+import org.apache.ambari.server.security.authorization.AuthorizationHelper;
+import org.apache.ambari.server.security.authorization.ResourceType;
+import org.apache.ambari.server.security.authorization.RoleAuthorization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.core.Authentication;
+
+import com.google.common.collect.Sets;
+
+/**
+ * Endpoint designated to LDAP specific operations.
+ */
+@StaticallyInject
+@Path("/ldapconfigs/")
+public class LdapConfigurationService extends AmbariConfigurationService {
+
+  private static final Logger LOGGER = 
LoggerFactory.getLogger(LdapConfigurationService.class);
+
+  @Inject
+  private static LdapFacade ldapFacade;
+
+  @Inject
+  private static LdapConfigurationFactory ldapConfigurationFactory;
+
+  /**
+   * Actions supported by this endpoint
+   */
+  private enum LdapAction {
+TEST_CONNECTION("test-connection"),
+TEST_ATTRIBUTES("test-attributes"),
+DETECT_ATTRIBUTES("detect-attributes");
+
+private String actionStr;
+
+LdapAction(String actionStr) {
+  

[3/3] ambari git commit: AMBARI-21307 refactoring - renamed, moved classes, variables

[lpuskas]

AMBARI-21307 refactoring - renamed, moved classes, variables


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 1c0658f74b6b0cbe150cf3fe5d5ce53ba00c4be1
Parents: 8ca72fc
Author: lpuskas 
Authored: Tue Aug 22 10:03:24 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:13:24 2017 +0200

--
 .../api/services/ldap/AmbariConfiguration.java  |  87 +++
 .../services/ldap/AmbariConfigurationDTO.java   |  67 -
 .../ldap/LdapCheckConfigurationRequest.java |  47 
 .../api/services/ldap/LdapConfigOperation.java  |  43 
 .../services/ldap/LdapConfigurationRequest.java |  49 
 .../services/ldap/LdapConfigurationService.java |  53 +---
 .../api/services/ldap/LdapOperationRequest.java |  18 --
 .../server/ldap/LdapConfigurationService.java   |  60 +
 .../ldap/LdapConfigurationValidatorService.java |  60 -
 .../apache/ambari/server/ldap/LdapModule.java   |   4 +-
 .../server/ldap/service/AmbariLdapFacade.java   |  10 +-
 .../ads/DefaultLdapConfigurationService.java| 243 +++
 ...efaultLdapConfigurationValidatorService.java | 243 ---
 .../api/services/ldap/LDAPServiceTest.java  |   6 +-
 .../DefaultLdapConfigurationServiceTest.java| 113 +
 ...ltLdapConfigurationValidatorServiceTest.java | 113 -
 16 files changed, 618 insertions(+), 598 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1c0658f7/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfiguration.java
new file mode 100644
index 000..b5cc921
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfiguration.java
@@ -0,0 +1,87 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services.ldap;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Domain POJO representing generic ambari configuration data.
+ */
+public class AmbariConfiguration {
+
+  /**
+   * The type of the configuration,  eg.: ldap-configuration
+   */
+  private String type;
+
+  /**
+   * Version tag
+   */
+  private String versionTag;
+
+  /**
+   * Version number
+   */
+  private Integer version;
+
+  /**
+   * Created timestamp
+   */
+  private long createdTs;
+
+  private Set> data = Collections.emptySet();
+
+  public String getType() {
+return type;
+  }
+
+  public void setType(String type) {
+this.type = type;
+  }
+
+  public Set> getData() {
+return data;
+  }
+
+  public void setData(Set> data) {
+this.data = data;
+  }
+
+  public String getVersionTag() {
+return versionTag;
+  }
+
+  public void setVersionTag(String versionTag) {
+this.versionTag = versionTag;
+  }
+
+  public Integer getVersion() {
+return version;
+  }
+
+  public void setVersion(Integer version) {
+this.version = version;
+  }
+
+  public long getCreatedTs() {
+return createdTs;
+  }
+
+  public void setCreatedTs(long createdTs) {
+this.createdTs = createdTs;
+  }
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c0658f7/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
deleted file mode 100644
index 1b134fe..000
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed under the Apache 

[2/3] ambari git commit: AMBARI-21307 renamed package, minor corrections. Changed endpoint name

[lpuskas]

AMBARI-21307 renamed package, minor corrections. Changed endpoint name


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 6ff3ec6c81776572a492ebd71349f0d22dcf4be3
Parents: 2e5b3e6
Author: lpuskas 
Authored: Mon Aug 14 13:21:07 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:13:23 2017 +0200

--
 .../services/AmbariConfigurationService.java|   2 +-
 .../api/services/ldap/LdapRestService.java  |  15 +-
 .../server/ldap/AmbariLdapConfiguration.java|   5 +-
 .../apache/ambari/server/ldap/LdapModule.java   |   4 +-
 ...efaultLdapConfigurationValidatorService.java | 243 ---
 .../ad/DefaultLdapConnectionService.java|  63 -
 ...efaultLdapConfigurationValidatorService.java | 243 +++
 .../ads/DefaultLdapConnectionService.java   |  63 +
 ...ltLdapConfigurationValidatorServiceTest.java | 113 -
 ...ltLdapConfigurationValidatorServiceTest.java | 113 +
 10 files changed, 435 insertions(+), 429 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ff3ec6c/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
index 927e518..492509f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -63,7 +63,7 @@ import io.swagger.annotations.ApiResponses;
  * }
  * 
  */
-@Path("/configurations/")
+@Path("/ambariconfigs/")
 @Api(value = "Ambari Configurations", description = "Endpoint for Ambari 
configuration related operations")
 public class AmbariConfigurationService extends BaseService {
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ff3ec6c/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
index 8578204..4e654dc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapRestService.java
@@ -34,6 +34,7 @@ import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
@@ -70,8 +71,9 @@ public class LdapRestService extends BaseService {
 
   @POST
   @ApiIgnore // until documented
-  @Path("/action") // todo this needs to be moved under the resource
+  @Path("/validate") // todo this needs to be moved under the resource
   @Consumes(MediaType.APPLICATION_JSON)
+  @Produces(MediaType.APPLICATION_JSON)
   public Response validateConfiguration(LdapCheckConfigurationRequest 
ldapCheckConfigurationRequest) {
 
 Set groups = Sets.newHashSet();
@@ -95,10 +97,7 @@ public class LdapRestService extends BaseService {
 
   LOGGER.info("Testing LDAP attributes ");
   groups = 
ldapFacade.checkLdapAttibutes(ldapCheckConfigurationRequest.getRequestInfo().getParameters(),
 ambariLdapConfiguration);
-  // todo factor out the resource creation, design better the 
structure in the response
-  Resource resource = new 
ResourceImpl(Resource.Type.AmbariConfiguration);
-  resource.setProperty("groups", groups);
-  result.getResultTree().addChild(resource, "payload");
+  setResult(groups, result);
 
   break;
 case "detect-attributes":
@@ -119,6 +118,12 @@ public class LdapRestService extends BaseService {
 return 
Response.status(result.getStatus().getStatusCode()).entity(getResultSerializer().serialize(result)).build();
   }
 
+  private void setResult(Set groups, Result result) {
+Resource resource = new ResourceImpl(Resource.Type.AmbariConfiguration);
+resource.setProperty("groups", groups);
+result.getResultTree().addChild(resource, "payload");
+  }
+
   private void validateRequest(LdapCheckConfigurationRequest 

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 348b7632956312607ecf582b480389af3c805b26
Parents: 7555cf5
Author: lpuskas 
Authored: Tue Aug 8 15:50:29 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:03:25 2017 +0200

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


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

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

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 4f9ce1bd0186e6b23839434e6677dc92d1408cfe
Parents: 159d617
Author: lpuskas 
Authored: Thu Jul 6 18:15:18 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:03:24 2017 +0200

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


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

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

[03/10] ambari git commit: Added swagger annotations to the new endpoint

[lpuskas]

Added swagger annotations to the new endpoint


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: e3340ac894d855cb943f1ba8120329be45f63fd3
Parents: 4f9ce1b
Author: Balázs Bence Sári 
Authored: Thu Jul 6 18:36:18 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:03:24 2017 +0200

--
 .../AmbariConfigurationRequestSwagger.java  | 48 +++
 .../AmbariConfigurationResponseSwagger.java | 40 +
 .../services/AmbariConfigurationService.java| 62 +---
 3 files changed, 143 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e3340ac8/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
new file mode 100644
index 000..d6714f9
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.api.services;
+
+import java.util.Map;
+
+import org.apache.ambari.server.controller.ApiModel;
+import org.apache.ambari.server.orm.entities.ConfigurationBaseEntity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Request data model for {@link 
org.apache.ambari.server.api.services.AmbariConfigurationService}
+ */
+public interface AmbariConfigurationRequestSwagger extends ApiModel {
+
+  @ApiModelProperty(name = "AmbariConfiguration")
+  AmbariConfigurationRequestInfo getAmbariConfiguration();
+
+  interface AmbariConfigurationRequestInfo {
+@ApiModelProperty
+Long getId();
+
+@ApiModelProperty
+Map getData();
+
+@ApiModelProperty
+String getType();
+
+@ApiModelProperty
+Long getVersion();
+
+@ApiModelProperty(name = "version_tag")
+String getVersionTag();
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/e3340ac8/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
new file mode 100644
index 000..c55ac1d
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.api.services;
+
+import java.util.Map;
+
+import org.apache.ambari.server.controller.ApiModel;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Response data model for {@link 
org.apache.ambari.server.api.services.AmbariConfigurationService}
+ */
+public interface AmbariConfigurationResponseSwagger extends ApiModel {
+
+  @ApiModelProperty(name = "AmbariConfiguration")
+  AmbariConfigurationResponseInfo getAmbariConfigurationResponse();
+
+  interface AmbariConfigurationResponseInfo {
+@ApiModelProperty
+Long getId();
+
+@ApiModelProperty
+Map getData();
+

[02/10] ambari git commit: AMBARI-21586.Apply zeppelin.server.kerberos.principal related changes to 0.6.0.3.0(Prabhjyot Singh via Venkata Sairam)

[lpuskas]

AMBARI-21586.Apply zeppelin.server.kerberos.principal related changes to 
0.6.0.3.0(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/6f9f87c6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f9f87c6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f9f87c6

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 6f9f87c663e1d5bd7cef5078e2a222700873c195
Parents: 8dfdf5e
Author: Venkata Sairam 
Authored: Tue Aug 22 17:01:24 2017 +0530
Committer: Venkata Sairam 
Committed: Tue Aug 22 17:01:24 2017 +0530

--
 .../ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6f9f87c6/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
index 1edd991..b393def 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
@@ -91,9 +91,13 @@ export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}}
 # export ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC   # If there are multiple notebook 
storages, should we treat the first one as the only source of truth?
 # export ZEPPELIN_NOTEBOOK_PUBLIC # Make notebook public by 
default when created, private otherwise
 export ZEPPELIN_INTP_CLASSPATH_OVERRIDES="{{external_dependency_conf}}"
-
  Spark interpreter configuration 
 
+## Kerberos ticket refresh setting
+##
+export KINIT_FAIL_THRESHOLD=5
+export KERBEROS_REFRESH_INTERVAL=1d
+
 ## Use provided spark installation ##
 ## defining SPARK_HOME makes Zeppelin run spark interpreter process using 
spark-submit
 ##
@@ -165,6 +169,7 @@ export HADOOP_CONF_DIR=/etc/hadoop/conf
 
   Kerberos principal name for the Zeppelin.
 
+KERBEROS_PRINCIPAL
 
   
   

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

[lpuskas]

AMBARI-21307 Implemented PUT operation, added unit tests


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 1799ff26a8a7bfbc761181cb39332694bf5e6dea
Parents: e3340ac
Author: lpuskas 
Authored: Thu Jul 13 16:20:58 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:03:24 2017 +0200

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


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

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 2e5b3e67a0270f96eadcd872e18afe9696c94e19
Parents: 348b763
Author: Balazs Bence Sari 
Authored: Tue Aug 8 20:17:14 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:03:25 2017 +0200

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


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

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

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

[06/10] ambari git commit: AMBARI-21307 Rest resource for supporting ambari configurations

[lpuskas]

AMBARI-21307 Rest resource for supporting ambari configurations


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 159d6179834f81c33fe0d7a39d78c145fb74939c
Parents: 6f9f87c
Author: lpuskas 
Authored: Wed Jul 5 14:20:18 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:03:24 2017 +0200

--
 .../resources/ResourceInstanceFactoryImpl.java  |   4 +
 .../services/AmbariConfigurationService.java| 146 +++
 .../internal/AbstractProviderModule.java|   2 +-
 .../AmbariConfigurationResourceProvider.java| 247 +++
 .../internal/DefaultProviderModule.java |  26 +-
 .../ambari/server/controller/spi/Resource.java  |   5 +-
 .../server/orm/dao/AmbariConfigurationDAO.java  |  92 +++
 .../orm/entities/AmbariConfigurationEntity.java |  70 ++
 .../orm/entities/ConfigurationBaseEntity.java   | 159 
 .../authorization/RoleAuthorization.java|  95 +++
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  25 +-
 .../src/main/resources/META-INF/persistence.xml |   2 +
 12 files changed, 809 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/159d6179/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
index d0d115d..f5fb6e9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
@@ -471,6 +471,10 @@ public class ResourceInstanceFactoryImpl implements 
ResourceInstanceFactory {
   case RemoteCluster:
 resourceDefinition = new RemoteClusterResourceDefinition();
 break;
+  case AmbariConfiguration:
+resourceDefinition = new 
SimpleResourceDefinition(Resource.Type.AmbariConfiguration, 
"ambariconfiguration", "ambariconfigurations");
+
+break;
 
   default:
 throw new IllegalArgumentException("Unsupported resource type: " + 
type);

http://git-wip-us.apache.org/repos/asf/ambari/blob/159d6179/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
new file mode 100644
index 000..0fa6e44
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services;
+
+import java.util.Collections;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.http.HttpStatus;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+
+/**
+ * Rest endpoint for managing ambari configurations. Supports CRUD operations.
+ * Ambari configurations are resources that relate to the ambari server 
instance even before a cluster is provisioned.
+ *
+ * Ambari 

[10/10] ambari git commit: AMBARI-21307 Draft skimplementation for the user related ldap config attribute validation

[lpuskas]

AMBARI-21307 Draft skimplementation for the user related ldap config attribute 
validation


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 1b1eada5288ced49915f9d46ea23bb9285f12d29
Parents: 1799ff2
Author: lpuskas 
Authored: Tue Jul 18 17:48:07 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:03:25 2017 +0200

--
 ambari-project/pom.xml  |   1 +
 ambari-server/pom.xml   |   7 +-
 .../AmbariConfigurationRequestSwagger.java  |   1 -
 .../services/ldap/AmbariConfigurationDTO.java   |  67 +++
 .../ldap/LdapCheckConfigurationRequest.java |  47 +
 .../api/services/ldap/LdapOperationRequest.java |  18 ++
 .../api/services/ldap/LdapRequestInfo.java  |  61 +++
 .../api/services/ldap/LdapRestService.java  | 132 ++
 .../ambari/server/controller/AmbariServer.java  |   3 +-
 .../server/controller/ControllerModule.java |   1 +
 .../server/ldap/AmbariLdapConfiguration.java| 129 ++
 .../server/ldap/LdapConfigurationFactory.java   |  21 +++
 .../ldap/LdapConfigurationValidatorService.java |  52 ++
 .../apache/ambari/server/ldap/LdapModule.java   |  37 
 .../ldap/service/AmbariLdapException.java   |  33 
 .../server/ldap/service/AmbariLdapFacade.java   | 107 +++
 .../ambari/server/ldap/service/LdapFacade.java  |  52 ++
 .../server/ldap/service/LdapSearchService.java  |  18 ++
 .../ad/AdLdapConfigurationValidatorService.java | 177 +++
 .../service/ad/LdapConfigurationConverter.java  |  50 ++
 .../api/services/ldap/LDAPServiceTest.java  |  85 +
 ...AdLdapConfigurationValidatorServiceTest.java | 129 ++
 22 files changed, 1224 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1b1eada5/ambari-project/pom.xml
--
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 00ba1bc..e4d4423 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -31,6 +31,7 @@
 ${project.parent.basedir}
 1.6.3
 8.1.19.v20160209
+1.0.0
 6.19 
 1.5.10
 3.1.4

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b1eada5/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 29a820a..c0f30be 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1287,7 +1287,6 @@
 
   org.apache.directory.shared
   shared-ldap
-  test
 
 
   org.slf4j
@@ -1686,8 +1685,12 @@
   jna
   4.2.2
 
+
+  org.apache.directory.api
+  api-all
+  ${ldap-api.version}
+
   
-
   
 
   oss.sonatype.org

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b1eada5/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
index d6714f9..5e8094e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
@@ -16,7 +16,6 @@ package org.apache.ambari.server.api.services;
 import java.util.Map;
 
 import org.apache.ambari.server.controller.ApiModel;
-import org.apache.ambari.server.orm.entities.ConfigurationBaseEntity;
 
 import io.swagger.annotations.ApiModelProperty;
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1b1eada5/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
new file mode 100644
index 000..1b134fe
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/AmbariConfigurationDTO.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ 

[01/10] ambari git commit: AMBARI-21585.Remove environment variables from zeppelin-env.sh(Prabhjyot Singh via Venkata Sairam) [Forced Update!]

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 16e9ab751 -> 2e5b3e67a (forced update)


AMBARI-21585.Remove environment variables from zeppelin-env.sh(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/8dfdf5ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8dfdf5ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8dfdf5ec

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 8dfdf5ec275849597884508ad1bc1b5846d007cf
Parents: d260c89
Author: Venkata Sairam 
Authored: Tue Aug 22 16:48:39 2017 +0530
Committer: Venkata Sairam 
Committed: Tue Aug 22 16:48:39 2017 +0530

--
 .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml  | 5 +
 .../ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml  | 6 +-
 2 files changed, 2 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8dfdf5ec/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
index 80ac2bb..7f0d9e4 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml
@@ -66,7 +66,6 @@ export JAVA_HOME={{java64_home}}
 export MASTER=yarn-client
 export SPARK_YARN_JAR={{spark_jar}}
 # export ZEPPELIN_JAVA_OPTS   # Additional jvm options. for 
example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g 
-Dspark.cores.max=16"
-export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}} 
-Dspark.executor.instances={{executor_instances}} 
-Dspark.yarn.queue={{spark_queue}}"
 # export ZEPPELIN_MEM # Zeppelin jvm mem options 
Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
 # export ZEPPELIN_INTP_MEM# zeppelin interpreter process 
jvm mem options. Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
 # export ZEPPELIN_INTP_JAVA_OPTS  # zeppelin interpreter process 
jvm options.
@@ -101,7 +100,7 @@ export KERBEROS_REFRESH_INTERVAL=1d
 ## defining SPARK_HOME makes Zeppelin run spark interpreter process using 
spark-submit
 ##
 # export SPARK_HOME   # (required) When it is defined, 
load it instead of Zeppelin embedded Spark libraries
-#export SPARK_HOME={{spark_home}}
+# export SPARK_HOME={{spark_home}}
 # export SPARK_SUBMIT_OPTIONS # (optional) extra options to 
pass to spark submit. eg) "--driver-memory 512M --executor-memory 1G".
 # export SPARK_APP_NAME   # (optional) The name of spark 
application.
 
@@ -117,8 +116,6 @@ export HADOOP_CONF_DIR=/etc/hadoop/conf
 # export PYSPARK_PYTHON   # path to the python command. 
must be the same path on the driver(Zeppelin) and all workers.
 # export PYTHONPATH
 
-export 
PYTHONPATH="${SPARK_HOME}/python:${SPARK_HOME}/python/lib/py4j-0.8.2.1-src.zip"
-export SPARK_YARN_USER_ENV="PYTHONPATH=${PYTHONPATH}"
 
 ## Spark interpreter options ##
 ##

http://git-wip-us.apache.org/repos/asf/ambari/blob/8dfdf5ec/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
index 7bd597f..1edd991 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml
@@ -68,7 +68,6 @@ export JAVA_HOME={{java64_home}}
 export MASTER=yarn-client
 export SPARK_YARN_JAR={{spark_jar}}
 # export ZEPPELIN_JAVA_OPTS   # Additional jvm options. for 
example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g 
-Dspark.cores.max=16"
-export ZEPPELIN_JAVA_OPTS="-Dhdp.version={{full_stack_version}} 
-Dspark.executor.memory={{executor_mem}} 
-Dspark.executor.instances={{executor_instances}} 
-Dspark.yarn.queue={{spark_queue}}"
 # export ZEPPELIN_MEM # Zeppelin jvm mem options 
Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
 # export ZEPPELIN_INTP_MEM# zeppelin interpreter process 
jvm 

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

[lpuskas]

AMBARI-21307 Draft implementation of the group related attributes


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 7555cf593de6839e7df1e2c727eeb8beadf02d8e
Parents: 1b1eada
Author: lpuskas 
Authored: Tue Aug 8 13:54:29 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 14:03:25 2017 +0200

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


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

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

[04/51] [abbrv] ambari git commit: AMBARI-21729 Owner of yarn.include stays to be root:root where as dfs.include gets changed to the correct one upon restart services (dsen)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/5c78bd75/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_dont_manage.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_dont_manage.json
 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_dont_manage.json
new file mode 100644
index 000..ac3f86d
--- /dev/null
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/configs/default_yarn_include_file_dont_manage.json
@@ -0,0 +1,1260 @@
+{
+  "localComponents": [
+"NAMENODE",
+"SECONDARY_NAMENODE",
+"ZOOKEEPER_SERVER",
+"DATANODE",
+"HDFS_CLIENT",
+"ZOOKEEPER_CLIENT",
+"RESOURCEMANAGER",
+"HISTORYSERVER",
+"NODEMANAGER",
+"YARN_CLIENT",
+"MAPREDUCE2_CLIENT",
+"SLIDER",
+"PIG",
+"SQOOP",
+"HIVE_CLIENT",
+"TEZ_CLIENT",
+"HIVE_CLIENT",
+"SPARK_CLIENT",
+"SPARK2_CLIENT"
+  ],
+  "roleCommand": "SERVICE_CHECK",
+  "clusterName": "c1",
+  "hostname": "c6401.ambari.apache.org",
+  "hostLevelParams": {
+"not_managed_hdfs_path_list": 
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+"agent_stack_retry_count": "5",
+"agent_stack_retry_on_unavailability": "false",
+"agentCacheDir": "/var/lib/ambari-agent/cache",
+"jdk_location": "http://c6401.ambari.apache.org:8080/resources/;,
+"ambari_db_rca_password": "mapred",
+"ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+"repo_info": 
"[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}];,
+"jce_name": "UnlimitedJCEPolicyJDK7.zip",
+"stack_version": "2.0",
+"stack_name": "HDP",
+"ambari_db_rca_driver": "org.postgresql.Driver",
+"jdk_name": "jdk-7u67-linux-x64.tar.gz",
+"ambari_db_rca_username": "mapred",
+"java_home": "/usr/jdk64/jdk1.7.0_45",
+"java_version": "8",
+"db_name": "ambari",
+"user_group": "{\"sample\":[\"sample\",\"users\"]}",
+"group_list": "[\"hadoop\",\"nobody\",\"users\"]",
+"user_list": 
"[\"hive\",\"oozie\",\"nobody\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]",
+"custom_mysql_jdbc_name" : "mysql-connector-java.jar",
+"custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
+"custom_postgres_jdbc_name" : "test-postgres-jdbc.jar",
+"custom_sqlanywhere_jdbc_name" : "sqla-client-jdbc.tar.gz"
+  },
+  "commandType": "EXECUTION_COMMAND",
+  "roleParams": {},
+  "serviceName": "HIVE",
+  "role": "HIVE_SERVER",
+  "commandParams": {
+"command_timeout": "300",
+"service_package_folder": "OOZIE",
+"script_type": "PYTHON",
+"script": "scripts/service_check.py",
+"excluded_hosts": "host1,host2",
+"mark_draining_only" : "false",
+"update_files_only" : "false",
+"xml_configs_list":[{"hdfs-site.xml":"hdfs-site"}],
+
"env_configs_list":[{"hadoop-env.sh":"hadoop-env"},{"log4j.properties":"hdfs-log4j,yarn-log4j"}],
+
"properties_configs_list":[{"runtime.properties":"falcon-runtime.properties"},{"startup.properties":"falcon-startup.properties"}],
+"output_file":"HDFS_CLIENT-configs.tar.gz",
+"refresh_topology": "True"
+  },
+  "taskId": 152,
+  "public_hostname": "c6401.ambari.apache.org",
+  "configurations": {
+"sqoop-site": {
+  "atlas.cluster.name": "c1",
+  "sqoop.job.data.publish.class": "org.apache.atlas.sqoop.hook.SqoopHook"
+},
+"mapred-site": {
+  "mapreduce.jobhistory.address": "c6402.ambari.apache.org:10020",
+  "mapreduce.cluster.administrators": " hadoop",
+  "mapreduce.reduce.input.buffer.percent": "0.0",
+  "mapreduce.output.fileoutputformat.compress": "false",
+  "mapreduce.framework.name": "yarn",
+  "mapreduce.map.speculative": "false",
+  "mapreduce.reduce.shuffle.merge.percent": "0.66",
+  "yarn.app.mapreduce.am.resource.mb": "683",
+  "mapreduce.map.java.opts": "-Xmx273m",
+  "mapreduce.application.classpath": 
"$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
+  "mapreduce.job.reduce.slowstart.completedmaps": "0.05",
+  "mapreduce.output.fileoutputformat.compress.type": "BLOCK",
+  "mapreduce.reduce.speculative": "false",
+  "mapreduce.reduce.java.opts": "-Xmx546m",
+  "mapreduce.am.max-attempts": "2",
+  "yarn.app.mapreduce.am.admin-command-opts": 
"-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN",
+  "mapreduce.reduce.log.level": "INFO",
+  "mapreduce.map.sort.spill.percent": "0.7",
+  "mapreduce.task.timeout": "30",
+  "mapreduce.map.memory.mb": "341",
+  

[20/51] [abbrv] ambari git commit: AMBARI-21745 UI: remove code which adds ELExtension properties while adding Falcon. (atkach)

[lpuskas]

AMBARI-21745 UI: remove code which adds ELExtension properties while adding 
Falcon. (atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 9a08bce35082f7e9ada7022c9e6bbf1b769348c4
Parents: b428fb9
Author: Andrii Tkach 
Authored: Thu Aug 17 19:03:43 2017 +0300
Committer: Andrii Tkach 
Committed: Fri Aug 18 12:14:53 2017 +0300

--
 ambari-web/app/controllers/main/service/item.js | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9a08bce3/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 197eb8e..224f83b 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -148,6 +148,10 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   
App.StackService.find(this.get('content.serviceName')).get('dependentServiceNames')
 : [];
   }.property('content.serviceName', 
'App.router.clusterController.isConfigsPropertiesLoaded'),
 
+  configDependentServiceNames: function() {
+return 
this.get('dependentServiceNames').concat(App.StackService.find(this.get('content.serviceName')).get('requiredServices'))
+  }.property('dependentServiceNames'),
+
   /**
* List of service names that could be deleted
* Common case when there is only current service should be removed
@@ -171,7 +175,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
* @type {String[]}
*/
   sitesToLoad: function() {
-var services = this.get('dependentServiceNames'), configTypeList = [];
+var services = this.get('configDependentServiceNames'), configTypeList = 
[];
 if (services.length) {
   configTypeList = App.StackService.find().filter(function(s) {
 return services.contains(s.get('serviceName'));
@@ -225,7 +229,7 @@ App.MainServiceItemController = 
Em.Controller.extend(App.SupportClientConfigsDow
   allConfigs = allConfigs.concat(App.config.getConfigsFromJSON(site, 
true));
 });
 
-self.get('dependentServiceNames').forEach(function(serviceName) {
+self.get('configDependentServiceNames').forEach(function(serviceName) {
   var configTypes = 
App.StackService.find(serviceName).get('configTypeList');
   var configsByService = allConfigs.filter(function (c) {
 return 
configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename')));

[42/51] [abbrv] ambari git commit: AMBARI-21755 Unexpected Package Names in CentOS Cause Installation Failures (dgrinenko)

[lpuskas]

AMBARI-21755 Unexpected Package Names in CentOS Cause Installation Failures 
(dgrinenko)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 6de8094a45c536340b56d73d4b0116c68349096c
Parents: d5904b9
Author: Dmytro Grinenko 
Authored: Tue Aug 22 06:14:31 2017 +0300
Committer: Dmytro Grinenko 
Committed: Tue Aug 22 06:14:31 2017 +0300

--
 .../core/providers/package/__init__.py | 17 ++---
 .../python/custom_actions/TestInstallPackages.py   | 10 ++
 2 files changed, 20 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6de8094a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
index 9793a84..9404757 100644
--- 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
+++ 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
@@ -23,9 +23,6 @@ Ambari Agent
 import time
 import re
 import logging
-import sys
-
-import subprocess
 
 from resource_management.core.exceptions import ExecutionFailed
 from resource_management.core.providers import Provider
@@ -344,6 +341,7 @@ class RPMBasedPackageProvider(PackageProvider):
   """
RPM Based abstract package provider
   """
+  INSTALLED_PACKAGE_VERSION_COMMAND = "rpm -q --queryformat 
'%{{version}}-%{{release}}' \"{0}\""
 
   def rpm_check_package_available(self, name):
 import rpm # this is faster then calling 'rpm'-binary externally.
@@ -359,8 +357,13 @@ class RPMBasedPackageProvider(PackageProvider):
 return False
 
   def get_installed_package_version(self, package_name):
-result = self.checked_call("rpm -q --queryformat 
'%{{version}}-%{{release}}' {0} | sed -e 
's/\.el[0-9]//g'".format(package_name), stderr=subprocess.PIPE)
-if len(result) >= 2:
-  return result[1]
+version = None
 
-return None
+result = 
self.checked_call(self.INSTALLED_PACKAGE_VERSION_COMMAND.format(package_name))
+try:
+  if result[0] == 0:
+version = result[1].strip().partition(".el")[0]
+except IndexError:
+  pass
+
+return version

http://git-wip-us.apache.org/repos/asf/ambari/blob/6de8094a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
--
diff --git 
a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py 
b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
index b31e2f5..de2cced 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -75,6 +75,16 @@ class TestInstallPackages(RMFTestCase):
   def _add_packages_lookUpYum(*args):
 return TestInstallPackages._add_packages_available(*args)
 
+  def test_get_installed_package_version(self):
+from resource_management.core.providers.package.yumrpm import YumProvider
+
+provider = YumProvider(None)
+with patch.object(provider, "checked_call") as checked_call_mock:
+  checked_call_mock.return_value = 0, "3.1.0.0-54.el7.centos"
+  expected_version = provider.get_installed_package_version("test")
+  self.assertEquals("3.1.0.0-54", expected_version)
+
+
   
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
   @patch("resource_management.core.providers.get_provider")
   @patch("resource_management.libraries.script.Script.put_structured_out")

[34/51] [abbrv] ambari git commit: AMBARI-21762 Sometimes alerts order is not correctly arranged if ordering by Status. (atkach)

[lpuskas]

AMBARI-21762 Sometimes alerts order is not correctly arranged if ordering by 
Status. (atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: f901e15bac6728215ab5adea54775565bb8bdd46
Parents: 13589bb
Author: Andrii Tkach 
Authored: Mon Aug 21 15:17:50 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Aug 21 15:17:50 2017 +0300

--
 ambari-web/app/views/common/sort_view.js| 26 ++-
 .../app/views/main/alert_definitions_view.js|  7 ++-
 ambari-web/test/views/common/sort_view_test.js  | 49 +++-
 .../views/main/alert_definitions_view_test.js   |  2 +-
 4 files changed, 78 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f901e15b/ambari-web/app/views/common/sort_view.js
--
diff --git a/ambari-web/app/views/common/sort_view.js 
b/ambari-web/app/views/common/sort_view.js
index 0fc1db7..290a12f 100644
--- a/ambari-web/app/views/common/sort_view.js
+++ b/ambari-web/app/views/common/sort_view.js
@@ -30,6 +30,8 @@ var App = require('app');
 var wrapperView = Em.View.extend({
   tagName: 'tr',
 
+  name: 'SortWrapperView',
+
   classNames: ['sort-wrapper'],
 
   willInsertElement: function () {
@@ -87,9 +89,10 @@ var wrapperView = Em.View.extend({
* @param property {object}
* @param order {Boolean} true - DESC, false - ASC
* @param returnSorted {Boolean}
+   * @param content {Array}
*/
-  sort: function (property, order, returnSorted) {
-var content = this.get('content').toArray();
+  sort: function (property, order, returnSorted, content) {
+content = content || this.get('content').toArray();
 var sortFunc = this.getSortFunc(property, order);
 var status = order ? 'sorting_desc' : 'sorting_asc';
 
@@ -122,6 +125,25 @@ var wrapperView = Em.View.extend({
   }.observes('controller.contentUpdater'),
 
   /**
+   *
+   * @param {Em.Object[]} content
+   * @returns {Em.Object[]}
+   */
+  getSortedContent: function(content) {
+if (!this.get('isSorting') && content.get('length')) {
+  var activeSortViews = this.get('childViews').rejectProperty('status', 
'sorting');
+  if (activeSortViews[0]) {
+var status = activeSortViews[0].get('status');
+this.set('isSorting', true);
+content = this.sort(activeSortViews[0], status === 'sorting_desc', 
true, content);
+this.set('isSorting', false);
+activeSortViews[0].set('status', status);
+  }
+}
+return content;
+  },
+
+  /**
* reset all sorts fields
*/
   resetSort: function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/f901e15b/ambari-web/app/views/main/alert_definitions_view.js
--
diff --git a/ambari-web/app/views/main/alert_definitions_view.js 
b/ambari-web/app/views/main/alert_definitions_view.js
index 530bca7..f7515bc 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -32,7 +32,10 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 
   contentObsOnce: function() {
 var content = this.get('controller.content') && 
App.get('router.clusterController.isAlertsLoaded') ?
-  
this.get('controller.content').toArray().sort(App.AlertDefinition.getSortDefinitionsByStatus(true))
 : [];
+  this.get('controller.content').toArray() : [];
+if (this.get('childViews').someProperty('name', 'SortWrapperView')) {
+  content = this.get('childViews').findProperty('name', 
'SortWrapperView').getSortedContent(content);
+}
 this.set('content', content);
   },
 
@@ -46,7 +49,7 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 if (savedSortConditions.everyProperty('status', 'sorting')) {
   savedSortConditions.push({
 name: "summary",
-status: "sorting_asc"
+status: "sorting_desc"
   });
   App.db.setSortingStatuses(controllerName, savedSortConditions);
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/f901e15b/ambari-web/test/views/common/sort_view_test.js
--
diff --git a/ambari-web/test/views/common/sort_view_test.js 
b/ambari-web/test/views/common/sort_view_test.js
index a21a352..9d095ec 100644
--- a/ambari-web/test/views/common/sort_view_test.js
+++ b/ambari-web/test/views/common/sort_view_test.js
@@ -182,6 +182,53 @@ describe('#wrapperView', function () {
   });
 
 })
-  })
+  });
+
+  

[35/51] [abbrv] ambari git commit: AMBARI-21758 - Prevent New Clusters from Being Provisioned With PATCH/MAINT Repos (jonathanhurley)

[lpuskas]

AMBARI-21758 - Prevent New Clusters from Being Provisioned With PATCH/MAINT 
Repos (jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 28a42236a1dfc924fed73edfaf4ea6d896f16f02
Parents: f901e15
Author: Jonathan Hurley 
Authored: Fri Aug 18 15:38:17 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Aug 21 09:31:10 2017 -0400

--
 .../controller/AmbariManagementControllerImpl.java   | 15 ++-
 .../controller/internal/ServiceResourceProvider.java | 10 ++
 .../server/orm/entities/RepositoryVersionEntity.java |  8 +++-
 .../apache/ambari/server/topology/AmbariContext.java |  8 
 .../ambari/server/topology/AmbariContextTest.java|  2 ++
 5 files changed, 29 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/28a42236/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 d3b6d7c..96280ea 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
@@ -39,7 +39,6 @@ import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_R
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.UNLIMITED_KEY_JCE_REQUIRED;
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.USER_GROUPS;
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.USER_LIST;
-import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.VERSION;
 import static 
org.apache.ambari.server.controller.AmbariCustomCommandExecutionHelper.masterToSlaveMappingForDecom;
 
 import java.io.File;
@@ -434,18 +433,19 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 if (request.getClusterName() == null
 || request.getClusterName().isEmpty()
 || request.getClusterId() != null) {
-  throw new IllegalArgumentException("Cluster name should be provided" +
-  " and clusterId should be null");
+  throw new IllegalArgumentException(
+  "Cluster name should be provided and clusterId should be null");
 }
 
 if (LOG.isDebugEnabled()) {
-  LOG.debug("Received a createCluster request, clusterName={}, 
request={}", request.getClusterName(), request);
+  LOG.debug("Received a createCluster request, clusterName={}, request={}",
+  request.getClusterName(), request);
 }
 
 if (request.getStackVersion() == null
 || request.getStackVersion().isEmpty()) {
-  throw new IllegalArgumentException("Stack information should be"
-  + " provided when creating a cluster");
+  throw new IllegalArgumentException(
+  "Stack information should be provided when creating a cluster");
 }
 
 StackId stackId = new StackId(request.getStackVersion());
@@ -2418,9 +2418,6 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 commandParams.put(MAX_DURATION_OF_RETRIES, 
Integer.toString(retryMaxTime));
 commandParams.put(COMMAND_RETRY_ENABLED, 
Boolean.toString(retryEnabled));
 
-if (repoVersion != null) {
- commandParams.put(VERSION, repoVersion.getVersion());
-}
 if (script.getTimeout() > 0) {
   scriptCommandTimeout = String.valueOf(script.getTimeout());
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/28a42236/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index 818017e..e65693b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
@@ -68,6 +68,7 @@ import 
org.apache.ambari.server.serveraction.kerberos.KerberosMissingAdminCreden
 import 

[30/51] [abbrv] ambari git commit: AMBARI-21759 yumrpm provider doesn't parses installed packages in a same way on different CentOS versions (dgrinenko)

[lpuskas]

AMBARI-21759 yumrpm provider doesn't parses installed packages in a same way on 
different CentOS versions (dgrinenko)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: a0ae01d883eaaecb4542e990389ea9483c63eac9
Parents: 79ff23f
Author: Dmytro Grinenko 
Authored: Sat Aug 19 05:47:22 2017 +0300
Committer: Dmytro Grinenko 
Committed: Sat Aug 19 05:47:22 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/a0ae01d8/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 26fbc3e..8c02992 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
@@ -119,36 +119,10 @@ class YumProvider(RPMBasedPackageProvider):
 :type repo_filter str|None
 :rtype list[list,]
 """
-packages = []
-cmd_filter = "| grep \"{0}\"".format(repo_filter) if repo_filter else ""
-
-# tr '\n' '#' %s | sed -e 's/# / /g' | tr '#' '\n' - fix yum formatted 
output for default console width
-cmd = AMBARI_SUDO_BINARY + " yum list installed {filter}|tr '\\n' '#' | 
sed -e 's/# / /g' | tr '#' '\\n'|awk '{printf \"%s;%s;%s\\n\", 
$1,$2,$3}'".replace("{filter}", cmd_filter)
-result = self._call_with_timeout(cmd)
-col_sep = ";"
-
-"""
-command would return everything in following format:
-
-Loaded;plugins:;fastestmirror
-Installed;Packages;
-package_name;version;@Repo
-
-"""
-
-if result and 0 == result['retCode']:
-  raw_pkgs = result['out'].split("\n")
-
-  for line in raw_pkgs:
-package_item = line.split(col_sep)
-
-if len(package_item) < 3:
-  continue
-elif not package_item[2].startswith("@"):
-  continue
 
-package_item[2] = package_item[2][1:]
-packages.append(package_item)
+packages = self._lookup_packages([AMBARI_SUDO_BINARY, "yum", "list", 
"installed"], "Installed Packages")
+if repo_filter:
+  packages = [item for item in packages if item[2].lower() == 
repo_filter.lower()]
 
 return packages
 

[46/51] [abbrv] ambari git commit: AMBARI-21307 Rest resource for supporting ambari configurations

[lpuskas]

AMBARI-21307 Rest resource for supporting ambari configurations


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 5452910af14fbec156251bfd131a515f71f09a1f
Parents: d260c89
Author: lpuskas 
Authored: Wed Jul 5 14:20:18 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 11:55:12 2017 +0200

--
 .../resources/ResourceInstanceFactoryImpl.java  |   4 +
 .../services/AmbariConfigurationService.java| 146 +++
 .../internal/AbstractProviderModule.java|   2 +-
 .../AmbariConfigurationResourceProvider.java| 247 +++
 .../internal/DefaultProviderModule.java |  26 +-
 .../ambari/server/controller/spi/Resource.java  |   5 +-
 .../server/orm/dao/AmbariConfigurationDAO.java  |  92 +++
 .../orm/entities/AmbariConfigurationEntity.java |  70 ++
 .../orm/entities/ConfigurationBaseEntity.java   | 159 
 .../authorization/RoleAuthorization.java|  95 +++
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  25 +-
 .../src/main/resources/META-INF/persistence.xml |   2 +
 12 files changed, 809 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5452910a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
index d0d115d..f5fb6e9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
@@ -471,6 +471,10 @@ public class ResourceInstanceFactoryImpl implements 
ResourceInstanceFactory {
   case RemoteCluster:
 resourceDefinition = new RemoteClusterResourceDefinition();
 break;
+  case AmbariConfiguration:
+resourceDefinition = new 
SimpleResourceDefinition(Resource.Type.AmbariConfiguration, 
"ambariconfiguration", "ambariconfigurations");
+
+break;
 
   default:
 throw new IllegalArgumentException("Unsupported resource type: " + 
type);

http://git-wip-us.apache.org/repos/asf/ambari/blob/5452910a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
new file mode 100644
index 000..0fa6e44
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.api.services;
+
+import java.util.Collections;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.http.HttpStatus;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+
+/**
+ * Rest endpoint for managing ambari configurations. Supports CRUD operations.
+ * Ambari configurations are resources that relate to the ambari server 
instance even before a cluster is provisioned.
+ *
+ * Ambari 

[39/51] [abbrv] ambari git commit: AMBARI-21769. zeppelin principal and livy.superusers property do not match on upgraded cluster from Ambari 2.4.2 -and HDP 2.5.5 (rlevas)

[lpuskas]

AMBARI-21769. zeppelin principal and livy.superusers property do not match on 
upgraded cluster from Ambari 2.4.2 -and HDP 2.5.5 (rlevas)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: c129baa1f6e4438b7af9e7a01735d8ead05df1be
Parents: 5895040
Author: Robert Levas 
Authored: Mon Aug 21 17:00:52 2017 -0400
Committer: Robert Levas 
Committed: Mon Aug 21 17:00:52 2017 -0400

--
 .../kerberos/DeconstructedPrincipal.java|   2 +-
 .../server/upgrade/UpgradeCatalog252.java   | 174 +++
 .../SPARK/2.2.0/service_advisor.py  |  48 +-
 .../ZEPPELIN/0.6.0.3.0/service_advisor.py   |  46 +-
 .../stacks/HDP/2.5/services/SPARK/kerberos.json |   3 +-
 .../stacks/HDP/2.5/services/stack_advisor.py|  58 ++-
 .../stacks/HDP/2.6/services/SPARK/kerberos.json |   3 +-
 .../HDP/2.6/services/SPARK2/kerberos.json   |   3 +-
 .../stacks/HDP/2.6/services/stack_advisor.py|  60 ++-
 .../src/main/resources/stacks/stack_advisor.py  |   6 +-
 .../server/upgrade/UpgradeCatalog252Test.java   | 203 
 .../SPARK/2.2.0/test_service_advisor.py | 289 
 .../stacks/2.5/common/test_stack_advisor.py | 197 
 .../stacks/2.6/common/test_stack_advisor.py | 471 +++
 14 files changed, 1545 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c129baa1/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
index 764324b..692b130 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/DeconstructedPrincipal.java
@@ -36,7 +36,7 @@ import javax.annotation.Nullable;
  * This class will create a DeconstructedPrincipal from a String containing a 
principal using
  * {@link DeconstructedPrincipal#valueOf(String, String)}
  */
-class DeconstructedPrincipal {
+public class DeconstructedPrincipal {
   /**
* Regular expression to parse the different principal formats:
* 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c129baa1/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
index 2227675..1192c11 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
@@ -18,18 +18,30 @@
 package org.apache.ambari.server.upgrade;
 
 import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
+import org.apache.ambari.server.orm.dao.ArtifactDAO;
+import org.apache.ambari.server.orm.entities.ArtifactEntity;
+import org.apache.ambari.server.serveraction.kerberos.DeconstructedPrincipal;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.PropertyInfo;
+import 
org.apache.ambari.server.state.kerberos.AbstractKerberosDescriptorContainer;
+import org.apache.ambari.server.state.kerberos.KerberosConfigurationDescriptor;
+import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
+import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
@@ -46,6 +58,11 @@ public class UpgradeCatalog252 extends 
AbstractUpgradeCatalog {
   private static final String CLUSTER_ENV = "cluster-env";
 
   /**
+   * Logger.
+   */
+  private static final Logger LOG = 

[27/51] [abbrv] ambari git commit: Revert "Add hadoop LZO jars if installed in the cluster. (Slim Bouguerra via Swapan Shridhar)."

[lpuskas]

Revert "Add hadoop LZO jars if installed in the cluster. (Slim Bouguerra via 
Swapan Shridhar)."

This reverts commit bbec0d3751b9aad709d8fbf86c2744b4bb412e2d.


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: b0f21da12b6266191fc0669d4dc69ff945a9b785
Parents: bbec0d3
Author: Swapan Shridhar 
Authored: Fri Aug 18 14:56:00 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Aug 18 14:56:00 2017 -0700

--
 .../DRUID/0.9.2/package/scripts/druid.py| 12 --
 .../DRUID/0.9.2/package/scripts/params.py   | 13 ---
 .../test/python/stacks/2.6/DRUID/test_druid.py  | 24 +++-
 3 files changed, 8 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f21da1/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
index fa52247..cc02519 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
@@ -18,7 +18,6 @@ limitations under the License.
 """
 import json
 import os
-from resource_management import Fail
 from resource_management.libraries.resources.properties_file import 
PropertiesFile
 from resource_management.core.resources.system import Directory, Execute, File
 from resource_management.core.source import DownloadSource
@@ -114,17 +113,6 @@ def druid(upgrade_type=None, nodeType=None):

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

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0f21da1/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index 7e90475..d47e604 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -18,7 +18,6 @@ limitations under the License.
 
 """
 from ambari_commons import OSCheck
-from resource_management.libraries.functions.get_lzo_packages import 
get_lzo_packages
 from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
 from resource_management.libraries.resources.hdfs_resource import HdfsResource
@@ -27,7 +26,6 @@ from resource_management.libraries.script.script import Script
 from resource_management.libraries.functions import format
 from resource_management.libraries.functions.get_not_managed_resources import 
get_not_managed_resources
 from resource_management.libraries.functions.default import default
-from ambari_commons.constants import AMBARI_SUDO_BINARY
 
 import status_params
 
@@ -52,14 +50,10 @@ stack_name = default("/hostLevelParams/stack_name", None)
 # stack version
 stack_version = default("/commandParams/version", None)
 
-# un-formatted stack version
-stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
-
 # default role to coordinator needed for service checks
 component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "DRUID_COORDINATOR")
 
 hostname = config['hostname']

[48/51] [abbrv] ambari git commit: AMBARI-21307 Draft implementation of the group related attributes

[lpuskas]

AMBARI-21307 Draft implementation of the group related attributes


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 93e387e9fbc97f78570e434b1a221ac66de3c539
Parents: 4e9c4fc
Author: lpuskas 
Authored: Tue Aug 8 13:54:29 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 11:55:13 2017 +0200

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


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

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

[40/51] [abbrv] ambari git commit: AMBARI-21765. Missing hdfs_scheme variable in params.py file for Apache Knox (Sandeep More via smohanty)

[lpuskas]

AMBARI-21765. Missing hdfs_scheme variable in params.py file for Apache Knox 
(Sandeep More via smohanty)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 8e33d8864aa0d1cb5be00241be5900d9fa9310dd
Parents: c129baa
Author: Sumit Mohanty 
Authored: Mon Aug 21 14:00:40 2017 -0700
Committer: Sumit Mohanty 
Committed: Mon Aug 21 14:01:19 2017 -0700

--
 .../0.5.0.2.2/package/scripts/params_linux.py   | 27 
 .../0.5.0.3.0/package/scripts/params_linux.py   | 26 +++
 2 files changed, 53 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e33d886/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
index 7ddf0c8..97b90af 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py
@@ -150,17 +150,30 @@ else:
 
 has_namenode = not namenode_host == None
 namenode_http_port = "50070"
+namenode_https_port = "50470"
 namenode_rpc_port = "8020"
 
 if has_namenode:
   if 'dfs.namenode.http-address' in config['configurations']['hdfs-site']:
 namenode_http_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.http-address'])
+  if 'dfs.namenode.https-address' in config['configurations']['hdfs-site']:
+namenode_https_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.https-address'])
   if dfs_ha_enabled and namenode_rpc:
 namenode_rpc_port = get_port_from_url(namenode_rpc)
   else:
 if 'dfs.namenode.rpc-address' in config['configurations']['hdfs-site']:
   namenode_rpc_port = 
get_port_from_url(config['configurations']['hdfs-site']['dfs.namenode.rpc-address'])
 
+dfs_http_policy = default('/configurations/hdfs-site/dfs.http.policy', None)
+
+hdfs_https_on = False
+hdfs_scheme = 'http'
+if dfs_http_policy  !=  None :
+   hdfs_https_on = (dfs_http_policy.upper() == 'HTTPS_ONLY')
+   hdfs_scheme = 'http' if not hdfs_https_on else 'https'
+   hdfs_port = str(namenode_http_port)  if not hdfs_https_on else 
str(namenode_https_port)
+   namenode_http_port = hdfs_port
+
 webhdfs_service_urls = ""
 
 def buildUrlElement(protocol, hdfs_host, port, servicePath) :
@@ -181,6 +194,13 @@ else:
   webhdfs_service_urls = buildUrlElement("http", namenode_host, 
namenode_http_port, "/webhdfs")
 
 
+yarn_http_policy = default('/configurations/yarn-site/yarn.http.policy', None )
+yarn_https_on = False
+yarn_scheme = 'http'
+if yarn_http_policy !=  None :
+   yarn_https_on = ( yarn_http_policy.upper() == 'HTTPS_ONLY')
+   yarn_scheme = 'http' if not yarn_https_on else 'https'
+   
 rm_hosts = default("/clusterHostInfo/rm_host", None)
 if type(rm_hosts) is list:
   rm_host = rm_hosts[0]
@@ -220,17 +240,24 @@ if type(hbase_master_hosts) is list:
 else:
   hbase_master_host = hbase_master_hosts
 
+oozie_https_port = None
 oozie_server_hosts = default("/clusterHostInfo/oozie_server", None)
 if type(oozie_server_hosts) is list:
   oozie_server_host = oozie_server_hosts[0]
 else:
   oozie_server_host = oozie_server_hosts
 
+oozie_scheme = 'http'
 has_oozie = not oozie_server_host == None
 oozie_server_port = "11000"
 
 if has_oozie:
   oozie_server_port = 
get_port_from_url(config['configurations']['oozie-site']['oozie.base.url'])
+  oozie_https_port = default("/configurations/oozie-site/oozie.https.port", 
None)
+  
+if oozie_https_port is not None:
+   oozie_scheme = 'https'
+   oozie_server_port = oozie_https_port
 
 # Knox managed properties
 knox_managed_pid_symlink= format('{stack_root}/current/knox-server/pids')

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e33d886/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
index b39123d..f0fef6e 100644
--- 
a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.3.0/package/scripts/params_linux.py
+++ 

[31/51] [abbrv] ambari git commit: AMBARI-21761. VDF should support redhat-ppc6 and redhat-ppc7 OS types (ncole)

[lpuskas]

AMBARI-21761. VDF should support redhat-ppc6 and redhat-ppc7 OS types (ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 705a62be23e9388e602319056b83d86282b520c9
Parents: a0ae01d
Author: Nate Cole 
Authored: Sat Aug 19 08:04:00 2017 -0400
Committer: Nate Cole 
Committed: Sat Aug 19 08:04:00 2017 -0400

--
 ambari-server/src/main/resources/version_definition.xsd | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/705a62be/ambari-server/src/main/resources/version_definition.xsd
--
diff --git a/ambari-server/src/main/resources/version_definition.xsd 
b/ambari-server/src/main/resources/version_definition.xsd
index 9710c90..851e0d5 100644
--- a/ambari-server/src/main/resources/version_definition.xsd
+++ b/ambari-server/src/main/resources/version_definition.xsd
@@ -52,6 +52,8 @@
 
   
   
+  
+  
   
   
   

[47/51] [abbrv] ambari git commit: AMBARI-21307 Groups for the test user returned to the caller

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 0cda46461e91f84159ebab08743427805a9a86e9
Parents: 93e387e
Author: lpuskas 
Authored: Tue Aug 8 15:50:29 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 11:55:13 2017 +0200

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


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

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

[41/51] [abbrv] ambari git commit: AMBARI-21771 : Maven cleanup of ambari-metrics and ambari-logsearch modules. (avijayan)

[lpuskas]

AMBARI-21771 : Maven cleanup of ambari-metrics and ambari-logsearch modules. 
(avijayan)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d5904b9a956026b9a0dcb9d5acfd6af22d3dcb67
Parents: 8e33d88
Author: Aravindan Vijayan 
Authored: Mon Aug 21 14:05:10 2017 -0700
Committer: Aravindan Vijayan 
Committed: Mon Aug 21 14:05:10 2017 -0700

--
 ambari-logsearch/ambari-logsearch-assembly/pom.xml | 3 ++-
 ambari-metrics/ambari-metrics-assembly/pom.xml | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d5904b9a/ambari-logsearch/ambari-logsearch-assembly/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-assembly/pom.xml 
b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
index 5d15b7c..e8a9426 100644
--- a/ambari-logsearch/ambari-logsearch-assembly/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
@@ -141,6 +141,7 @@
 classes/log4j.xml
 classes/logfeeder.properties
 classes/grok-patterns
+libs/checkstyle*.jar
   
 
   
@@ -294,7 +295,7 @@
 root
   
   
-
classes/log4j.xml,classes/logfeeder.properties,classes/grok-patterns
+
classes/log4j.xml,classes/logfeeder.properties,classes/grok-patterns,libs/checkstyle*.jar
   
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d5904b9a/ambari-metrics/ambari-metrics-assembly/pom.xml
--
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml 
b/ambari-metrics/ambari-metrics-assembly/pom.xml
index 6b81de5..d9875ce 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -244,6 +244,7 @@
   ${collector.dir}/target/lib
   
 *tests.jar
+findbugs*.jar
   
 
 
@@ -263,6 +264,7 @@
 bin/**
 bin/*
 lib/*tests.jar
+lib/findbugs*.jar
   
 
   

[02/51] [abbrv] ambari git commit: AMBARI-21729 Owner of yarn.include stays to be root:root where as dfs.include gets changed to the correct one upon restart services (dsen)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/5c78bd75/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
 
b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
new file mode 100644
index 000..0e0c7e0
--- /dev/null
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
@@ -0,0 +1,1078 @@
+{
+"roleCommand": "INSTALL",
+"clusterName": "c1",
+"hostname": "c6401.ambari.apache.org",
+"hostLevelParams": {
+"not_managed_hdfs_path_list": 
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+"agent_stack_retry_count": "5",
+"agent_stack_retry_on_unavailability": "false",
+"jdk_location": "http://c6401.ambari.apache.org:8080/resources/;,
+"ambari_db_rca_password": "mapred",
+"current_version" : "2.2.4.2-1234",
+"ambari_db_rca_url": 
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+"jce_name": "UnlimitedJCEPolicyJDK7.zip",
+"oracle_jdbc_url": 
"http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar;,
+"repo_info": 
"[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}];,
+"package_list": 
"[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]",
+"stack_version": "2.0",
+"stack_name": "HDP",
+"db_name": "ambari",
+"ambari_db_rca_driver": "org.postgresql.Driver",
+"jdk_name": "jdk-7u67-linux-x64.tar.gz",
+"ambari_db_rca_username": "mapred",
+"java_home": "/usr/jdk64/jdk1.7.0_45",
+"java_version": "8",
+"mysql_jdbc_url": 
"http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar;,
+"custom_mysql_jdbc_name" : "mysql-connector-java.jar",
+"custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
+"custom_postgres_jdbc_name" : "test-postgres-jdbc.jar"
+},
+"commandType": "EXECUTION_COMMAND",
+"roleParams": {},
+"serviceName": "HIVE",
+"role": "HIVE_SERVER",
+"commandParams": {
+"command_timeout": "600",
+"service_package_folder": "YARN",
+"script_type": "PYTHON",
+"script": "scripts/yarn_client.py",
+"excluded_hosts": "host1",
+"mark_draining_only" : "false",
+"update_files_only" : "false"
+},
+"taskId": 186,
+"public_hostname": "c6401.ambari.apache.org",
+"configurations": {
+"sqoop-site": {
+"atlas.cluster.name": "c1",
+"sqoop.job.data.publish.class": 
"org.apache.atlas.sqoop.hook.SqoopHook"
+},
+"mapred-site": {
+"mapreduce.jobhistory.address": "c6402.ambari.apache.org:10020",
+"mapreduce.jobhistory.webapp.spnego-keytab-file": 
"/etc/security/keytabs/spnego.service.keytab",
+"mapreduce.reduce.input.buffer.percent": "0.0",
+"mapreduce.output.fileoutputformat.compress": "false",
+"mapreduce.framework.name": "yarn",
+"mapreduce.map.speculative": "false",
+"mapreduce.reduce.shuffle.merge.percent": "0.66",
+"yarn.app.mapreduce.am.resource.mb": "683",
+"mapreduce.map.java.opts": "-Xmx273m",
+"mapreduce.cluster.administrators": " hadoop",
+"mapreduce.application.classpath": 
"$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
+"mapreduce.job.reduce.slowstart.completedmaps": "0.05",
+"mapreduce.output.fileoutputformat.compress.type": "BLOCK",
+"mapreduce.reduce.speculative": "false",
+"mapreduce.reduce.java.opts": "-Xmx546m",
+"mapreduce.am.max-attempts": "2",
+"yarn.app.mapreduce.am.admin-command-opts": 
"-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN",
+"mapreduce.reduce.log.level": "INFO",
+"mapreduce.map.sort.spill.percent": "0.7",
+"mapreduce.task.io.sort.mb": "136",
+"mapreduce.task.timeout": "30",
+"mapreduce.map.memory.mb": "341",
+"mapreduce.task.io.sort.factor": "100",
+"mapreduce.jobhistory.intermediate-done-dir": "/mr-history/tmp",
+"mapreduce.reduce.memory.mb": "683",
+"mapreduce.jobhistory.principal": "jhs/_h...@example.com",
+ 

[22/51] [abbrv] ambari git commit: AMBARI-21525. EU failure: Oozie service check fails if Falcon is not installed.(vbrodetskyi)

[lpuskas]

AMBARI-21525. EU failure: Oozie service check fails if Falcon is not 
installed.(vbrodetskyi)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 09fed274ba869e7fb38a91d2795d54f08c132ca5
Parents: 7ffda34
Author: Vitaly Brodetskyi 
Authored: Fri Aug 18 14:21:56 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Fri Aug 18 14:21:56 2017 +0300

--
 .../0.5.0.2.1/configuration/oozie-site.xml  | 208 ---
 .../FALCON/configuration/oozie-site.xml | 198 --
 .../FALCON/configuration/oozie-site.xml | 197 --
 .../stacks/HDP/2.3/services/stack_advisor.py| 113 ++
 .../FALCON/configuration/oozie-site.xml |  47 -
 .../stacks/HDP/2.5/services/stack_advisor.py|  18 ++
 6 files changed, 131 insertions(+), 650 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09fed274/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
 
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
deleted file mode 100644
index d46069d..000
--- 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/configuration/oozie-site.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-
-
-
-  
-
oozie.service.ELService.ext.functions.coord-job-submit-instances
-
-  now=org.apache.oozie.extensions.OozieELExtensions#ph1_now_echo,
-  today=org.apache.oozie.extensions.OozieELExtensions#ph1_today_echo,
-  
yesterday=org.apache.oozie.extensions.OozieELExtensions#ph1_yesterday_echo,
-  
currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_currentWeek_echo,
-  lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph1_lastWeek_echo,
-  
currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_currentMonth_echo,
-  
lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph1_lastMonth_echo,
-  
currentYear=org.apache.oozie.extensions.OozieELExtensions#ph1_currentYear_echo,
-  lastYear=org.apache.oozie.extensions.OozieELExtensions#ph1_lastYear_echo,
-  
formatTime=org.apache.oozie.coord.CoordELFunctions#ph1_coord_formatTime_echo,
-  latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
-  future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo
-
-
-  EL functions declarations, separated by commas, format is 
[PREFIX:]NAME=CLASS#METHOD.
-  This property is a convenience property to add extensions to the built 
in executors without having to
-  include all the built in ones.
-
-
-  custom
-
-
-  
-  
-oozie.service.ELService.ext.functions.coord-action-create-inst
-
-  now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst,
-  today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst,
-  
yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst,
-  
currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek_inst,
-  lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek_inst,
-  
currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth_inst,
-  
lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth_inst,
-  
currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear_inst,
-  lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear_inst,
-  latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo,
-  future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo,
-  formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime,
-  user=org.apache.oozie.coord.CoordELFunctions#coord_user
-
-
-  EL functions declarations, separated by commas, format is 
[PREFIX:]NAME=CLASS#METHOD.
-  This property is a convenience property to add extensions to the built 
in executors without having to
-  include all the built in ones.
-
-
-  custom
-
-
-  
-  
-oozie.service.ELService.ext.functions.coord-action-create
-
-  now=org.apache.oozie.extensions.OozieELExtensions#ph2_now,
-  today=org.apache.oozie.extensions.OozieELExtensions#ph2_today,
-  yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday,
-  

[08/51] [abbrv] ambari git commit: AMBARI-21712. Allow WEB alert accept custom HTTP codes (echekanskiy)

[lpuskas]

AMBARI-21712. Allow WEB alert accept custom HTTP codes (echekanskiy)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 12c05880d4a5fa13f37b58f537bebb292a064d20
Parents: f2379a4
Author: Eugene Chekanskiy 
Authored: Wed Aug 16 19:15:26 2017 +0300
Committer: Eugene Chekanskiy 
Committed: Wed Aug 16 19:15:26 2017 +0300

--
 .../python/ambari_agent/alerts/base_alert.py | 15 +++
 .../main/python/ambari_agent/alerts/web_alert.py |  4 
 .../src/test/python/ambari_agent/TestAlerts.py   | 19 ++-
 .../ambari/server/state/alert/AlertUri.java  | 15 +++
 4 files changed, 48 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/12c05880/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py 
b/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
index add29fc..05f8023 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py
@@ -255,7 +255,8 @@ class BaseAlert(object):
 
 if uri_structure is None:
   return None
-
+
+acceptable_codes_key = None
 http_key = None
 https_key = None
 https_property_key = None
@@ -267,7 +268,10 @@ class BaseAlert(object):
 ha_alias_key = None
 ha_http_pattern = None
 ha_https_pattern = None
-
+
+if 'acceptable_codes' in uri_structure:
+  acceptable_codes_key = uri_structure['acceptable_codes']
+
 if 'http' in uri_structure:
   http_key = uri_structure['http']
 
@@ -306,11 +310,14 @@ class BaseAlert(object):
 
 
 AlertUriLookupKeys = namedtuple('AlertUriLookupKeys', 
-  'http https https_property https_property_value default_port '
+  'acceptable_codes http https https_property https_property_value 
default_port '
   'kerberos_keytab kerberos_principal '
   'ha_nameservice ha_alias_key ha_http_pattern ha_https_pattern')
 
-alert_uri_lookup_keys = AlertUriLookupKeys(http=http_key, https=https_key, 
+alert_uri_lookup_keys = AlertUriLookupKeys(
+  acceptable_codes=acceptable_codes_key,
+  http=http_key,
+  https=https_key,
   https_property=https_property_key,
   https_property_value=https_property_value_key, default_port=default_port,
   kerberos_keytab=kerberos_keytab, kerberos_principal=kerberos_principal,

http://git-wip-us.apache.org/repos/asf/ambari/blob/12c05880/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py 
b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
index 8ce4405..0e400f7 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/web_alert.py
@@ -107,6 +107,10 @@ class WebAlert(BaseAlert):
 if status_code == 0:
   return (self.RESULT_CRITICAL, [status_code, url, time_seconds, 
error_message])
 
+# check explicit listed codes
+if self.uri_property_keys.acceptable_codes and status_code in 
self.uri_property_keys.acceptable_codes:
+  return (self.RESULT_OK, [status_code, url, time_seconds])
+
 # anything that's less than 400 is OK
 if status_code < 400:
   return (self.RESULT_OK, [status_code, url, time_seconds])

http://git-wip-us.apache.org/repos/asf/ambari/blob/12c05880/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestAlerts.py 
b/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
index 64479a2..1226900 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestAlerts.py
@@ -23,6 +23,7 @@ import socket
 import sys
 import urllib2
 import tempfile
+import random
 from alerts.ams_alert import AmsAlert
 
 from ambari_agent.AlertSchedulerHandler import AlertSchedulerHandler
@@ -616,6 +617,21 @@ class TestAlerts(TestCase):
 self.assertEquals('CRITICAL', alerts[0]['state'])
 self.assertEquals('(Unit Tests) critical: 
https://c6401.ambari.apache.org:443/test/path. error message', 
alerts[0]['text'])
 
+# test custom codes
+code = random.choice((600, 700, 800))
+wa_make_web_request_mock.return_value 

[14/51] [abbrv] ambari git commit: AMBARI-21398 Backend need to distinguish repo_version records by using the Stack Name (dgrinenko)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3f6c4ca0/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
--
diff --git 
a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py 
b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
index 56a9fed..b31e2f5 100644
--- a/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
+++ b/ambari-server/src/test/python/custom_actions/TestInstallPackages.py
@@ -21,7 +21,6 @@ import json
 import os
 import subprocess
 import select
-import install_packages
 
 from mock.mock import patch
 from mock.mock import MagicMock
@@ -45,6 +44,7 @@ subproc_mock.return_value = MagicMock()
 subproc_stdout = MagicMock()
 subproc_mock.return_value.stdout = subproc_stdout
 
+
 @not_for_platform(PLATFORM_WINDOWS)
 @patch.object(os, "read", new=MagicMock(return_value=None))
 @patch.object(select, "select", new=MagicMock(return_value=([subproc_stdout], 
None, None)))
@@ -57,89 +57,101 @@ class TestInstallPackages(RMFTestCase):
 self.maxDiff = None
 
   @staticmethod
-  def _add_packages(arg):
-arg.append(["pkg1", "1.0", "repo"])
-arg.append(["pkg2", "2.0", "repo2"])
+  def _add_packages(*args):
+return [
+  ["pkg1", "1.0", "repo"],
+  ["pkg2", "2.0", "repo2"]
+]
 
   @staticmethod
-  def _add_packages_available(command, arg):
-arg.append(["hadoop_2_2_0_1_885", "1.0", "HDP-2.2"])
-arg.append(["hadooplzo_2_2_0_1_885", "1.0", "HDP-2.2"])
-arg.append(["hadoop_2_2_0_1_885-libhdfs", "1.0", "HDP-2.2"])
+  def _add_packages_available(*args):
+return [
+  ["hadoop_2_2_0_1_885", "1.0", "HDP-2.2"],
+  ["hadooplzo_2_2_0_1_885", "1.0", "HDP-2.2"],
+  ["hadoop_2_2_0_1_885-libhdfs", "1.0", "HDP-2.2"]
+]
 
   @staticmethod
-  def _add_packages_lookUpYum(command, key, arg):
-TestInstallPackages._add_packages_available(command, arg)
+  def _add_packages_lookUpYum(*args):
+return TestInstallPackages._add_packages_available(*args)
 
   
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
-  
@patch("resource_management.libraries.functions.packages_analyzer._lookUpYumPackages")
+  @patch("resource_management.core.providers.get_provider")
   @patch("resource_management.libraries.script.Script.put_structured_out")
   
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
   
@patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file")
   
@patch("resource_management.libraries.functions.repo_version_history.write_actual_version_to_history_file")
+  @patch("ambari_commons.shell.subprocess_with_timeout")
   def test_normal_flow_rhel(self,
+subprocess_with_timeout,
 write_actual_version_to_history_file_mock,
 read_actual_version_from_history_file_mock,
 stack_versions_mock,
 put_structured_out_mock,
-lookUpYumPackages, list_ambari_managed_repos_mock):
+get_provider, list_ambari_managed_repos_mock):
 stack_versions_mock.side_effect = [
   [],  # before installation attempt
   [VERSION_STUB]
 ]
-lookUpYumPackages.side_effect = TestInstallPackages._add_packages_lookUpYum
-list_ambari_managed_repos_mock.return_value=[]
-self.executeScript("scripts/install_packages.py",
-   classname="InstallPackages",
-   command="actionexecute",
-   config_file="install_packages_config.json",
-   target=RMFTestCase.TARGET_CUSTOM_ACTIONS,
-   os_type=('Redhat', '6.4', 'Final'),
-)
-self.assertTrue(put_structured_out_mock.called)
-self.assertEquals(put_structured_out_mock.call_args[0][0],
-  {'package_installation_result': 'SUCCESS',
-   'repository_version_id': 1,
-   'actual_version': VERSION_STUB})
-self.assertResourceCalled('Repository', 'HDP-UTILS-1.1.0.20',
-  
base_url=u'http://repo1/HDP/centos5/2.x/updates/2.2.0.0',
-  action=['create'],
-  components=[u'HDP-UTILS', 'main'],
-  
repo_template='[{{repo_id}}]\nname={{repo_id}}\n{% if mirror_list 
%}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% endif 
%}\n\npath=/\nenabled=1\ngpgcheck=0',
-  repo_file_name=u'ambari-hdp-1',
-  mirror_list=None,
-  append_to_file=False,
-)
-self.assertResourceCalled('Repository', 'HDP-2.2',
-  
base_url=u'http://repo1/HDP/centos5/2.x/updates/2.2.0.0',
-  

[29/51] [abbrv] ambari git commit: AMBARI-21620. Set the needed druid/hive properties via ambari (Slim Bouguerra via Swapan Shridhar).

[lpuskas]

AMBARI-21620. Set the needed druid/hive properties via ambari (Slim Bouguerra 
via Swapan Shridhar).


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 79ff23fac2aa08f151781565a59fcbf80061b9f0
Parents: e99f8e8
Author: Swapan Shridhar 
Authored: Fri Aug 18 15:06:29 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Aug 18 15:06:29 2017 -0700

--
 .../DRUID/0.9.2/package/scripts/druid.py|  26 ++-
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 218 +++
 .../HIVE/0.12.0.2.0/metainfo.xml|   1 +
 .../0.12.0.2.0/package/scripts/params_linux.py  |  11 +
 .../stacks/HDP/2.6/services/stack_advisor.py|  49 -
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  14 ++
 .../test/python/stacks/2.6/DRUID/test_druid.py  |   8 +-
 .../stacks/2.6/common/test_stack_advisor.py |  60 -
 8 files changed, 371 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/79ff23fa/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
index fa52247..ec98c3c 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
@@ -161,24 +161,25 @@ def ensure_hadoop_directories():
 type="directory",
 action="create_on_execute",
 owner=params.druid_user,
+group='hadoop',
 recursive_chown=True,
 recursive_chmod=True
 )
 
-# create the segment storage dir
-create_hadoop_directory(storage_dir)
+# create the segment storage dir, users like hive from group hadoop need 
to write to this directory
+create_hadoop_directory(storage_dir, mode=0775)
 
   # Create HadoopIndexTask hadoopWorkingPath
   hadoop_working_path = 
druid_middlemanager_config['druid.indexer.task.hadoopWorkingPath']
   if hadoop_working_path is not None:
 if hadoop_working_path.startswith(params.hdfs_tmp_dir):
-  params.HdfsResource(params.hdfs_tmp_dir,
-   type="directory",
-   action="create_on_execute",
-   owner=params.hdfs_user,
-   mode=0777,
-  )
-create_hadoop_directory(hadoop_working_path)
+params.HdfsResource(params.hdfs_tmp_dir,
+type="directory",
+action="create_on_execute",
+owner=params.hdfs_user,
+mode=0777,
+)
+create_hadoop_directory(hadoop_working_path, mode=0775)
 
   # If HDFS is used for storing logs, create Index Task log directory
   indexer_logs_type = druid_common_config['druid.indexer.logs.type']
@@ -187,15 +188,16 @@ def ensure_hadoop_directories():
 create_hadoop_directory(indexer_logs_directory)
 
 
-def create_hadoop_directory(hadoop_dir):
+def create_hadoop_directory(hadoop_dir, mode=0755):
   import params
   params.HdfsResource(hadoop_dir,
   type="directory",
   action="create_on_execute",
   owner=params.druid_user,
-  mode=0755
+  group='hadoop',
+  mode=mode
   )
-  Logger.info(format("Created Hadoop Directory [{hadoop_dir}]"))
+  Logger.info(format("Created Hadoop Directory [{hadoop_dir}], with mode 
[{mode}]"))
 
 
 def ensure_base_directories():

http://git-wip-us.apache.org/repos/asf/ambari/blob/79ff23fa/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
index ab5c279..d66cf4c 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -450,6 +450,224 

[28/51] [abbrv] ambari git commit: AMBARI-21642. Add hadoop LZO jars if installed in the cluster. (Slim Bouguerra via Swapan Shridhar).

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: e99f8e86fd41ccf88a1c50b6cf603f03b9006bc6
Parents: b0f21da
Author: Swapan Shridhar 
Authored: Fri Aug 18 14:56:42 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Aug 18 14:56:42 2017 -0700

--
 .../DRUID/0.9.2/package/scripts/druid.py| 12 ++
 .../DRUID/0.9.2/package/scripts/params.py   | 13 +++
 .../test/python/stacks/2.6/DRUID/test_druid.py  | 24 +---
 3 files changed, 41 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e99f8e86/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
index cc02519..fa52247 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
@@ -18,6 +18,7 @@ limitations under the License.
 """
 import json
 import os
+from resource_management import Fail
 from resource_management.libraries.resources.properties_file import 
PropertiesFile
 from resource_management.core.resources.system import Directory, Execute, File
 from resource_management.core.source import DownloadSource
@@ -113,6 +114,17 @@ def druid(upgrade_type=None, nodeType=None):

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

http://git-wip-us.apache.org/repos/asf/ambari/blob/e99f8e86/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index d47e604..7e90475 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -18,6 +18,7 @@ limitations under the License.
 
 """
 from ambari_commons import OSCheck
+from resource_management.libraries.functions.get_lzo_packages import 
get_lzo_packages
 from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
 from resource_management.libraries.resources.hdfs_resource import HdfsResource
@@ -26,6 +27,7 @@ from resource_management.libraries.script.script import Script
 from resource_management.libraries.functions import format
 from resource_management.libraries.functions.get_not_managed_resources import 
get_not_managed_resources
 from resource_management.libraries.functions.default import default
+from ambari_commons.constants import AMBARI_SUDO_BINARY
 
 import status_params
 
@@ -50,10 +52,14 @@ stack_name = default("/hostLevelParams/stack_name", None)
 # stack version
 stack_version = default("/commandParams/version", None)
 
+# un-formatted stack version
+stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+
 # default role to coordinator needed for service checks
 component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "DRUID_COORDINATOR")
 
 hostname = config['hostname']
+sudo = AMBARI_SUDO_BINARY
 
 # default druid parameters
 

[09/51] [abbrv] ambari git commit: AMBARI-21722 - Begin Using Service Versions In Python stack_feature Code (jonathanhurley)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/330a61cd/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
 
b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
index 0e0c7e0..23bc2e8 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_dont_manage.json
@@ -8,7 +8,6 @@
 "agent_stack_retry_on_unavailability": "false",
 "jdk_location": "http://c6401.ambari.apache.org:8080/resources/;,
 "ambari_db_rca_password": "mapred",
-"current_version" : "2.2.4.2-1234",
 "ambari_db_rca_url": 
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
 "jce_name": "UnlimitedJCEPolicyJDK7.zip",
 "oracle_jdbc_url": 
"http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar;,
@@ -38,7 +37,8 @@
 "script": "scripts/yarn_client.py",
 "excluded_hosts": "host1",
 "mark_draining_only" : "false",
-"update_files_only" : "false"
+"update_files_only" : "false",
+"version" : "2.0.0.0-1234"
 },
 "taskId": 186,
 "public_hostname": "c6401.ambari.apache.org",

http://git-wip-us.apache.org/repos/asf/ambari/blob/330a61cd/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
 
b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
index e92169c..33cdd26 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
@@ -8,7 +8,6 @@
 "agent_stack_retry_on_unavailability": "false",
 "jdk_location": "http://c6401.ambari.apache.org:8080/resources/;,
 "ambari_db_rca_password": "mapred",
-"current_version" : "2.2.4.2-1234",
 "ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
 "jce_name": "UnlimitedJCEPolicyJDK7.zip",
 "oracle_jdbc_url": 
"http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar;,
@@ -38,7 +37,8 @@
 "script": "scripts/yarn_client.py",
 "excluded_hosts": "host1",
 "mark_draining_only" : "false",
-"update_files_only" : "false"
+"update_files_only" : "false",
+"version" : "2.0.0.0-1234"
   },
   "taskId": 186,
   "public_hostname": "c6401.ambari.apache.org",

http://git-wip-us.apache.org/repos/asf/ambari/blob/330a61cd/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
index f1da837..d6740cb 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/after-INSTALL/test_after_install.py
@@ -234,7 +234,6 @@ class TestHookAfterInstall(RMFTestCase):
 version = '2.3.0.0-1234'
 json_content['commandParams']['version'] = version
 json_content['hostLevelParams']['stack_version'] = "2.3"
-json_content['hostLevelParams']['current_version'] = "2.3.0.0-1234"
 
 self.executeScript("2.0.6/hooks/after-INSTALL/scripts/hook.py",
   classname="AfterInstallHook",
@@ -337,7 +336,6 @@ class TestHookAfterInstall(RMFTestCase):
 version = '2.3.0.0-1234'
 json_content['commandParams']['version'] = version
 json_content['hostLevelParams']['stack_version'] = "2.3"
-json_content['hostLevelParams']['current_version'] = "2.3.0.0-1234"
 json_content['hostLevelParams']['host_sys_prepped'] = "true"
 
 self.executeScript("2.0.6/hooks/after-INSTALL/scripts/hook.py",

http://git-wip-us.apache.org/repos/asf/ambari/blob/330a61cd/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py 
b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
index 9de2156..fcbbbee 100644
--- a/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
+++ b/ambari-server/src/test/python/stacks/2.1/FALCON/test_falcon_client.py
@@ -34,6 +34,7 @@ class TestFalconClient(RMFTestCase):
classname="FalconClient",
command="configure",

[11/51] [abbrv] ambari git commit: AMBARI-21722 - Begin Using Service Versions In Python stack_feature Code (jonathanhurley)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/330a61cd/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
index b8e8f78..34c6b9a 100644
--- 
a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/package/scripts/params_linux.py
@@ -38,7 +38,6 @@ stack_version_formatted = 
status_params.stack_version_formatted
 stack_root = status_params.stack_root
 
 stack_name = status_params.stack_name
-current_version = default("/hostLevelParams/current_version", None)
 component_directory = status_params.component_directory
 
 # New Cluster Stack Version that is defined during the RESTART of a Rolling 
Upgrade

http://git-wip-us.apache.org/repos/asf/ambari/blob/330a61cd/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
index 973d9dd..86de20d 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
@@ -104,12 +104,6 @@
 "min_version": "2.2.0.0"
   },
   {
-"name": "create_kafka_broker_id",
-"description": "Ambari should create Kafka Broker Id (AMBARI-12678)",
-"min_version": "2.2.0.0",
-"max_version": "2.3.0.0"
-  },
-  {
 "name": "kafka_listeners",
 "description": "Kafka listeners (AMBARI-10984)",
 "min_version": "2.3.0.0"

http://git-wip-us.apache.org/repos/asf/ambari/blob/330a61cd/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/after-INSTALL/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/after-INSTALL/scripts/params.py
 
b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/after-INSTALL/scripts/params.py
index 4a422ec..ddc6100 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/after-INSTALL/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/after-INSTALL/scripts/params.py
@@ -44,9 +44,6 @@ sudo = AMBARI_SUDO_BINARY
 stack_version_unformatted = config['hostLevelParams']['stack_version']
 stack_version_formatted = format_stack_version(stack_version_unformatted)
 
-# current host stack version
-current_version = default("/hostLevelParams/current_version", None)
-
 # service name
 service_name = config['serviceName']
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/330a61cd/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_features.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_features.json
 
b/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_features.json
index 9422cbc..afd5183 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_features.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_features.json
@@ -104,12 +104,6 @@
 "min_version": "2.2.0.0"
   },
   {
-"name": "create_kafka_broker_id",
-"description": "Ambari should create Kafka Broker Id (AMBARI-12678)",
-"min_version": "2.2.0.0",
-"max_version": "2.3.0.0"
-  },
-  {
 "name": "kafka_listeners",
 "description": "Kafka listeners (AMBARI-10984)",
 "min_version": "2.3.0.0"

http://git-wip-us.apache.org/repos/asf/ambari/blob/330a61cd/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
index b048d04..8b94338 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
@@ -89,8 +89,8 @@ public class StateRecoveryManagerTest {
   getHostVersionMock("install_failed_version", 
RepositoryVersionState.INSTALL_FAILED, installFailedHostVersionCapture),
   getHostVersionMock("installing_version", 
RepositoryVersionState.INSTALLING, installingHostVersionCapture),
   getHostVersionMock("installed_version", 

[26/51] [abbrv] ambari git commit: Add hadoop LZO jars if installed in the cluster. (Slim Bouguerra via Swapan Shridhar).

[lpuskas]

Add hadoop LZO jars if installed in the cluster. (Slim Bouguerra via Swapan 
Shridhar).


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: bbec0d3751b9aad709d8fbf86c2744b4bb412e2d
Parents: ca8ae51
Author: Swapan Shridhar 
Authored: Fri Aug 18 14:10:55 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Aug 18 14:10:55 2017 -0700

--
 .../DRUID/0.9.2/package/scripts/druid.py| 12 ++
 .../DRUID/0.9.2/package/scripts/params.py   | 13 +++
 .../test/python/stacks/2.6/DRUID/test_druid.py  | 24 +---
 3 files changed, 41 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bbec0d37/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
index cc02519..fa52247 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid.py
@@ -18,6 +18,7 @@ limitations under the License.
 """
 import json
 import os
+from resource_management import Fail
 from resource_management.libraries.resources.properties_file import 
PropertiesFile
 from resource_management.core.resources.system import Directory, Execute, File
 from resource_management.core.source import DownloadSource
@@ -113,6 +114,17 @@ def druid(upgrade_type=None, nodeType=None):

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

http://git-wip-us.apache.org/repos/asf/ambari/blob/bbec0d37/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
index d47e604..7e90475 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/params.py
@@ -18,6 +18,7 @@ limitations under the License.
 
 """
 from ambari_commons import OSCheck
+from resource_management.libraries.functions.get_lzo_packages import 
get_lzo_packages
 from resource_management.libraries.functions import conf_select
 from resource_management.libraries.functions import stack_select
 from resource_management.libraries.resources.hdfs_resource import HdfsResource
@@ -26,6 +27,7 @@ from resource_management.libraries.script.script import Script
 from resource_management.libraries.functions import format
 from resource_management.libraries.functions.get_not_managed_resources import 
get_not_managed_resources
 from resource_management.libraries.functions.default import default
+from ambari_commons.constants import AMBARI_SUDO_BINARY
 
 import status_params
 
@@ -50,10 +52,14 @@ stack_name = default("/hostLevelParams/stack_name", None)
 # stack version
 stack_version = default("/commandParams/version", None)
 
+# un-formatted stack version
+stack_version_unformatted = str(config['hostLevelParams']['stack_version'])
+
 # default role to coordinator needed for service checks
 component_directory = 
Script.get_component_from_role(SERVER_ROLE_DIRECTORY_MAP, "DRUID_COORDINATOR")
 
 hostname = config['hostname']
+sudo = AMBARI_SUDO_BINARY
 
 # default druid parameters
 druid_home = 

[33/51] [abbrv] ambari git commit: AMBARI-21525. Test Fix. EU failure: Oozie service check fails if Falcon is not installed.(vbrodetskyi)

[lpuskas]

AMBARI-21525. Test Fix. EU failure: Oozie service check fails if Falcon is not 
installed.(vbrodetskyi)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 13589bbdf9c22f91740519ef63fcfbf9c2aacc4b
Parents: 6fb3719
Author: Vitaly Brodetskyi 
Authored: Mon Aug 21 14:20:48 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Mon Aug 21 14:21:45 2017 +0300

--
 .../stacks/2.5/common/test_stack_advisor.py | 107 ++-
 1 file changed, 105 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/13589bbd/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
index fc5f220..51d1678 100644
--- a/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.5/common/test_stack_advisor.py
@@ -5892,12 +5892,32 @@ class TestHDP25StackAdvisor(TestCase):
 clusterData = {
   "components" : []
 }
+services = {
+  "services": [
+{
+  "StackServices": {
+"service_name": "OOZIE"
+  }, "components": []
+},
+],
+  "configurations": configurations,
+  "forced-configurations": []
+}
 expected = {
-  "oozie-site": {"properties":{}},
+  "oozie-site": {"properties":{}, 'property_attributes':
+{'oozie.service.ELService.ext.functions.workflow': {'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-job-submit-instances': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-action-start': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-job-submit-data': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-sla-submit': {'delete': 
'true'},
+ 'oozie.service.ELService.ext.functions.coord-action-create': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-action-create-inst': 
{'delete': 'true'},
+ 'oozie.service.ELService.ext.functions.coord-sla-create': {'delete': 
'true'},
+ 'oozie.service.HadoopAccessorService.supported.filesystems': 
{'delete': 'true'}}},
   "oozie-env": {"properties":{}}
 }
 
-self.stackAdvisor.recommendOozieConfigurations(configurations, 
clusterData, {"configurations":{}}, None)
+self.stackAdvisor.recommendOozieConfigurations(configurations, 
clusterData, services, None)
 self.assertEquals(configurations, expected)
 
 
@@ -5928,6 +5948,89 @@ class TestHDP25StackAdvisor(TestCase):
 expected = {
   "oozie-site": {
 "properties": {
+  "oozie.service.ELService.ext.functions.coord-action-create" : 
'now=org.apache.oozie.extensions.OozieELExtensions#ph2_now, \
+
today=org.apache.oozie.extensions.OozieELExtensions#ph2_today, \
+
yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday, \
+
currentWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_currentWeek, \
+
lastWeek=org.apache.oozie.extensions.OozieELExtensions#ph2_lastWeek, \
+
currentMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_currentMonth, \
+
lastMonth=org.apache.oozie.extensions.OozieELExtensions#ph2_lastMonth, \
+
currentYear=org.apache.oozie.extensions.OozieELExtensions#ph2_currentYear, \
+
lastYear=org.apache.oozie.extensions.OozieELExtensions#ph2_lastYear, \
+
latest=org.apache.oozie.coord.CoordELFunctions#ph2_coord_latest_echo, \
+
future=org.apache.oozie.coord.CoordELFunctions#ph2_coord_future_echo, \
+
formatTime=org.apache.oozie.coord.CoordELFunctions#ph2_coord_formatTime, \
+
user=org.apache.oozie.coord.CoordELFunctions#coord_user',
+  "oozie.service.ELService.ext.functions.coord-action-create-inst" : 
'now=org.apache.oozie.extensions.OozieELExtensions#ph2_now_inst, \
+
today=org.apache.oozie.extensions.OozieELExtensions#ph2_today_inst, \
+
yesterday=org.apache.oozie.extensions.OozieELExtensions#ph2_yesterday_inst, \
+

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 5895040c8a3374012c11f0e351c8ba631a689ae7
Parents: d690844
Author: Vitaly Brodetskyi 
Authored: Mon Aug 21 23:57:12 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Mon Aug 21 23:57:12 2017 +0300

--
 .../ambari/server/state/cluster/ClusterImpl.java | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5895040c/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 84b411c..26be06e 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
@@ -1797,22 +1797,29 @@ public class ClusterImpl implements Cluster {
 
 // disable all configs related to service
 if (serviceConfigEntity.getGroupId() == null) {
+  // Here was fixed bug with entity changes revert. More you can find here 
AMBARI-21173.
+  // This issue reproduces only if you are changing same entity in first 
and second loop.
+  // In that case eclipselink will revert changes to cached, if entity has 
fluchGroup and it
+  // needs to be refreshed. Actually we don't need to change same antities 
in few steps, so i
+  // decided to filter out. duplicates and do not change them. It will be 
better for performance and bug will be fixed.
   Collection configTypes = serviceConfigTypes.get(serviceName);
   List enabledConfigs = 
clusterDAO.getEnabledConfigsByTypes(clusterId, configTypes);
   List serviceConfigEntities = 
serviceConfigEntity.getClusterConfigEntities();
   ArrayList duplicatevalues = new 
ArrayList<>(serviceConfigEntities);
   duplicatevalues.retainAll(enabledConfigs);
-  enabledConfigs.removeAll(duplicatevalues);
-  serviceConfigEntities.removeAll(duplicatevalues);
 
   for (ClusterConfigEntity enabledConfig : enabledConfigs) {
-enabledConfig.setSelected(false);
-clusterDAO.merge(enabledConfig);
+if (!duplicatevalues.contains(enabledConfig)) {
+  enabledConfig.setSelected(false);
+  clusterDAO.merge(enabledConfig);
+}
   }
 
   for (ClusterConfigEntity configEntity : serviceConfigEntities) {
-configEntity.setSelected(true);
-clusterDAO.merge(configEntity);
+if (!duplicatevalues.contains(configEntity)) {
+  configEntity.setSelected(true);
+  clusterDAO.merge(configEntity);
+}
   }
 } else {
   Long configGroupId = serviceConfigEntity.getGroupId();

[43/51] [abbrv] ambari git commit: AMBARI-17898. Add Kerberos HTTP SPNEGO authentication support to Ambari Metrics Monitor. (Qin Liu via Eric Yang)

[lpuskas]

AMBARI-17898. Add Kerberos HTTP SPNEGO authentication support to Ambari Metrics 
Monitor.  (Qin Liu via Eric Yang)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d260c89263ee0471514b4cfb8ce938134eceea12
Parents: 6de8094
Author: Eric Yang 
Authored: Mon Aug 21 20:57:34 2017 -0700
Committer: Eric Yang 
Committed: Mon Aug 21 20:57:34 2017 -0700

--
 .../conf/unix/metric_monitor.ini|   2 +
 .../src/main/python/core/config_reader.py   |   8 +
 .../src/main/python/core/emitter.py |  58 ++-
 .../src/main/python/core/krberr.py  |  42 +
 .../main/python/core/spnego_kerberos_auth.py| 164 +++
 .../src/test/python/core/TestEmitter.py |  24 +++
 .../AMBARI_METRICS/0.1.0/kerberos.json  |  26 +++
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |   8 +
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |  33 +++-
 .../0.1.0/package/scripts/params.py |   7 +-
 .../package/templates/metric_monitor.ini.j2 |   2 +
 11 files changed, 360 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d260c892/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini 
b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
index 7fe7397..38fff1e 100644
--- a/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
+++ b/ambari-metrics/ambari-metrics-host-monitoring/conf/unix/metric_monitor.ini
@@ -27,6 +27,8 @@ skip_network_interfaces_patterns =
 
 [emitter]
 send_interval = 60
+kinit_cmd = /usr/bin/kinit -kt /etc/security/keytabs/ams.monitor.keytab 
amsmon/localhost
+klist_cmd = /usr/bin/klist
 
 [collector]
 collector_sleep_interval = 5

http://git-wip-us.apache.org/repos/asf/ambari/blob/d260c892/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
index d1429ed..017ad24 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/config_reader.py
@@ -115,6 +115,8 @@ enable_value_threshold = false
 
 [emitter]
 send_interval = 60
+kinit_cmd = /usr/bin/kinit -kt /etc/security/keytabs/ams.monitor.keytab 
amsmon/localhost
+klist_cmd = /usr/bin/klist
 
 [collector]
 collector_sleep_interval = 5
@@ -218,6 +220,12 @@ class Configuration:
   def get_send_interval(self):
 return int(self.get("emitter", "send_interval", 60))
 
+  def get_kinit_cmd(self):
+return self.get("emitter", "kinit_cmd")
+
+  def get_klist_cmd(self):
+return self.get("emitter", "klist_cmd")
+
   def get_collector_sleep_interval(self):
 return int(self.get("collector", "collector_sleep_interval", 10))
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d260c892/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
--
diff --git 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
index 77b8c23..f19434d 100644
--- 
a/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
+++ 
b/ambari-metrics/ambari-metrics-host-monitoring/src/main/python/core/emitter.py
@@ -24,6 +24,7 @@ import threading
 from security import CachedHTTPSConnection, CachedHTTPConnection
 from blacklisted_set import BlacklistedSet
 from config_reader import ROUND_ROBIN_FAILOVER_STRATEGY
+from spnego_kerberos_auth import SPNEGOKerberosAuth
 
 logger = logging.getLogger()
 
@@ -31,6 +32,10 @@ class Emitter(threading.Thread):
   AMS_METRICS_POST_URL = "/ws/v1/timeline/metrics/"
   RETRY_SLEEP_INTERVAL = 5
   MAX_RETRY_COUNT = 3
+  cookie_cached = {}
+  kinit_cmd = None
+  klist_cmd = None
+  spnego_krb_auth = None
   """
   Wake up every send interval seconds and empty the application metric map.
   """
@@ -39,6 +44,10 @@ class Emitter(threading.Thread):
 logger.debug('Initializing Emitter thread.')
 self.lock = threading.Lock()
 self.send_interval = config.get_send_interval()
+

[25/51] [abbrv] ambari git commit: Revert "AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg (dlysnichenko)"

[lpuskas]

Revert "AMBARI-21744. package_regex in get_package_from_available() can match 
wrong pkg (dlysnichenko)"

This reverts commit aa4807ca3a850d3275b11c9ee41a0cb6c5328b9c.


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: ca8ae51afeff209657c19182d77e59a34cf6c0ae
Parents: 5f6ce4e
Author: Lisnichenko Dmitro 
Authored: Fri Aug 18 18:14:55 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Fri Aug 18 18:16:12 2017 +0300

--
 .../src/main/python/resource_management/libraries/script/script.py  | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ca8ae51a/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 6e26d99..90337f4 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -473,7 +473,6 @@ class Script(object):
   return name
 package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
 package_regex = name.replace(STACK_VERSION_PLACEHOLDER, 
'(\d|{0})+'.format(package_delimiter))
-package_regex = "^{0}$".format(package_regex)
 for package in available_packages_in_repos:
   if re.match(package_regex, package):
 return package

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: c890306dc1f1886732319a54e784f3b3a76a572b
Parents: 5452910
Author: lpuskas 
Authored: Thu Jul 6 18:15:18 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 11:55:12 2017 +0200

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


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

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

[16/51] [abbrv] ambari git commit: AMBARI-21398 Backend need to distinguish repo_version records by using the Stack Name (dgrinenko)

[lpuskas]

AMBARI-21398 Backend need to distinguish repo_version records by using the 
Stack Name (dgrinenko)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 3f6c4ca0731d45ca0a23a5d6a4cfa2e47c85ea37
Parents: 330a61c
Author: Dmytro Grinenko 
Authored: Thu Aug 17 12:58:40 2017 +0300
Committer: Dmytro Grinenko 
Committed: Thu Aug 17 12:58:40 2017 +0300

--
 .../test/python/ambari_agent/TestHostInfo.py|  254 +--
 .../resource_management/TestPackagesAnalyzer.py |  187 ---
 .../python/resource_management/TestScript.py|   23 +-
 .../src/main/python/ambari_commons/shell.py |  139 +-
 .../core/providers/__init__.py  |   42 +-
 .../core/providers/package/__init__.py  |  247 ++-
 .../core/providers/package/apt.py   |  289 +++-
 .../core/providers/package/yumrpm.py|  253 ++-
 .../core/providers/package/zypper.py|  147 +-
 .../libraries/functions/packages_analyzer.py|  356 -
 .../libraries/script/script.py  |   22 +-
 .../listeners/upgrade/StackVersionListener.java |4 +-
 .../custom_actions/scripts/check_host.py|   26 +-
 .../custom_actions/scripts/install_packages.py  |   58 +-
 .../scripts/remove_previous_stacks.py   |7 +-
 .../custom_actions/TestInstallPackages.py   | 1488 ++
 .../custom_actions/TestRemoveStackVersion.py|   40 +-
 .../stacks/2.0.6/HBASE/test_hbase_master.py |   93 +-
 18 files changed, 2006 insertions(+), 1669 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3f6c4ca0/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py 
b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
index 027a0a8..cb20f4e 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
@@ -39,113 +39,12 @@ from ambari_agent.Hardware import Hardware
 from ambari_agent.AmbariConfig import AmbariConfig
 from resource_management.core import shell
 from resource_management.core.system import System
-from resource_management.libraries.functions import packages_analyzer
+
 
 @not_for_platform(PLATFORM_WINDOWS)
 @patch.object(OSCheck, "os_distribution", new = MagicMock(return_value = 
os_distro_value))
 class TestHostInfo(TestCase):
 
-  @patch.object(OSCheck, 'get_os_family')
-  
@patch('resource_management.libraries.functions.packages_analyzer.subprocessWithTimeout')
-  def test_analyze_zypper_out(self, spwt_mock, get_os_family_mock):
-get_os_family_mock.return_value = 'suse'
-stringToRead = """Refreshing service 'susecloud'.
-   Loading repository data...
-   Reading installed packages...
-
-   S | Name  | Type| Version   
 | Arch   | Repository
-   
--+---+-+++--
-   i | ConsoleKit| package | 0.2.10-64.65.1
 | x86_64 | SLES11-SP1-Updates
-   i | gweb  | package | 2.2.0-99  
 | noarch | Hortonworks Data Platform Utils Version - HDP-UTILS-1.1.0.15
-   i | hadoop| package | 1.2.0.1.3.0.0-107 
 | x86_64 | HDP
-   i | hadoop-libhdfs| package | 1.2.0.1.3.0.0-107 
 | x86_64 | HDP
-   i | ambari-server | package | 1.2.4.9-1 
 | noarch | Ambari 1.x
-   i | hdp_mon_ganglia_addons| package | 1.2.4.9-1 
 | noarch | Ambari 1.x
-   i | Minimal   | pattern | 11-38.13.9
 | x86_64 | SLES11-SP1"""
-result = {}
-result['out'] = stringToRead
-result['err'] = ""
-result['retCode'] = 0
-
-spwt_mock.return_value = result
-installedPackages = []
-packages_analyzer.allInstalledPackages(installedPackages)
-self.assertEqual(7, len(installedPackages))
-self.assertTrue(installedPackages[1][0], "gweb")
-self.assertTrue(installedPackages[3][2], "HDP")
-self.assertTrue(installedPackages[6][1], "11-38.13.9")
-
-  @patch.object(OSCheck, 'get_os_family')
-  
@patch('resource_management.libraries.functions.packages_analyzer.subprocessWithTimeout')
-  def test_analyze_yum_output(self, subprocessWithTimeout_mock, 
get_os_family_mock):
-

[18/51] [abbrv] ambari git commit: AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg (dlysnichenko)

[lpuskas]

AMBARI-21744. package_regex in get_package_from_available() can match wrong pkg 
(dlysnichenko)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: f2cc609b0033d59130cb00d14ff8d2c8db6e1392
Parents: 8c5b03b
Author: Lisnichenko Dmitro 
Authored: Thu Aug 17 18:04:09 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Thu Aug 17 18:05:12 2017 +0300

--
 .../src/main/python/resource_management/libraries/script/script.py  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cc609b/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 90337f4..6e26d99 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -473,6 +473,7 @@ class Script(object):
   return name
 package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
 package_regex = name.replace(STACK_VERSION_PLACEHOLDER, 
'(\d|{0})+'.format(package_delimiter))
+package_regex = "^{0}$".format(package_regex)
 for package in available_packages_in_repos:
   if re.match(package_regex, package):
 return package

[01/51] [abbrv] ambari git commit: AMBARI-21729 Owner of yarn.include stays to be root:root where as dfs.include gets changed to the correct one upon restart services (dsen) [Forced Update!]

[lpuskas]

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/5c78bd75/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
 
b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
new file mode 100644
index 000..e92169c
--- /dev/null
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_yarn_include_file_manage.json
@@ -0,0 +1,1078 @@
+{
+  "roleCommand": "INSTALL",
+  "clusterName": "c1",
+  "hostname": "c6401.ambari.apache.org",
+  "hostLevelParams": {
+"not_managed_hdfs_path_list": 
"[\"/apps/hive/warehouse\",\"/apps/falcon\",\"/mr-history/done\",\"/app-logs\",\"/tmp\"]",
+"agent_stack_retry_count": "5",
+"agent_stack_retry_on_unavailability": "false",
+"jdk_location": "http://c6401.ambari.apache.org:8080/resources/;,
+"ambari_db_rca_password": "mapred",
+"current_version" : "2.2.4.2-1234",
+"ambari_db_rca_url": "jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+"jce_name": "UnlimitedJCEPolicyJDK7.zip",
+"oracle_jdbc_url": 
"http://c6401.ambari.apache.org:8080/resources//ojdbc6.jar;,
+"repo_info": 
"[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0.8\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}];,
+"package_list": 
"[{\"type\":\"rpm\",\"name\":\"hadoop-yarn\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-nodemanager\"},{\"type\":\"rpm\",\"name\":\"hadoop-mapreduce\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-proxyserver\"},{\"type\":\"rpm\",\"name\":\"hadoop-yarn-resourcemanager\"}]",
+"stack_version": "2.0",
+"stack_name": "HDP",
+"db_name": "ambari",
+"ambari_db_rca_driver": "org.postgresql.Driver",
+"jdk_name": "jdk-7u67-linux-x64.tar.gz",
+"ambari_db_rca_username": "mapred",
+"java_home": "/usr/jdk64/jdk1.7.0_45",
+"java_version": "8",
+"mysql_jdbc_url": 
"http://c6401.ambari.apache.org:8080/resources//mysql-connector-java.jar;,
+"custom_mysql_jdbc_name" : "mysql-connector-java.jar",
+"custom_oracle_jdbc_name" : "oracle-jdbc-driver.jar",
+"custom_postgres_jdbc_name" : "test-postgres-jdbc.jar"
+  },
+  "commandType": "EXECUTION_COMMAND",
+  "roleParams": {},
+  "serviceName": "HIVE",
+  "role": "HIVE_SERVER",
+  "commandParams": {
+"command_timeout": "600",
+"service_package_folder": "YARN",
+"script_type": "PYTHON",
+"script": "scripts/yarn_client.py",
+"excluded_hosts": "host1",
+"mark_draining_only" : "false",
+"update_files_only" : "false"
+  },
+  "taskId": 186,
+  "public_hostname": "c6401.ambari.apache.org",
+  "configurations": {
+"sqoop-site": {
+  "atlas.cluster.name": "c1",
+  "sqoop.job.data.publish.class": "org.apache.atlas.sqoop.hook.SqoopHook"
+},
+"mapred-site": {
+  "mapreduce.jobhistory.address": "c6402.ambari.apache.org:10020",
+  "mapreduce.jobhistory.webapp.spnego-keytab-file": 
"/etc/security/keytabs/spnego.service.keytab",
+  "mapreduce.reduce.input.buffer.percent": "0.0",
+  "mapreduce.output.fileoutputformat.compress": "false",
+  "mapreduce.framework.name": "yarn",
+  "mapreduce.map.speculative": "false",
+  "mapreduce.reduce.shuffle.merge.percent": "0.66",
+  "yarn.app.mapreduce.am.resource.mb": "683",
+  "mapreduce.map.java.opts": "-Xmx273m",
+  "mapreduce.cluster.administrators": " hadoop",
+  "mapreduce.application.classpath": 
"$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
+  "mapreduce.job.reduce.slowstart.completedmaps": "0.05",
+  "mapreduce.output.fileoutputformat.compress.type": "BLOCK",
+  "mapreduce.reduce.speculative": "false",
+  "mapreduce.reduce.java.opts": "-Xmx546m",
+  "mapreduce.am.max-attempts": "2",
+  "yarn.app.mapreduce.am.admin-command-opts": 
"-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN",
+  "mapreduce.reduce.log.level": "INFO",
+  "mapreduce.map.sort.spill.percent": "0.7",
+  "mapreduce.task.io.sort.mb": "136",
+  "mapreduce.task.timeout": "30",
+  "mapreduce.map.memory.mb": "341",
+  "mapreduce.task.io.sort.factor": "100",
+  "mapreduce.jobhistory.intermediate-done-dir": "/mr-history/tmp",
+  "mapreduce.reduce.memory.mb": "683",
+  "mapreduce.jobhistory.principal": "jhs/_h...@example.com",
+  "yarn.app.mapreduce.am.log.level": "INFO",
+  "mapreduce.map.log.level": "INFO",
+  "mapreduce.shuffle.port": "13562",
+  "mapreduce.admin.user.env": 

[50/51] [abbrv] ambari git commit: AMBARI-21307 Implemented PUT operation, added unit tests

[lpuskas]

AMBARI-21307 Implemented PUT operation, added unit tests


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 2b83edb45b405ab83a864d63848b00d32d84c01d
Parents: 82144bc
Author: lpuskas 
Authored: Thu Jul 13 16:20:58 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 11:55:13 2017 +0200

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


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

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 16e9ab75194e30245344a3274f85765e761217af
Parents: 0cda464
Author: Balazs Bence Sari 
Authored: Tue Aug 8 20:17:14 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 11:55:14 2017 +0200

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


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

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

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

[37/51] [abbrv] ambari git commit: AMBARI-21718. Unable to remove ZooKeeper on heartbeat lost hosts. (Ishan Bhatt via Jaimin)

[lpuskas]

AMBARI-21718. Unable to remove ZooKeeper on heartbeat lost hosts. (Ishan Bhatt 
via Jaimin)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d69084461998ad33c233bb33734b7935681df086
Parents: 15aa037
Author: Jaimin Jetly 
Authored: Mon Aug 21 12:12:50 2017 -0700
Committer: Jaimin Jetly 
Committed: Mon Aug 21 12:14:13 2017 -0700

--
 ambari-web/app/controllers/main/host/details.js | 32 ---
 ambari-web/app/messages.js  |  4 +-
 .../test/controllers/main/host/details_test.js  | 59 ++--
 3 files changed, 69 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d6908446/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index abf7673..cf223d7 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -2490,6 +2490,8 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
   zkServerInstalled: false,
   lastComponents: [],
   masterComponents: [],
+  nonAddableMasterComponents: [],
+  lastMasterComponents: [],
   runningComponents: [],
   nonDeletableComponents: [],
   unknownComponents: [],
@@ -2500,12 +2502,22 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
 if (cInstance.get('componentName') === 'ZOOKEEPER_SERVER') {
   container.zkServerInstalled = true;
 }
+var isLastComponent = false;
 if (this.getTotalComponent(cInstance) === 1) {
   container.lastComponents.push(cInstance.get('displayName'));
+  isLastComponent = true;
 }
 var workStatus = cInstance.get('workStatus');
+
 if (cInstance.get('isMaster')) {
-  container.masterComponents.push(cInstance.get('displayName'));
+  var displayName = cInstance.get('displayName')
+  container.masterComponents.push(displayName);
+  if 
(!App.StackServiceComponent.find(cInstance.get('componentName')).get('isMasterAddableInstallerWizard'))
  {
+container.nonAddableMasterComponents.push(displayName);
+  }
+  if(isLastComponent) {
+container.lastMasterComponents.push(displayName);
+  }
 }
 if (stoppedStates.indexOf(workStatus) < 0) {
   container.runningComponents.push(cInstance.get('displayName'));
@@ -2650,16 +2662,20 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
   validateAndDeleteHost: function () {
 var container = this.getHostComponentsInfo();
 
-if (container.masterComponents.length > 0) {
-  this.raiseDeleteComponentsError(container, 'masterList');
-  return;
-} else if (container.nonDeletableComponents.length > 0) {
+if (container.nonDeletableComponents.length > 0) {
   this.raiseDeleteComponentsError(container, 'nonDeletableList');
   return;
+} else if (container.nonAddableMasterComponents.length > 0) {
+  this.raiseDeleteComponentsError(container, 'masterList');
+  return;
 } else if (container.runningComponents.length > 0) {
   this.raiseDeleteComponentsError(container, 'runningList');
   return;
+} else if(container.lastMasterComponents.length > 0) {
+  this.raiseDeleteComponentsError(container, 'lastMasterList');
+  return;
 }
+
 if (container.zkServerInstalled) {
   var self = this;
   return App.showConfirmationPopup(function () {
@@ -2680,17 +2696,19 @@ App.MainHostDetailsController = 
Em.Controller.extend(App.SupportClientConfigsDow
 App.ModalPopup.show({
   header: Em.I18n.t('hosts.cant.do.popup.title'),
   type: type,
-  showBodyEnd: Em.computed.existsIn('type', ['runningList', 'masterList']),
+  showBodyEnd: Em.computed.existsIn('type', ['runningList', 'masterList', 
'lastMasterList']),
   container: container,
   components: function(){
 var container = this.get('container');
 switch (this.get('type')) {
   case 'masterList':
-return container.masterComponents;
+return container.nonAddableMasterComponents;
   case 'nonDeletableList':
 return container.nonDeletableComponents;
   case 'runningList':
 return container.runningComponents;
+  case 'lastMasterList':
+

[12/51] [abbrv] ambari git commit: AMBARI-21722 - Begin Using Service Versions In Python stack_feature Code (jonathanhurley)

[lpuskas]

AMBARI-21722 - Begin Using Service Versions In Python stack_feature Code 
(jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 330a61cdbe34f97559359c67c5039623d9fc6e69
Parents: 12c0588
Author: Jonathan Hurley 
Authored: Mon Aug 14 16:58:52 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Aug 16 13:26:44 2017 -0400

--
 .../libraries/functions/component_version.py|   63 +
 .../libraries/functions/constants.py|1 -
 .../libraries/functions/copy_tarball.py |   38 +-
 .../libraries/functions/stack_features.py   |   33 +-
 .../libraries/functions/upgrade_summary.py  |  130 ++
 .../actionmanager/ExecutionCommandWrapper.java  |   25 +-
 .../ambari/server/agent/ExecutionCommand.java   |   35 +-
 .../AmbariManagementControllerImpl.java |1 -
 .../ambari/server/state/UpgradeContext.java |  100 +-
 .../FALCON/0.5.0.2.1/package/scripts/falcon.py  |4 +-
 .../0.5.0.2.1/package/scripts/params_linux.py   |   25 +-
 .../package/scripts/hive_metastore.py   |   11 +-
 .../package/scripts/hive_server_upgrade.py  |   16 +-
 .../0.12.0.2.0/package/scripts/hive_service.py  |2 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |   11 +-
 .../2.1.0.3.0/package/scripts/hive_metastore.py |   11 +-
 .../package/scripts/hive_server_upgrade.py  |   17 +-
 .../2.1.0.3.0/package/scripts/hive_service.py   |2 +-
 .../2.1.0.3.0/package/scripts/params_linux.py   |   11 +-
 .../KAFKA/0.10.0.3.0/package/scripts/kafka.py   |   29 -
 .../0.10.0.3.0/package/scripts/kafka_broker.py  |   13 +-
 .../KAFKA/0.10.0.3.0/package/scripts/params.py  |9 +-
 .../KAFKA/0.10.0.3.0/package/scripts/upgrade.py |3 -
 .../KAFKA/0.8.1/package/scripts/kafka.py|   29 -
 .../KAFKA/0.8.1/package/scripts/kafka_broker.py |   14 +-
 .../KAFKA/0.8.1/package/scripts/params.py   |8 -
 .../KAFKA/0.8.1/package/scripts/upgrade.py  |7 +-
 .../0.5.0.2.2/package/scripts/params_linux.py   |6 +-
 .../0.5.0.3.0/package/scripts/params_linux.py   |3 +-
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py|4 +-
 .../RANGER/0.4.0/package/scripts/params.py  |1 -
 .../RANGER/1.0.0.3.0/package/scripts/params.py  |1 -
 .../3.4.5/package/scripts/params_linux.py   |1 -
 .../HDP/2.0.6/properties/stack_features.json|6 -
 .../3.0/hooks/after-INSTALL/scripts/params.py   |3 -
 .../HDP/3.0/properties/stack_features.json  |6 -
 .../ambari/server/StateRecoveryManagerTest.java |   10 +-
 .../ExecutionCommandWrapperTest.java|8 +-
 .../ambari/server/utils/StageUtilsTest.java |6 +
 .../test/python/TestComponentVersionMapping.py  |   84 ++
 .../src/test/python/TestStackFeature.py |   88 +-
 .../src/test/python/TestUpgradeSummary.py   |  137 ++
 .../stacks/2.0.6/HIVE/test_hive_server.py   |   17 +-
 .../2.0.6/HIVE/test_hive_service_check.py   |   12 +-
 .../test/python/stacks/2.0.6/configs/nn_eu.json |   21 +-
 .../stacks/2.0.6/configs/nn_eu_standby.json |   21 +-
 .../python/stacks/2.0.6/configs/secured.json| 1210 +-
 .../secured_yarn_include_file_dont_manage.json  |4 +-
 .../secured_yarn_include_file_manage.json   |4 +-
 .../hooks/after-INSTALL/test_after_install.py   |2 -
 .../stacks/2.1/FALCON/test_falcon_client.py |5 +-
 .../stacks/2.1/FALCON/test_falcon_server.py |   15 +-
 .../stacks/2.1/FALCON/test_service_check.py |5 +-
 .../stacks/2.1/HIVE/test_hive_metastore.py  |   48 +-
 .../2.1/configs/hive-metastore-upgrade.json |   21 +-
 .../python/stacks/2.2/KNOX/test_knox_gateway.py |   36 +-
 .../python/stacks/2.2/configs/knox_upgrade.json |   21 +-
 .../stacks/2.3/configs/storm_default.json   |6 +-
 .../2.3/configs/storm_default_secure.json   |6 +-
 .../2.5/configs/ranger-admin-default.json   |1 -
 .../2.5/configs/ranger-admin-secured.json   |1 -
 .../stacks/2.5/configs/ranger-kms-default.json  |1 -
 .../stacks/2.5/configs/ranger-kms-secured.json  |1 -
 .../2.6/configs/ranger-admin-default.json   |1 -
 .../2.6/configs/ranger-admin-secured.json   |1 -
 .../src/test/python/stacks/utils/RMFTestCase.py |   66 +-
 .../2.0/hooks/after-INSTALL/scripts/params.py   |3 -
 .../HDF/2.0/properties/stack_features.json  |6 -
 .../2.0/hooks/after-INSTALL/scripts/params.py   |3 -
 .../HIVE/package/scripts/hive_metastore.py  |7 +-
 .../HIVE/package/scripts/hive_server_upgrade.py |   21 +-
 .../HIVE/package/scripts/hive_service.py|2 +-
 

[45/51] [abbrv] ambari git commit: Added swagger annotations to the new endpoint

[lpuskas]

Added swagger annotations to the new endpoint


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 82144bc246a581b8ae7b38e6fab7a44d852192d6
Parents: c890306
Author: Balázs Bence Sári 
Authored: Thu Jul 6 18:36:18 2017 +0200
Committer: lpuskas 
Committed: Tue Aug 22 11:55:12 2017 +0200

--
 .../AmbariConfigurationRequestSwagger.java  | 48 +++
 .../AmbariConfigurationResponseSwagger.java | 40 +
 .../services/AmbariConfigurationService.java| 62 +---
 3 files changed, 143 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/82144bc2/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
new file mode 100644
index 000..d6714f9
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationRequestSwagger.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.api.services;
+
+import java.util.Map;
+
+import org.apache.ambari.server.controller.ApiModel;
+import org.apache.ambari.server.orm.entities.ConfigurationBaseEntity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Request data model for {@link 
org.apache.ambari.server.api.services.AmbariConfigurationService}
+ */
+public interface AmbariConfigurationRequestSwagger extends ApiModel {
+
+  @ApiModelProperty(name = "AmbariConfiguration")
+  AmbariConfigurationRequestInfo getAmbariConfiguration();
+
+  interface AmbariConfigurationRequestInfo {
+@ApiModelProperty
+Long getId();
+
+@ApiModelProperty
+Map getData();
+
+@ApiModelProperty
+String getType();
+
+@ApiModelProperty
+Long getVersion();
+
+@ApiModelProperty(name = "version_tag")
+String getVersionTag();
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/82144bc2/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
new file mode 100644
index 000..c55ac1d
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationResponseSwagger.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ambari.server.api.services;
+
+import java.util.Map;
+
+import org.apache.ambari.server.controller.ApiModel;
+
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Response data model for {@link 
org.apache.ambari.server.api.services.AmbariConfigurationService}
+ */
+public interface AmbariConfigurationResponseSwagger extends ApiModel {
+
+  @ApiModelProperty(name = "AmbariConfiguration")
+  AmbariConfigurationResponseInfo getAmbariConfigurationResponse();
+
+  interface AmbariConfigurationResponseInfo {
+@ApiModelProperty
+Long getId();
+
+@ApiModelProperty
+Map getData();
+

[32/51] [abbrv] ambari git commit: AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in Zeppelin(Prabhjyot Singh via Venkata Sairam)

[lpuskas]

AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in 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/6fb37195
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6fb37195
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6fb37195

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 6fb371957ad5612e3a6b2c639dec559aacf5a15d
Parents: 705a62b
Author: Venkata Sairam 
Authored: Mon Aug 21 14:03:58 2017 +0530
Committer: Venkata Sairam 
Committed: Mon Aug 21 14:03:58 2017 +0530

--
 .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml| 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb37195/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
index 971e4af..742f5be 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml
@@ -61,6 +61,12 @@ sessionManager = 
org.apache.shiro.web.session.mgt.DefaultWebSessionManager
 cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager
 securityManager.cacheManager = $cacheManager
 
+cookie = org.apache.shiro.web.servlet.SimpleCookie
+cookie.name = JSESSIONID
+cookie.secure = true
+cookie.httpOnly = true
+sessionManager.sessionIdCookie = $cookie
+
 securityManager.sessionManager = $sessionManager
 # 86,400,000 milliseconds = 24 hour
 securityManager.sessionManager.globalSessionTimeout = 8640

[36/51] [abbrv] ambari git commit: AMBARI-21756. Use latest-vdf for default when version is unspecified (ncole)

[lpuskas]

AMBARI-21756. Use latest-vdf for default when version is unspecified (ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 15aa0375e8c79bbaab237a28c1f0b78275f551f6
Parents: 28a4223
Author: Nate Cole 
Authored: Mon Aug 21 13:01:34 2017 -0400
Committer: Nate Cole 
Committed: Mon Aug 21 13:01:34 2017 -0400

--
 .../server/api/services/AmbariMetaInfo.java |  9 ++-
 .../VersionDefinitionResourceProvider.java  |  6 +-
 .../apache/ambari/server/state/StackInfo.java   | 17 +
 .../state/repository/VersionDefinitionXml.java  |  7 ++
 .../server/state/stack/LatestRepoCallable.java  | 80 +++-
 .../ambari/server/topology/AmbariContext.java   | 50 +++-
 .../server/api/services/AmbariMetaInfoTest.java | 30 
 .../AmbariManagementControllerTest.java |  2 +-
 .../VersionDefinitionResourceProviderTest.java  | 14 +---
 .../ambari/server/stack/StackManagerTest.java   |  5 +-
 .../server/topology/AmbariContextTest.java  | 40 --
 .../resources/stacks/HDP/2.2.0/repos/hdp.json   |  4 +
 .../stacks/HDP/2.2.0/repos/repoinfo.xml |  8 ++
 .../stacks/HDP/2.2.0/repos/version-2.2.0.5.xml  | 51 +
 .../resources/stacks/HDP/2.2.1/metainfo.xml | 24 ++
 .../resources/stacks/HDP/2.2.1/repos/hdp.json   |  7 ++
 .../stacks/HDP/2.2.1/repos/repoinfo.xml | 36 +
 .../HDP/2.2.1/services/RANGER/alerts.json   | 74 ++
 18 files changed, 418 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/15aa0375/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index eb97ee3..7eb82e4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -1381,7 +1381,14 @@ public class AmbariMetaInfo {
 
   if (stack.isActive() && stack.isValid()) {
 try {
-  VersionDefinitionXml xml = VersionDefinitionXml.build(stack);
+  // !!! check for a "latest-vdf" one.  This will be used for the 
default if one is not found.
+  VersionDefinitionXml xml = stack.getLatestVersionDefinition();
+
+  if (null == xml) {
+// !!! "latest-vdf" was not found, use the stack.  this is the 
last-ditch effort
+xml = VersionDefinitionXml.build(stack);
+  }
+
   versionDefinitions.put(String.format("%s-%s", stack.getName(), 
stack.getVersion()), xml);
 } catch (Exception e) {
   LOG.warn("Could not make a stack VDF for {}-{}: {}",

http://git-wip-us.apache.org/repos/asf/ambari/blob/15aa0375/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
index c789096..162c8df 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java
@@ -91,10 +91,10 @@ public class VersionDefinitionResourceProvider extends 
AbstractAuthorizedResourc
   public static final String VERSION_DEF_STACK_NAME  = 
"VersionDefinition/stack_name";
   public static final String VERSION_DEF_STACK_VERSION   = 
"VersionDefinition/stack_version";
 
-  protected static final String VERSION_DEF_ID   = 
"VersionDefinition/id";
+  public static final String VERSION_DEF_ID   = 
"VersionDefinition/id";
   protected static final String VERSION_DEF_TYPE_PROPERTY_ID = 
"VersionDefinition/type";
   protected static final String VERSION_DEF_DEFINITION_URL   = 
"VersionDefinition/version_url";
-  protected static final String VERSION_DEF_AVAILABLE_DEFINITION = 
"VersionDefinition/available";
+  public static final String VERSION_DEF_AVAILABLE_DEFINITION = 
"VersionDefinition/available";
  

[13/51] [abbrv] ambari git commit: AMBARI-21398 Backend need to distinguish repo_version records by using the Stack Name (dgrinenko)

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3f6c4ca0/ambari-server/src/test/python/custom_actions/TestRemoveStackVersion.py
--
diff --git 
a/ambari-server/src/test/python/custom_actions/TestRemoveStackVersion.py 
b/ambari-server/src/test/python/custom_actions/TestRemoveStackVersion.py
index 5a05cc2..55bf9b5 100644
--- a/ambari-server/src/test/python/custom_actions/TestRemoveStackVersion.py
+++ b/ambari-server/src/test/python/custom_actions/TestRemoveStackVersion.py
@@ -28,17 +28,20 @@ from stacks.utils.RMFTestCase import *
 OLD_VERSION_STUB = '2.1.0.0-400'
 VERSION_STUB = '2.2.0.1-885'
 
+
 @patch.object(Logger, 'logger', new=MagicMock())
 class TestRemoveStackVersion(RMFTestCase):
 
   @staticmethod
-  def _add_packages(arg):
-arg.append(["pkg12_1_0_0_400", "1.0", "repo"])
-arg.append(["pkg22_1_0_1_885", "2.0", "repo2"])
-arg.append(["hdp-select2_1_0_1_885", "2.0", "repo2"])
+  def _add_packages():
+return [
+  ["pkg12_1_0_0_400", "1.0", "repo"],
+  ["pkg22_1_0_1_885", "2.0", "repo2"],
+  ["hdp-select2_1_0_1_885", "2.0", "repo2"]
+]
 
   
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
-  
@patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages")
+  @patch("resource_management.core.providers.get_provider")
   @patch("resource_management.libraries.script.Script.put_structured_out")
   
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
   
@patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file")
@@ -49,10 +52,11 @@ class TestRemoveStackVersion(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
-   put_structured_out_mock, allInstalledPackages_mock, 
list_ambari_managed_repos_mock, ):
-
+   put_structured_out_mock, get_provider_mock, 
list_ambari_managed_repos_mock):
+m = MagicMock()
+m.all_installed_packages.side_effect = TestRemoveStackVersion._add_packages
+get_provider_mock.return_value = m
 stack_versions_mock.return_value = [VERSION_STUB, OLD_VERSION_STUB]
-allInstalledPackages_mock.side_effect = 
TestRemoveStackVersion._add_packages
 list_ambari_managed_repos_mock.return_value = []
 
 self.executeScript("scripts/remove_previous_stacks.py",
@@ -76,7 +80,7 @@ class TestRemoveStackVersion(RMFTestCase):
 self.assertNoMoreResources()
 
   
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
-  
@patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages")
+  @patch("resource_management.core.providers.get_provider")
   @patch("resource_management.libraries.script.Script.put_structured_out")
   
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
   
@patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file")
@@ -87,10 +91,14 @@ class TestRemoveStackVersion(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
-   put_structured_out_mock, allInstalledPackages_mock, 
list_ambari_managed_repos_mock ):
+   put_structured_out_mock, get_provider_mock, 
list_ambari_managed_repos_mock ):
 
 stack_versions_mock.return_value = [VERSION_STUB]
-allInstalledPackages_mock.side_effect = 
TestRemoveStackVersion._add_packages
+
+m = MagicMock()
+m.all_installed_packages.side_effect = TestRemoveStackVersion._add_packages
+get_provider_mock.return_value = m
+
 list_ambari_managed_repos_mock.return_value = []
 
 self.executeScript("scripts/remove_previous_stacks.py",
@@ -105,7 +113,7 @@ class TestRemoveStackVersion(RMFTestCase):
 self.assertNoMoreResources()
 
   
@patch("resource_management.libraries.functions.list_ambari_managed_repos.list_ambari_managed_repos")
-  
@patch("resource_management.libraries.functions.packages_analyzer.allInstalledPackages")
+  @patch("resource_management.core.providers.get_provider")
   @patch("resource_management.libraries.script.Script.put_structured_out")
   
@patch("resource_management.libraries.functions.stack_select.get_stack_versions")
   
@patch("resource_management.libraries.functions.repo_version_history.read_actual_version_from_history_file")
@@ -116,10 +124,14 @@ class TestRemoveStackVersion(RMFTestCase):
write_actual_version_to_history_file_mock,
read_actual_version_from_history_file_mock,
stack_versions_mock,
-   put_structured_out_mock, 

[19/51] [abbrv] ambari git commit: AMBARI-21735 - Parameterize Maven Surefire Build argLine (jonathanhurley)

[lpuskas]

AMBARI-21735 - Parameterize Maven Surefire Build argLine (jonathanhurley)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: b428fb9be84af73e5931d6d81908c3372b711420
Parents: f2cc609
Author: Jonathan Hurley 
Authored: Wed Aug 16 20:12:49 2017 -0400
Committer: Jonathan Hurley 
Committed: Thu Aug 17 11:40:20 2017 -0400

--
 ambari-project/pom.xml  |  1 +
 ambari-server/pom.xml   |  2 +-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  5 +++--
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  4 ++--
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  2 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  2 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  2 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  9 
 .../apache/ambari/server/orm/db/DDLTests.java   | 22 +---
 .../server/testing/DBInconsistencyTests.java|  2 ++
 pom.xml |  2 +-
 11 files changed, 27 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b428fb9b/ambari-project/pom.xml
--
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 524a8f7..00ba1bc 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -37,6 +37,7 @@
 1.7.20
 4
 false
+-Xmx1024m -Xms512m
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b428fb9b/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 3c966f2..29a820a 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -719,7 +719,7 @@
 maven-surefire-plugin
 
   ${skipSurefireTests}
-  -Xmx1024m -Xms512m
+  ${surefire.argLine}
 
   
   ${testcase.groups}

http://git-wip-us.apache.org/repos/asf/ambari/blob/b428fb9b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
index 89bc4a4..5fcb03e 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
@@ -228,7 +228,7 @@ CREATE TABLE host_version (
   CONSTRAINT PK_host_version PRIMARY KEY (id),
   CONSTRAINT FK_host_version_host_id FOREIGN KEY (host_id) REFERENCES hosts 
(host_id),
   CONSTRAINT FK_host_version_repovers_id FOREIGN KEY (repo_version_id) 
REFERENCES repo_version (repo_version_id),
-  CONSTRAINT UQ_host_repo UNIQUE(host_id, repo_version_id, state));
+  CONSTRAINT UQ_host_repo UNIQUE(host_id, repo_version_id));
 
 CREATE TABLE servicedesiredstate (
   cluster_id BIGINT NOT NULL,
@@ -272,6 +272,7 @@ CREATE TABLE groups (
   principal_id BIGINT NOT NULL,
   group_name VARCHAR(255) NOT NULL,
   ldap_group INTEGER NOT NULL DEFAULT 0,
+  group_type VARCHAR(255) NOT NULL DEFAULT 'LOCAL',
   CONSTRAINT PK_groups PRIMARY KEY (group_id),
   UNIQUE (ldap_group, group_name),
   CONSTRAINT FK_groups_principal_id FOREIGN KEY (principal_id) REFERENCES 
adminprincipal(principal_id));
@@ -553,7 +554,7 @@ CREATE table viewurl(
   url_id BIGINT ,
   url_name VARCHAR(255) NOT NULL ,
   url_suffix VARCHAR(255) NOT NULL,
-  PRIMARY KEY(url_id)
+  CONSTRAINT PK_viewurl PRIMARY KEY(url_id)
 );
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b428fb9b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 22dad9b..7c0e8d3 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -572,7 +572,7 @@ CREATE table viewurl(
   url_id BIGINT ,
   url_name VARCHAR(255) NOT NULL ,
   url_suffix VARCHAR(255) NOT NULL,
-  PRIMARY KEY(url_id)
+  CONSTRAINT PK_viewurl PRIMARY KEY(url_id)
 );
 
 
@@ -1101,7 +1101,7 @@ INSERT INTO ambari_sequences(sequence_name, 
sequence_value) VALUES
   ('setting_id_seq', 0),
   ('hostcomponentstate_id_seq', 0),
   ('servicecomponentdesiredstate_id_seq', 0),
-  ('servicecomponent_history_id_seq', 0),
+  ('upgrade_history_id_seq', 0),
   ('blueprint_setting_id_seq', 0),