date:20170821

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

2017-08-21 Thread eyang

Repository: ambari
Updated Branches:
  refs/heads/trunk 6de8094a4 -> d260c8926


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/trunk
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()

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

2017-08-21 Thread hapylestat

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/d2ca468c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d2ca468c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d2ca468c

Branch: refs/heads/branch-2.6
Commit: d2ca468cc1f09d69ca4af504076a20602e48fd27
Parents: d84cda8
Author: Dmytro Grinenko 
Authored: Tue Aug 22 06:15:53 2017 +0300
Committer: Dmytro Grinenko 
Committed: Tue Aug 22 06:15:53 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/d2ca468c/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 256cf8f..84ff9cc 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/d2ca468c/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")

ambari git commit: AMBARI-21770 - Spark1 Shuffle Property Is Removed Incorrectly on a Stack Upgrade (jonathanhurley)

2017-08-21 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 4f52f6d40 -> d84cda89a


AMBARI-21770 - Spark1 Shuffle Property Is Removed Incorrectly on a Stack 
Upgrade (jonathanhurley)


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

Branch: refs/heads/branch-2.6
Commit: d84cda89a940fa61701972d9ff011010dc0be08f
Parents: 4f52f6d
Author: Jonathan Hurley 
Authored: Mon Aug 21 16:09:57 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Aug 21 18:55:31 2017 -0400

--
 .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml  | 7 ++-
 .../stacks/BigInsights/4.2/upgrades/config-upgrade.xml| 6 +-
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d84cda89/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
index f55f9fb..f90a20e 100644
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml
@@ -76,7 +76,12 @@
 
   
 yarn-site
-
+
+
+
+
+
+
   
   
 yarn-env

http://git-wip-us.apache.org/repos/asf/ambari/blob/d84cda89/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
index ad20bf9..77390cf 100644
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
@@ -164,7 +164,11 @@
 
   
 yarn-site
-
+
+
+
+
+

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

2017-08-21 Thread avijayan

Repository: ambari
Updated Branches:
  refs/heads/trunk 8e33d8864 -> d5904b9a9


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/trunk
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

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

2017-08-21 Thread avijayan

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 4f2746749 -> 4f52f6d40


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/4f52f6d4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f52f6d4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f52f6d4

Branch: refs/heads/branch-2.6
Commit: 4f52f6d409590a6d4355aa2f8702624726bf9735
Parents: 4f27467
Author: Aravindan Vijayan 
Authored: Mon Aug 21 14:04:32 2017 -0700
Committer: Aravindan Vijayan 
Committed: Mon Aug 21 14:04:32 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/4f52f6d4/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 48d16b5..8878997 100644
--- a/ambari-logsearch/ambari-logsearch-assembly/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-assembly/pom.xml
@@ -192,6 +192,7 @@
 classes/log4j.xml
 classes/logfeeder.properties
 classes/grok-patterns
+libs/checkstyle*.jar
   
 
   
@@ -453,7 +454,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/4f52f6d4/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 4798b3f..b6b9ad7 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -243,6 +243,7 @@
   ${collector.dir}/target/lib
   
 *tests.jar
+findbugs*.jar
   
 
 
@@ -262,6 +263,7 @@
 bin/**
 bin/*
 lib/*tests.jar
+lib/findbugs*.jar

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)

2017-08-21 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 ca6ce335d -> 0ae0494dc


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/0ae0494d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ae0494d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ae0494d

Branch: refs/heads/branch-2.5
Commit: 0ae0494dcc264dd2bbb9cb84bad4b13fdfa2a9ef
Parents: ca6ce33
Author: Robert Levas 
Authored: Mon Aug 21 17:03:40 2017 -0400
Committer: Robert Levas 
Committed: Mon Aug 21 17:03:40 2017 -0400

--
 .../kerberos/DeconstructedPrincipal.java|   2 +-
 .../server/upgrade/UpgradeCatalog252.java   | 168 ++-
 .../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|  62 ++-
 .../server/upgrade/UpgradeCatalog252Test.java   | 198 
 .../stacks/2.5/common/test_stack_advisor.py | 197 
 .../stacks/2.6/common/test_stack_advisor.py | 471 +++
 10 files changed, 1154 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ae0494d/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 f5d8156..d0c79ab 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
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
  * 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/0ae0494d/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 ce1c8f1..0b422f8 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
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -20,24 +20,33 @@ package org.apache.ambari.server.upgrade;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
+import org.apache.ambari.server.orm.dao.ArtifactDAO;
 import org.apache.ambari.server.orm.dao.ClusterDAO;
+import org.apache.ambari.server.orm.entities.ArtifactEntity;
 import org.apache.ambari.server.orm.entities.ClusterConfigMappingEntity;
 import org.apache.ambari.server.orm.entities.ClusterEntity;
+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.StackId;
+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

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

2017-08-21 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 d1df4d9aa -> ca6ce335d


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/ca6ce335
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ca6ce335
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ca6ce335

Branch: refs/heads/branch-2.5
Commit: ca6ce335d7bd3d50e5892a3169d90acbdada963d
Parents: d1df4d9
Author: Sumit Mohanty 
Authored: Mon Aug 21 14:00:40 2017 -0700
Committer: Sumit Mohanty 
Committed: Mon Aug 21 14:02:12 2017 -0700

--
 .../0.5.0.2.2/package/scripts/params_linux.py   | 27 
 1 file changed, 27 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ca6ce335/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 9b0bbfc..f54abef 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
@@ -157,17 +157,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) :
@@ -188,6 +201,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]
@@ -227,17 +247,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')

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

2017-08-21 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/trunk c129baa1f -> 8e33d8864


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/trunk
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
---

ambari git commit: AMBARI-21768. Spark History Server uses wrong log dir. (Attila Doroszlai via swagle)

2017-08-21 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 4124bc30d -> d1df4d9aa


AMBARI-21768. Spark History Server uses wrong log dir. (Attila Doroszlai via 
swagle)


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

Branch: refs/heads/branch-2.5
Commit: d1df4d9aa658975a82b5cb5e16be893d36268c87
Parents: 4124bc3
Author: Siddharth Wagle 
Authored: Mon Aug 21 13:53:26 2017 -0700
Committer: Siddharth Wagle 
Committed: Mon Aug 21 13:53:26 2017 -0700

--
 .../BigInsights/4.2/upgrades/config-upgrade.xml | 16 
 .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml  |  6 ++
 2 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d1df4d9a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
index ad20bf9..02d3a01 100644
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml
@@ -372,6 +372,22 @@
   
 
   
+  
+
+  
+spark-defaults
+
+
+
+
+
+  
+  
+spark-env
+
+  
+
+  
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1df4d9a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
index b8c23bb..c831326 100644
--- 
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml
@@ -316,6 +316,12 @@
   
 
   
+  
+
+  
+  
+
+

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

2017-08-21 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 ba1fa0bfb -> 4124bc30d


Revert "AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in 
Zeppelin(Prabhjyot Singh via Venkata Sairam)"

This reverts commit 2b50a560c34a278b67352b699e698a1cfd050406.


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

Branch: refs/heads/branch-2.5
Commit: 4124bc30d021277efbd132123a99de9df7707c6e
Parents: ba1fa0b
Author: Sumit Mohanty 
Authored: Mon Aug 21 13:07:34 2017 -0700
Committer: Sumit Mohanty 
Committed: Mon Aug 21 13:07:34 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/4124bc30/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 742f5be..971e4af 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,12 +61,6 @@ 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

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

2017-08-21 Thread jaimin

Repository: ambari
Updated Branches:
  refs/heads/trunk 15aa0375e -> d69084461


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/trunk
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

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

2017-08-21 Thread ncole

Repository: ambari
Updated Branches:
  refs/heads/trunk 28a42236a -> 15aa0375e


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/trunk
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

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

2017-08-21 Thread ncole

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 596b145db -> 98be9abf8


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/98be9abf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98be9abf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98be9abf

Branch: refs/heads/branch-2.6
Commit: 98be9abf850fd04f1399c4894277b1770a018a5a
Parents: 596b145
Author: Nate Cole 
Authored: Fri Aug 18 11:54:00 2017 -0400
Committer: Nate Cole 
Committed: Mon Aug 21 09:52:05 2017 -0400

--
 .../server/api/services/AmbariMetaInfo.java |  9 ++-
 .../VersionDefinitionResourceProvider.java  |  6 +-
 .../apache/ambari/server/state/StackInfo.java   | 39 +++---
 .../state/repository/VersionDefinitionXml.java  |  7 ++
 .../server/state/stack/LatestRepoCallable.java  | 80 +++-
 .../ambari/server/topology/AmbariContext.java   | 48 +++-
 .../server/api/services/AmbariMetaInfoTest.java | 30 
 .../AmbariManagementControllerTest.java |  2 +-
 .../VersionDefinitionResourceProviderTest.java  | 14 +---
 .../ambari/server/stack/StackManagerTest.java   | 14 ++--
 .../server/topology/AmbariContextTest.java  | 39 --
 .../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, 430 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/98be9abf/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 2cecfb6..9afba8c 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
@@ -1451,7 +1451,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/98be9abf/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..5fc96d1 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

ambari git commit: AMBARI-21764. Patch / Maint UI Assets Need Style Adjustments (alexantonenko)

2017-08-21 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 445c7b011 -> fc0140930


AMBARI-21764. Patch / Maint UI Assets Need Style Adjustments (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: fc0140930db3a32d56953a88f3d8608d28fbe407
Parents: 445c7b0
Author: Alex Antonenko 
Authored: Mon Aug 21 16:43:09 2017 +0300
Committer: Alex Antonenko 
Committed: Mon Aug 21 16:43:09 2017 +0300

--
 .../main/admin/stack_and_upgrade_controller.js  |   5 +-
 ambari-web/app/styles/common.less   |   2 +
 ambari-web/app/styles/stack_versions.less   |  82 +-
 .../admin/stack_upgrade/upgrade_version_box.hbs |  13 ---
 .../stack_upgrade/upgrade_version_column.hbs| 113 ++-
 .../stack_upgrade/upgrade_version_box_view.js   |   9 +-
 .../upgrade_version_column_view.js  |  11 +-
 .../admin/stack_and_upgrade_controller_test.js  |   2 +-
 .../upgrade_version_box_view_test.js|  10 +-
 9 files changed, 129 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fc014093/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 6718ba7..c00ddf5 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -1982,10 +1982,11 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 
   /**
*
-   * @param {Em.Object} version
+   * @param {object} event
*/
-  confirmRevertPatchUpgrade: function(version) {
+  confirmRevertPatchUpgrade: function(event) {
 var self = this;
+var version = event.context;
 var currentStack = 
App.RepositoryVersion.find(this.get('currentVersion.id'));
 
 App.ModalPopup.show({

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc014093/ambari-web/app/styles/common.less
--
diff --git a/ambari-web/app/styles/common.less 
b/ambari-web/app/styles/common.less
index 620bd5f..b1c280f 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -41,6 +41,8 @@
 @green: #69BE28;
 @blue: #0572ff;
 @gray-blue: #80A0B9;
+@gray: #999;
+@current-green: #468847;
 
 @spinner-default-width: 36px;
 @spinner-default-height: 36px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc014093/ambari-web/app/styles/stack_versions.less
--
diff --git a/ambari-web/app/styles/stack_versions.less 
b/ambari-web/app/styles/stack_versions.less
index 4d1e5bf..381cd20 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -158,16 +158,12 @@
   }
   .left-menu-table {
 padding: 10px 0;
-margin-top: 141px;
+margin-top: 136px;
 td.service-display-name {
   border-top: 2px solid #e4e4e4;
   border-bottom: 2px solid #e4e4e4;
 }
   }
-  div.current-version-box {
-background: none repeat scroll 0 0 #e6f1f6;
-box-shadow: 0 8px 6px -6px black;
-  }
   .version-box {
 position: relative;
 background: none repeat scroll 0 0 #fff;
@@ -273,8 +269,10 @@
   }
   .version-column {
 min-height: 500px;
-min-width: 145px;
-margin: 15px 7px 0px 7px;
+min-width: 175px;
+margin: 15px 7px 0 7px;
+padding-top: 0;
+background-color: #efefef;
 .version-column-display-name {
   color: #000;
   text-align: center;
@@ -288,8 +286,7 @@
   text-align: center;
   font-size: 13px;
   padding: 5px 5px;
-  border-bottom: 1px solid #e4e4e4;
-  margin-bottom: 0px;
+  margin-bottom: 18px;
   a {
 cursor: pointer;
   }
@@ -297,18 +294,57 @@
 .patch-icon {
   margin: 0 0 -5px 0;
 }
+.icon-trash {
+  padding: 3px 5px;
+  border-radius: 15px;
+  border: 1px solid black;
+  font-size: 12px;
+  cursor: pointer;
+  background: white;
+}
 .state {
-  margin: 5px 0px 15px 0px;
+  margin: 0 0 25px 0;
   line-height: 20px;
-  .label-success {
+  padding-top: 0;
+  .top-label {
+font-size: inherit;
+border-radius: 0;
+width: 100%;
+display: inline-block;
+padding: 0;
 line-height:

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

2017-08-21 Thread jonathanhurley

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/1db9c4e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1db9c4e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1db9c4e9

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 1db9c4e99c68860fa85ef48c743e383c66b62ef7
Parents: 496cfe0
Author: Vitaly Brodetskyi 
Authored: Mon Aug 21 14:34:28 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Mon Aug 21 14:34:28 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/1db9c4e9/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 9f75f9d..fd96a13 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, \
+

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

2017-08-21 Thread jonathanhurley

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


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 445c7b0119078793649452389b78d60dd98804cb
Parents: 1edd300 596b145
Author: Jonathan Hurley 
Authored: Mon Aug 21 09:37:39 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Aug 21 09:37:39 2017 -0400

--
 .../core/providers/package/yumrpm.py|  32 +--
 ambari-server/src/main/assemblies/server.xml|   1 -
 .../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 ++
 .../src/main/resources/version_definition.xsd   |   2 +
 .../stacks/2.5/common/test_stack_advisor.py | 107 -
 .../test/python/stacks/2.6/DRUID/test_druid.py  |   8 +-
 .../stacks/2.6/common/test_stack_advisor.py |  60 -
 ambari-web/app/views/common/sort_view.js|  26 ++-
 .../app/views/main/alert_definitions_view.js|   9 +-
 ambari-web/test/views/common/sort_view_test.js  |  49 -
 15 files changed, 559 insertions(+), 54 deletions(-)
--

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

2017-08-21 Thread jonathanhurley

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/2c368802
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2c368802
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2c368802

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 2c3688024a0b431d11bdce2835606a3a999f5f4e
Parents: 7ad9617
Author: Swapan Shridhar 
Authored: Fri Aug 18 15:06:29 2017 -0700
Committer: Swapan Shridhar 
Committed: Fri Aug 18 15:07:47 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/2c368802/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..42e6208 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
@@ -149,24 +149,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']
@@ -175,15 +176,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/2c368802/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 e3fa6fd..cec74e4 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
@@ -446,6 +446,224

[1/7] ambari git commit: AMBARI-21750. HDFS restart fails after migration if WebHDFS is disabled. (swagle)

2017-08-21 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 1edd300af -> 445c7b011


AMBARI-21750. HDFS restart fails after migration if WebHDFS is disabled. 
(swagle)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 7ad96170e3cfa74d35da734012c965fabcd44239
Parents: 5d0914c
Author: Siddharth Wagle 
Authored: Fri Aug 18 14:28:37 2017 -0700
Committer: Siddharth Wagle 
Committed: Fri Aug 18 14:28:47 2017 -0700

--
 ambari-server/src/main/assemblies/server.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ad96170/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml 
b/ambari-server/src/main/assemblies/server.xml
index 395f322..403e21c 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -195,7 +195,6 @@
   
/var/lib/ambari-server/resources/stacks/${supplemental.distribution}
   
 /4.2/hooks/before-START/files/fast-hdfs-resource.jar
-
/4.2.5/hooks/before-START/files/fast-hdfs-resource.jar

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

2017-08-21 Thread jonathanhurley

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/496cfe04
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/496cfe04
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/496cfe04

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 496cfe04e3a7f2ad3884d9ba9801e08e0168b89c
Parents: 833fe16
Author: Nate Cole 
Authored: Sat Aug 19 08:03:02 2017 -0400
Committer: Nate Cole 
Committed: Sat Aug 19 08:03:02 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/496cfe04/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 @@
 
   
   
+  
+

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

2017-08-21 Thread jonathanhurley

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/596b145d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/596b145d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/596b145d

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 596b145db79735263fbd88e56f521edfb90fc77b
Parents: 1db9c4e
Author: Andrii Tkach 
Authored: Mon Aug 21 16:11:44 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Aug 21 16:13:07 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/596b145d/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/596b145d/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 9fb517f..ec52075 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -28,11 +28,14 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 
   contentObs: function () {
 Em.run.once(this, this.contentObsOnce);
-  }.observes('controller.content.[]', 
'App.router.clusterController.isAlertsLoaded'),
+  }.observes('controller.content.@each.summary', 
'App.router.clusterController.isAlertsLoaded'),
 
   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/596b145d/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
---

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

2017-08-21 Thread jonathanhurley

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/833fe163
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/833fe163
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/833fe163

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 833fe163bc514ae7f1626899e8c8dc57b2922e36
Parents: 2c36880
Author: Dmytro Grinenko 
Authored: Sat Aug 19 05:46:06 2017 +0300
Committer: Dmytro Grinenko 
Committed: Sat Aug 19 05:46:06 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/833fe163/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 2e8422b..d5349d6 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

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

2017-08-21 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/trunk f901e15ba -> 28a42236a


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/trunk
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

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

2017-08-21 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 5d0914c3a -> 1edd300af


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/1edd300a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1edd300a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1edd300a

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 1edd300afec2b8342d8768bc6ed5f6ae06fdb260
Parents: 5d0914c
Author: Jonathan Hurley 
Authored: Fri Aug 18 15:38:17 2017 -0400
Committer: Jonathan Hurley 
Committed: Fri Aug 18 15:38:17 2017 -0400

--
 .../AmbariManagementControllerImpl.java   | 18 ++
 .../ambari/server/controller/ClusterRequest.java  |  2 --
 .../internal/ServiceResourceProvider.java | 10 ++
 .../orm/entities/RepositoryVersionEntity.java | 10 ++
 .../ambari/server/topology/AmbariContext.java |  8 
 .../ambari/server/topology/AmbariContextTest.java |  2 ++
 6 files changed, 36 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1edd300a/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 60f5cce..1a022af 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;
@@ -429,20 +428,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.getClusterName()
-  + ", request=" + 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());
@@ -2400,10 +2398,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/1edd300a/ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterRequest.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterRequest.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterRequest.java
index aea2072..927a40a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterRequest.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ClusterRequest.java
@@ -55,8 +55,6

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

2017-08-21 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 1db9c4e99 -> 596b145db


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/596b145d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/596b145d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/596b145d

Branch: refs/heads/branch-2.6
Commit: 596b145db79735263fbd88e56f521edfb90fc77b
Parents: 1db9c4e
Author: Andrii Tkach 
Authored: Mon Aug 21 16:11:44 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Aug 21 16:13:07 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/596b145d/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/596b145d/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 9fb517f..ec52075 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -28,11 +28,14 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 
   contentObs: function () {
 Em.run.once(this, this.contentObsOnce);
-  }.observes('controller.content.[]', 
'App.router.clusterController.isAlertsLoaded'),
+  }.observes('controller.content.@each.summary', 
'App.router.clusterController.isAlertsLoaded'),
 
   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/596b145d/ambari-web/test/views/common/sort_view_test.js
--
diff --git a/ambari-web/test/views/common/sort_view_test.js

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

2017-08-21 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 2b50a560c -> ba1fa0bfb


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/ba1fa0bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba1fa0bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba1fa0bf

Branch: refs/heads/branch-2.5
Commit: ba1fa0bfbcfccc1d182ce9f5d5928757c0fc2ea5
Parents: 2b50a56
Author: Andrii Tkach 
Authored: Mon Aug 21 16:11:44 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Aug 21 16:11:44 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1fa0bf/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/ba1fa0bf/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 9fb517f..ec52075 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -28,11 +28,14 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 
   contentObs: function () {
 Em.run.once(this, this.contentObsOnce);
-  }.observes('controller.content.[]', 
'App.router.clusterController.isAlertsLoaded'),
+  }.observes('controller.content.@each.summary', 
'App.router.clusterController.isAlertsLoaded'),
 
   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/ba1fa0bf/ambari-web/test/views/common/sort_view_test.js
--
diff --git a/ambari-web/test/views/common/sort_view_test.js

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

2017-08-21 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/trunk 13589bbdf -> f901e15ba


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/trunk
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 () {

ambari git commit: AMBARI-21680. Prevent users from authenticating if they exceed a configured number of login failures (amagyar)

2017-08-21 Thread amagyar

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-20859 317905e40 -> 3cefb74cd


AMBARI-21680. Prevent users from authenticating if they exceed a configured 
number of login failures (amagyar)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 3cefb74cdae3a836ee1896a30dca713e44b95f98
Parents: 317905e
Author: Attila Magyar 
Authored: Thu Aug 10 11:37:00 2017 +0200
Committer: Attila Magyar 
Committed: Mon Aug 21 13:37:28 2017 +0200

--
 .../scripts/controllers/users/UsersShowCtrl.js  |  6 -
 .../ui/admin-web/app/scripts/i18n.config.js |  2 ++
 .../ui/admin-web/app/scripts/services/User.js   |  9 +++
 .../ui/admin-web/app/views/users/show.html  | 13 ++
 ambari-server/docs/configuration/index.md   |  1 +
 .../server/configuration/Configuration.java | 13 ++
 .../ambari/server/controller/AmbariServer.java  |  5 ++--
 .../ambari/server/controller/UserRequest.java   | 10 
 .../internal/UserResourceProvider.java  | 11 
 .../AmbariAuthenticationEventHandlerImpl.java   |  2 +-
 .../TooManyLoginFailuresException.java  | 27 
 .../authorization/AmbariLocalUserProvider.java  | 12 +++--
 .../AmbariLocalUserProviderTest.java| 18 +
 13 files changed, 123 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3cefb74c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
index 200872e..014703d 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
@@ -243,7 +243,11 @@ angular.module('ambariAdminConsole')
   });
 });
   };
-
+  $scope.resetLoginFailures = function() {
+User.resetLoginFailures($scope.user.user_name).then(function() {
+  $scope.user.consecutive_failures = 0;
+});
+  };
   // Load privileges
   function loadPrivileges(){
 User.getPrivileges($routeParams.id).then(function(data) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/3cefb74c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index 43b32da..f83a8b3 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -302,6 +302,8 @@ angular.module('ambariAdminConsole')
 'users.inactive': 'Inactive',
 'users.status': 'Status',
 'users.password': 'Password',
+'users.loginFailures': 'Login failures',
+'users.resetLoginFailures': 'Reset',
 'users.passwordConfirmation': 'Password Ñonfirmation',
 'users.userIsAdmin': 'This user is an Ambari Admin and has all 
privileges.',
 'users.showAll': 'Show all users',

http://git-wip-us.apache.org/repos/asf/ambari/blob/3cefb74c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/User.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/User.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/User.js
index ac50653..1393362 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/User.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/User.js
@@ -85,6 +85,15 @@ angular.module('ambariAdminConsole')
 }
   });
 },
+resetLoginFailures: function(userId) {
+  return $http({
+method: 'PUT',
+url: Settings.baseUrl + '/users/' + userId,
+data: {
+  'Users/consecutive_failures': 0
+}
+  });
+},
 /**
  * Generate user info to display by response data from API.
  * Generally this is a single point to manage all required and useful data

http://git-wip-us.apache.org/repos/asf/ambari/blob/3cefb74c/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html

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

2017-08-21 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 496cfe04e -> 1db9c4e99


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/1db9c4e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1db9c4e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1db9c4e9

Branch: refs/heads/branch-2.6
Commit: 1db9c4e99c68860fa85ef48c743e383c66b62ef7
Parents: 496cfe0
Author: Vitaly Brodetskyi 
Authored: Mon Aug 21 14:34:28 2017 +0300
Committer: Vitaly Brodetskyi 
Committed: Mon Aug 21 14:34:28 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/1db9c4e9/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 9f75f9d..fd96a13 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, \
+

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

2017-08-21 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/trunk 6fb371957 -> 13589bbdf


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/trunk
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, \
+

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

2017-08-21 Thread vsairam

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 4fa581afb -> 2b50a560c


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/2b50a560
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b50a560
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b50a560

Branch: refs/heads/branch-2.5
Commit: 2b50a560c34a278b67352b699e698a1cfd050406
Parents: 4fa581a
Author: Venkata Sairam 
Authored: Mon Aug 21 14:03:58 2017 +0530
Committer: Venkata Sairam 
Committed: Mon Aug 21 14:09:53 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/2b50a560/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

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

2017-08-21 Thread vsairam

Repository: ambari
Updated Branches:
  refs/heads/trunk 705a62be2 -> 6fb371957


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/trunk
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

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

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

ambari git commit: AMBARI-21770 - Spark1 Shuffle Property Is Removed Incorrectly on a Stack Upgrade (jonathanhurley)

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

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

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)

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

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

ambari git commit: AMBARI-21768. Spark History Server uses wrong log dir. (Attila Doroszlai via swagle)

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

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

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

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

ambari git commit: AMBARI-21764. Patch / Maint UI Assets Need Style Adjustments (alexantonenko)

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

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

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

[1/7] ambari git commit: AMBARI-21750. HDFS restart fails after migration if WebHDFS is disabled. (swagle)

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

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

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

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

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

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

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

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

ambari git commit: AMBARI-21680. Prevent users from authenticating if they exceed a configured number of login failures (amagyar)

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

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

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

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

31 matches

Site Navigation

Mail list logo

Footer information