ambari git commit: AMBARI-22241: accumulo_script.py doesn't override init (Josh Elser via jluniya)

[jluniya]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 f4c7b61f3 -> 64b55cf76


AMBARI-22241: accumulo_script.py doesn't override init (Josh Elser via jluniya)


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

Branch: refs/heads/branch-2.6
Commit: 64b55cf76663f2a13f02b3288b9107791a8270b3
Parents: f4c7b61
Author: Jayush Luniya 
Authored: Fri Oct 13 21:15:50 2017 -0700
Committer: Jayush Luniya 
Committed: Fri Oct 13 21:17:46 2017 -0700

--
 .../ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/64b55cf7/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
index d0e37ab..44c1839 100644
--- 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
+++ 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
@@ -37,6 +37,7 @@ from accumulo_service import accumulo_service
 class AccumuloScript(Script):
 
   def __init__(self, component):
+Script.__init__(self)
 self.component = component
 
 

ambari git commit: AMBARI-22241: accumulo_script.py doesn't override init (Josh Elser via jluniya)

[jluniya]

Repository: ambari
Updated Branches:
  refs/heads/trunk 62a0a18ce -> 329067797


AMBARI-22241: accumulo_script.py doesn't override init (Josh Elser via jluniya)


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

Branch: refs/heads/trunk
Commit: 329067797ecf70b765f6cd5a9febf89dcfbac0a5
Parents: 62a0a18
Author: Jayush Luniya 
Authored: Fri Oct 13 21:15:50 2017 -0700
Committer: Jayush Luniya 
Committed: Fri Oct 13 21:15:50 2017 -0700

--
 .../ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/32906779/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
index 6aafb05..2a95820 100644
--- 
a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
+++ 
b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/package/scripts/accumulo_script.py
@@ -37,6 +37,7 @@ from accumulo_service import accumulo_service
 class AccumuloScript(Script):
 
   def __init__(self, component):
+Script.__init__(self)
 self.component = component
 
 

[2/2] ambari git commit: AMBARI-22242. Express Upgrade from IOP 4.2 to HDP 2.6.2 AMS failed to restart before finalizing. (swagle)

[swagle]

AMBARI-22242. Express Upgrade from IOP 4.2 to HDP 2.6.2 AMS failed to restart 
before finalizing. (swagle)


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

Branch: refs/heads/trunk
Commit: 62a0a18ce57c7290989ab3ff5ffb08e88225570e
Parents: 6e1cac8
Author: Siddharth Wagle 
Authored: Fri Oct 13 20:55:36 2017 -0700
Committer: Siddharth Wagle 
Committed: Fri Oct 13 20:55:36 2017 -0700

--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py| 4 ++--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py  | 4 ++--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/62a0a18c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
index fc2576d..1c6f2a1 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
@@ -44,13 +44,13 @@ class AmsCollector(Script):
 hbase('regionserver', action)
 ams(name='collector')
 
-  def start(self, env):
+  def start(self, env, upgrade_type=None):
 self.configure(env, action = 'start') # for security
 # stop hanging components before start
 ams_service('collector', action = 'stop')
 ams_service('collector', action = 'start')
 
-  def stop(self, env):
+  def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 # Sometimes, stop() may be called before start(), in case restart() is 
initiated right after installation

http://git-wip-us.apache.org/repos/asf/ambari/blob/62a0a18c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
index 1f0e049..387b018 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
@@ -38,7 +38,7 @@ class AmsGrafana(Script):
 env.set_params(params)
 ams(name='grafana', action=action)
 
-  def start(self, env):
+  def start(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 self.configure(env, action = 'start')
@@ -61,7 +61,7 @@ class AmsGrafana(Script):
 # Create pre-built dashboards
 create_ams_dashboards()
 
-  def stop(self, env):
+  def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 self.configure(env, action = 'stop')

http://git-wip-us.apache.org/repos/asf/ambari/blob/62a0a18c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
index a377f6d..16c7997 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
@@ -35,14 +35,14 @@ class AmsMonitor(Script):
 env.set_params(params)
 ams(name='monitor')
 
-  def start(self, env):
+  def start(self, env, upgrade_type=None):
 self.configure(env) # for security
 
 ams_service( 'monitor',
  action = 'start'
 )
 
-  def stop(self, env):
+  def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 

[2/2] ambari git commit: AMBARI-22242. Express Upgrade from IOP 4.2 to HDP 2.6.2 AMS failed to restart before finalizing. (swagle)

[swagle]

AMBARI-22242. Express Upgrade from IOP 4.2 to HDP 2.6.2 AMS failed to restart 
before finalizing. (swagle)


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

Branch: refs/heads/trunkj
Commit: 62a0a18ce57c7290989ab3ff5ffb08e88225570e
Parents: 6e1cac8
Author: Siddharth Wagle 
Authored: Fri Oct 13 20:55:36 2017 -0700
Committer: Siddharth Wagle 
Committed: Fri Oct 13 20:55:36 2017 -0700

--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py| 4 ++--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py  | 4 ++--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/62a0a18c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
index fc2576d..1c6f2a1 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
@@ -44,13 +44,13 @@ class AmsCollector(Script):
 hbase('regionserver', action)
 ams(name='collector')
 
-  def start(self, env):
+  def start(self, env, upgrade_type=None):
 self.configure(env, action = 'start') # for security
 # stop hanging components before start
 ams_service('collector', action = 'stop')
 ams_service('collector', action = 'start')
 
-  def stop(self, env):
+  def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 # Sometimes, stop() may be called before start(), in case restart() is 
initiated right after installation

http://git-wip-us.apache.org/repos/asf/ambari/blob/62a0a18c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
index 1f0e049..387b018 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
@@ -38,7 +38,7 @@ class AmsGrafana(Script):
 env.set_params(params)
 ams(name='grafana', action=action)
 
-  def start(self, env):
+  def start(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 self.configure(env, action = 'start')
@@ -61,7 +61,7 @@ class AmsGrafana(Script):
 # Create pre-built dashboards
 create_ams_dashboards()
 
-  def stop(self, env):
+  def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 self.configure(env, action = 'stop')

http://git-wip-us.apache.org/repos/asf/ambari/blob/62a0a18c/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
index a377f6d..16c7997 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
@@ -35,14 +35,14 @@ class AmsMonitor(Script):
 env.set_params(params)
 ams(name='monitor')
 
-  def start(self, env):
+  def start(self, env, upgrade_type=None):
 self.configure(env) # for security
 
 ams_service( 'monitor',
  action = 'start'
 )
 
-  def stop(self, env):
+  def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 

[1/2] ambari git commit: AMBARI-22237. Restarting Storm Supervisor from Ambari always fails while Stop and Start works fine. (Arpit Khare, swagle via swagle)

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/trunkj [created] 62a0a18ce


AMBARI-22237. Restarting Storm Supervisor from Ambari always fails while Stop 
and Start works fine. (Arpit Khare, swagle via swagle)


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

Branch: refs/heads/trunkj
Commit: 6e1cac85e33132c93fd843e402e3702ee584b947
Parents: c8c1812
Author: Siddharth Wagle 
Authored: Fri Oct 13 20:55:22 2017 -0700
Committer: Siddharth Wagle 
Committed: Fri Oct 13 20:55:22 2017 -0700

--
 .../STORM/0.9.1/package/scripts/supervisord_service.py  | 1 +
 .../STORM/1.0.1.3.0/package/scripts/supervisord_service.py  | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6e1cac85/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
index 6ff9f9c..498db15 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
@@ -20,6 +20,7 @@ limitations under the License.
 
 from resource_management.core.resources.system import Execute
 from resource_management.libraries.functions.format import format
+from resource_management.core.exceptions import Fail
 
 def supervisord_service(component_name, action):
   Execute(format("supervisorctl {action} storm-{component_name}"),

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e1cac85/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
 
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
index 6ff9f9c..498db15 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
+++ 
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
@@ -20,6 +20,7 @@ limitations under the License.
 
 from resource_management.core.resources.system import Execute
 from resource_management.libraries.functions.format import format
+from resource_management.core.exceptions import Fail
 
 def supervisord_service(component_name, action):
   Execute(format("supervisorctl {action} storm-{component_name}"),

[1/2] ambari git commit: AMBARI-22237. Restarting Storm Supervisor from Ambari always fails while Stop and Start works fine. (Arpit Khare, swagle via swagle)

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/trunk c8c1812b0 -> 62a0a18ce


AMBARI-22237. Restarting Storm Supervisor from Ambari always fails while Stop 
and Start works fine. (Arpit Khare, swagle via swagle)


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

Branch: refs/heads/trunk
Commit: 6e1cac85e33132c93fd843e402e3702ee584b947
Parents: c8c1812
Author: Siddharth Wagle 
Authored: Fri Oct 13 20:55:22 2017 -0700
Committer: Siddharth Wagle 
Committed: Fri Oct 13 20:55:22 2017 -0700

--
 .../STORM/0.9.1/package/scripts/supervisord_service.py  | 1 +
 .../STORM/1.0.1.3.0/package/scripts/supervisord_service.py  | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6e1cac85/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
index 6ff9f9c..498db15 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
@@ -20,6 +20,7 @@ limitations under the License.
 
 from resource_management.core.resources.system import Execute
 from resource_management.libraries.functions.format import format
+from resource_management.core.exceptions import Fail
 
 def supervisord_service(component_name, action):
   Execute(format("supervisorctl {action} storm-{component_name}"),

http://git-wip-us.apache.org/repos/asf/ambari/blob/6e1cac85/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
 
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
index 6ff9f9c..498db15 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
+++ 
b/ambari-server/src/main/resources/common-services/STORM/1.0.1.3.0/package/scripts/supervisord_service.py
@@ -20,6 +20,7 @@ limitations under the License.
 
 from resource_management.core.resources.system import Execute
 from resource_management.libraries.functions.format import format
+from resource_management.core.exceptions import Fail
 
 def supervisord_service(component_name, action):
   Execute(format("supervisorctl {action} storm-{component_name}"),

[2/2] ambari git commit: AMBARI-22242. Express Upgrade from IOP 4.2 to HDP 2.6.2 AMS failed to restart before finalizing. (swagle)

[swagle]

AMBARI-22242. Express Upgrade from IOP 4.2 to HDP 2.6.2 AMS failed to restart 
before finalizing. (swagle)


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

Branch: refs/heads/branch-2.6
Commit: f4c7b61f34ea4b7994396b00fdd2556b261bfb86
Parents: 8ba409b
Author: Siddharth Wagle 
Authored: Fri Oct 13 20:52:22 2017 -0700
Committer: Siddharth Wagle 
Committed: Fri Oct 13 20:52:22 2017 -0700

--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py| 4 ++--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py  | 4 ++--
 .../AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c7b61f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
index 2158e72..8bfd116 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
@@ -44,13 +44,13 @@ class AmsCollector(Script):
 hbase('regionserver', action)
 ams(name='collector')
 
-  def start(self, env):
+  def start(self, env, upgrade_type=None):
 self.configure(env, action = 'start') # for security
 # stop hanging components before start
 ams_service('collector', action = 'stop')
 ams_service('collector', action = 'start')
 
-  def stop(self, env):
+  def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 # Sometimes, stop() may be called before start(), in case restart() is 
initiated right after installation

http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c7b61f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
index b048cd7..7fe168b 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana.py
@@ -38,7 +38,7 @@ class AmsGrafana(Script):
 env.set_params(params)
 ams(name='grafana', action=action)
 
-  def start(self, env):
+  def start(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 self.configure(env, action = 'start')
@@ -61,7 +61,7 @@ class AmsGrafana(Script):
 # Create pre-built dashboards
 create_ams_dashboards()
 
-  def stop(self, env):
+  def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 self.configure(env, action = 'stop')

http://git-wip-us.apache.org/repos/asf/ambari/blob/f4c7b61f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
index b344464..df94836 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
@@ -35,14 +35,14 @@ class AmsMonitor(Script):
 env.set_params(params)
 ams(name='monitor')
 
-  def start(self, env):
+  def start(self, env, upgrade_type=None):
 self.configure(env) # for security
 
 ams_service( 'monitor',
  action = 'start'
 )
 
-  def stop(self, env):
+  def stop(self, env, upgrade_type=None):
 import params
 env.set_params(params)
 

[1/2] ambari git commit: AMBARI-22237. Restarting Storm Supervisor from Ambari always fails while Stop and Start works fine. (Arpit Khare, swagle via swagle)

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 c65c0c3ec -> f4c7b61f3


AMBARI-22237. Restarting Storm Supervisor from Ambari always fails while Stop 
and Start works fine. (Arpit Khare, swagle via swagle)


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

Branch: refs/heads/branch-2.6
Commit: 8ba409b3fd8719e7ec694582c5c04cbce863ee25
Parents: c65c0c3
Author: Siddharth Wagle 
Authored: Fri Oct 13 20:52:10 2017 -0700
Committer: Siddharth Wagle 
Committed: Fri Oct 13 20:52:10 2017 -0700

--
 .../STORM/0.9.1/package/scripts/supervisord_service.py  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8ba409b3/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
index 6ff9f9c..498db15 100644
--- 
a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
+++ 
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/supervisord_service.py
@@ -20,6 +20,7 @@ limitations under the License.
 
 from resource_management.core.resources.system import Execute
 from resource_management.libraries.functions.format import format
+from resource_management.core.exceptions import Fail
 
 def supervisord_service(component_name, action):
   Execute(format("supervisorctl {action} storm-{component_name}"),

ambari git commit: AMBARI-22235. Druid service check failed during EU. (b-slim via nishantmonu51)

[nishant]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 de2145908 -> c65c0c3ec


AMBARI-22235. Druid service check failed during EU. (b-slim via nishantmonu51)


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

Branch: refs/heads/branch-2.6
Commit: c65c0c3ec45afb3e4d05bbc2950b2062b5a5e7ab
Parents: de21459
Author: Nishant 
Authored: Fri Oct 13 22:07:47 2017 +0530
Committer: Nishant 
Committed: Fri Oct 13 22:07:47 2017 +0530

--
 .../stacks/HDP/2.6/services/DRUID/kerberos.json | 45 
 .../HDP/2.6/services/SUPERSET/kerberos.json | 10 +
 2 files changed, 11 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c65c0c3e/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
index 198c351..f186e31 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
@@ -16,7 +16,7 @@
 {
   "name": "druid",
   "principal": {
-"value": "${druid-env/druid_user}@${realm}",
+"value": "${druid-env/druid_user}${principal_suffix}@${realm}",
 "type": "user",
 "configuration": 
"druid-common/druid.hadoop.security.kerberos.principal",
 "local_username": "${druid-env/druid_user}"
@@ -41,49 +41,22 @@
   ],
   "components": [
 {
-  "name": "DRUID_HISTORICAL",
-  "identities": [
-{
-  "name": "druid_druid_historical_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_HISTORICAL"
 },
 {
-  "name": "DRUID_BROKER",
-  "identities": [
-{
-  "name": "druid_druid_broker_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_BROKER"
 },
 {
-  "name": "DRUID_OVERLORD",
-  "identities": [
-{
-  "name": "druid_druid_historical_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_OVERLORD"
 },
 {
-  "name": "DRUID_COORDINATOR",
-  "identities": [
-{
-  "name": "druid_druid_coordinator_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_COORDINATOR"
 },
 {
-  "name": "DRUID_MIDDLEMANAGER",
-  "identities": [
-{
-  "name": "druid_druid_middlemanager_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_MIDDLEMANAGER"
+},
+{
+  "name": "DRUID_ROUTER"
 }
   ],
   "configurations": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/c65c0c3e/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
index 5d5125d..0de6737 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
@@ -6,7 +6,7 @@
 {
   "name": "superset",
   "principal": {
-"value": "${superset-env/superset_user}@${realm}",
+"value": 
"${superset-env/superset_user}${principal_suffix}@${realm}",
 "type": "user",
 "configuration": "superset/KERBEROS_PRINCIPAL",
 "local_username": "${superset-env/superset_user}"
@@ -31,13 +31,7 @@
   ],
   "components": [
 {
-  "name": "SUPERSET",
-  "identities": [
-{
-  "name": "superset_superset_superset",
-  "reference": "/superset"
-}
-  ]
+  "name": "SUPERSET"
 }
   ],
   "configurations": [

ambari git commit: AMBARI-22235. Druid service check failed during EU. (b-slim via nishantmonu51)

[nishant]

Repository: ambari
Updated Branches:
  refs/heads/trunk 20faae7a3 -> c8c1812b0


AMBARI-22235. Druid service check failed during EU. (b-slim via nishantmonu51)


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

Branch: refs/heads/trunk
Commit: c8c1812b07ba0f64093190519cf829df8ea639d0
Parents: 20faae7
Author: Nishant 
Authored: Fri Oct 13 22:06:41 2017 +0530
Committer: Nishant 
Committed: Fri Oct 13 22:06:41 2017 +0530

--
 .../stacks/HDP/2.6/services/DRUID/kerberos.json | 45 
 .../HDP/2.6/services/SUPERSET/kerberos.json | 10 +
 2 files changed, 11 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c8c1812b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
index 198c351..f186e31 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
@@ -16,7 +16,7 @@
 {
   "name": "druid",
   "principal": {
-"value": "${druid-env/druid_user}@${realm}",
+"value": "${druid-env/druid_user}${principal_suffix}@${realm}",
 "type": "user",
 "configuration": 
"druid-common/druid.hadoop.security.kerberos.principal",
 "local_username": "${druid-env/druid_user}"
@@ -41,49 +41,22 @@
   ],
   "components": [
 {
-  "name": "DRUID_HISTORICAL",
-  "identities": [
-{
-  "name": "druid_druid_historical_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_HISTORICAL"
 },
 {
-  "name": "DRUID_BROKER",
-  "identities": [
-{
-  "name": "druid_druid_broker_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_BROKER"
 },
 {
-  "name": "DRUID_OVERLORD",
-  "identities": [
-{
-  "name": "druid_druid_historical_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_OVERLORD"
 },
 {
-  "name": "DRUID_COORDINATOR",
-  "identities": [
-{
-  "name": "druid_druid_coordinator_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_COORDINATOR"
 },
 {
-  "name": "DRUID_MIDDLEMANAGER",
-  "identities": [
-{
-  "name": "druid_druid_middlemanager_druid",
-  "reference": "/druid"
-}
-  ]
+  "name": "DRUID_MIDDLEMANAGER"
+},
+{
+  "name": "DRUID_ROUTER"
 }
   ],
   "configurations": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/c8c1812b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
index 5d5125d..0de6737 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
@@ -6,7 +6,7 @@
 {
   "name": "superset",
   "principal": {
-"value": "${superset-env/superset_user}@${realm}",
+"value": 
"${superset-env/superset_user}${principal_suffix}@${realm}",
 "type": "user",
 "configuration": "superset/KERBEROS_PRINCIPAL",
 "local_username": "${superset-env/superset_user}"
@@ -31,13 +31,7 @@
   ],
   "components": [
 {
-  "name": "SUPERSET",
-  "identities": [
-{
-  "name": "superset_superset_superset",
-  "reference": "/superset"
-}
-  ]
+  "name": "SUPERSET"
 }
   ],
   "configurations": [

[19/33] ambari git commit: AMBARI-21307 Added the supported ldap properties to the code. Refactored existing code relying on these properties

[lpuskas]

AMBARI-21307 Added the supported ldap properties to the code. Refactored 
existing code relying on these properties


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 3800adf622800844803b5b12b92324994ddee748
Parents: 12be829
Author: lpuskas 
Authored: Fri Sep 8 13:57:25 2017 +0300
Committer: lpuskas 
Committed: Fri Oct 13 17:20:51 2017 +0200

--
 .../server/ldap/AmbariLdapConfiguration.java| 189 ---
 .../AmbariLdapConfigurationProvider.java|   6 +-
 .../server/ldap/service/AmbariLdapFacade.java   |  10 +-
 .../service/LdapAttributeDetectionService.java  |  43 +
 .../ambari/server/ldap/service/LdapFacade.java  |   2 +-
 .../ads/DefaultAttributeDetectionService.java   |  47 +
 .../ads/DefaultLdapConfigurationService.java|   4 +-
 .../ads/DefaultLdapConnectionService.java   |   4 +-
 .../DefaultAttributeDetectionServiceTest.java   | 102 ++
 .../DefaultLdapConfigurationServiceTest.java|  30 ++-
 10 files changed, 348 insertions(+), 89 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3800adf6/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
index e913e77..76faeed 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
@@ -34,63 +34,67 @@ public class AmbariLdapConfiguration {
   /**
* Constants representing supported LDAP related property names
*/
-  public enum LdapConfigProperty {
-LDAP_CONFIGURED("ambari.ldap.configured"),
-AUTOMATIC_ATTRIBUTE_DETECTION("ambari.ldap.automatic.attribute.detection"),
-USE_SSL("ambari.ldap.usessl"),
-LDAP_SERVER_HOST("ambari.ldap.server.host"),
-LDAP_SERVER_PORT("ambari.ldap.server.port"),
-LDAP_TRUSTSTORE("ambari.ldap.truststore"),
-LDAP_TRUSTSTORE_TYPE("ambari.ldap.truststore.type"),
-LDAP_TRUSTSTORE_PATH("ambari.ldap.truststore.path"),
-LDAP_TRUSTSTORE_PASSWORD("ambari.ldap.truststore.password"),
-BASE_DN("ambari.ldap.bind.dn"),
-REFERRAL("ambari.ldap.referral"),
-PAGINATION_ENABLED("ambari.ldap.pagination.enabled"),
-
-BIND_ANONIMOUSLY("ambari.ldap.bindanonymously"),
-MANAGER_DN("ambari.ldap.managerdn"),
-MANAGER_PASSWORD("ambari.ldap.managerpassword"),
-USER_OBJECT_CLASS("ambari.ldap.user.object.class"),
-USER_NAME_ATTRIBUTE("ambari.ldap.user.name.attribute"),
-USER_NAME_FORCE_LOWERCASE("ambari.ldap.username.force.lowercase"),
-USER_SEARCH_BASE("ambari.ldap.user.search.base"),
-
SYNC_USER_MEMBER_REPLACE_PATTERN("ambari.ldap.sync.user.member.replacepattern"),
-SYNC_USER_MEMBER_FILTER("ambari.ldap.sync.user.member_filter"),
-
-ADMIN_GROUP_MAPPING_RULES ("ambari.ldap.admin.group.mappingrules"),
-GROUP_OBJECT_CLASS("ambari.ldap.group.object.class"),
-GROUP_NAME_ATTRIBUTE("ambari.ldap.group.name.attribute"),
-GROUP_MEMBER_ATTRIBUTE("ambari.ldap.group.member.attribute"),
-GROUP_SEARCH_BASE("ambari.ldap.group.search.base"),
-
SYNC_GROUP_MEMBER_REPLACE_PATTERN("ambari.ldap.sync.group.member.replacepattern"),
-SYNC_GROUP_MEMBER_FILTER("ambari.ldap.sync.group.member_filter"),
-DN_ATTRIBUTE("authentication.ldap.dnAttribute"),
-
-TEST_USER_NAME("ambari.ldap.test.user.name"),
-TEST_USER_PASSWORD("ambari.ldap.test.user.password");
+  public enum AmbariLdapConfig {
+
+LDAP_ENABLED("ambari.ldap.authentication.enabled"),
+SERVER_HOST("ambari.ldap.connectivity.server.host"),
+SERVER_PORT("ambari.ldap.connectivity.server.port"),
+USE_SSL("ambari.ldap.connectivity.use_ssl"),
+
+TRUST_STORE("ambari.ldap.connectivity.trust_store"),
+TRUST_STORE_TYPE("ambari.ldap.connectivity.trust_store.type"),
+TRUST_STORE_PATH("ambari.ldap.connectivity.trust_store.path"),
+TRUST_STORE_PASSWORD("ambari.ldap.connectivity.trust_store.password"),
+ANONYMOUS_BIND("ambari.ldap.connectivity.anonymous_bind"),
+
+BIND_DN("ambari.ldap.connectivity.bind_dn"),
+BIND_PASSWORD("ambari.ldap.connectivity.bind_password"),
+
+ATTR_DETECTION("ambari.ldap.attributes.detection"), // manual | auto
+
+DN_ATTRIBUTE("ambari.ldap.attributes.dn_attr"),
+
+

[33/33] ambari git commit: AMBARI-21307 Added unit tests. Improved logging, refactoring: rename, organized classes into packages

[lpuskas]

AMBARI-21307 Added unit tests. Improved logging, refactoring: rename, organized 
classes into packages


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d623a21fe6689bdd57c76dae70462d3f92903e0d
Parents: 36a49d1
Author: lpuskas 
Authored: Fri Oct 13 17:19:41 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:53:38 2017 +0200

--
 .../apache/ambari/server/ldap/LdapModule.java   |   2 +-
 .../AmbariLdapConfigurationProvider.java|  13 +-
 .../server/ldap/service/AmbariLdapFacade.java   |   2 +-
 .../service/LdapConnectionConfigService.java|   4 +-
 .../ads/DefaultLdapConfigurationService.java|  38 +++-
 .../ads/DefaultLdapConnectionConfigService.java | 116 ++
 .../DefaultLdapConnectionConfigService.java | 116 --
 .../server/ldap/LdapModuleFunctionalTest.java   |   4 +-
 ...estAmbariAmbariLdapConfigurationFactory.java |  29 ---
 .../TestAmbariLdapConfigurationFactory.java |  29 +++
 .../ldap/service/AmbariLdapFacadeTest.java  |   4 +-
 .../DefaultLdapConfigurationServiceTest.java| 221 +++
 12 files changed, 414 insertions(+), 164 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d623a21f/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java
index 4abf4e7..67e84dc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java
@@ -25,7 +25,7 @@ import 
org.apache.ambari.server.ldap.service.LdapConnectionConfigService;
 import org.apache.ambari.server.ldap.service.LdapFacade;
 import 
org.apache.ambari.server.ldap.service.ads.DefaultLdapAttributeDetectionService;
 import 
org.apache.ambari.server.ldap.service.ads.DefaultLdapConfigurationService;
-import 
org.apache.ambari.server.ldap.service.ads.detectors.DefaultLdapConnectionConfigService;
+import 
org.apache.ambari.server.ldap.service.ads.DefaultLdapConnectionConfigService;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.assistedinject.FactoryModuleBuilder;

http://git-wip-us.apache.org/repos/asf/ambari/blob/d623a21f/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapConfigurationProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapConfigurationProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapConfigurationProvider.java
index 9fad896..c88d420 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapConfigurationProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapConfigurationProvider.java
@@ -36,7 +36,8 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
 /**
- * Provider implementation for LDAP configurations. It needs to be registered 
in the related GUICE module as a provider
+ * Provider implementation for LDAP configurations.
+ * It needs to be registered in the related GUICE module as a provider.
  * It's responsible for managing LDAP configurations in the application.
  * Whenever requested, this provider returns an AmbariLdapConfiguration which 
is always in sync with the persisted LDAP
  * configuration resource.
@@ -85,15 +86,15 @@ public class AmbariLdapConfigurationProvider implements 
Providerhttp://git-wip-us.apache.org/repos/asf/ambari/blob/d623a21f/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
index bbfbc8e..0118840 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
@@ -33,7 +33,7 @@ public class AmbariLdapFacade implements LdapFacade {
   /**
* Additional parameters expected to be provided along with the configuration
*/
-  protected enum Parameters {
+  public enum Parameters {
 

[26/33] ambari git commit: AMBARI-21307 added javadocs, organized and cleaned the code

[lpuskas]

AMBARI-21307 added javadocs, organized and cleaned the code


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: a15c4e5fa8fea4c2c8f3962e191d84a1e7a1bfcd
Parents: dd99009
Author: lpuskas 
Authored: Wed Sep 13 15:27:39 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:52 2017 +0200

--
 .../server/ldap/LdapConfigurationFactory.java   |  13 +
 .../server/ldap/LdapConfigurationService.java   |  60 -
 .../apache/ambari/server/ldap/LdapModule.java   |   6 +-
 .../server/ldap/service/AmbariLdapFacade.java   |   9 +-
 .../server/ldap/service/AttributeDetector.java  |   3 +-
 .../ldap/service/LdapConfigurationService.java  |  60 +
 .../ambari/server/ldap/service/LdapFacade.java  |  10 +-
 .../ads/DefaultAttributeDetectionService.java   | 238 ---
 .../DefaultLdapAttributeDetectionService.java   | 238 +++
 .../ads/DefaultLdapConfigurationService.java|  17 +-
 .../detectors/UserGroupMemberAttrDetector.java  |   1 -
 .../DefaultAttributeDetectionServiceTest.java   | 108 -
 ...efaultLdapAttributeDetectionServiceTest.java | 108 +
 .../DefaultLdapConfigurationServiceTest.java|   2 +-
 14 files changed, 453 insertions(+), 420 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a15c4e5f/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationFactory.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationFactory.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationFactory.java
index 57cdf6e..67ac092 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationFactory.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationFactory.java
@@ -16,6 +16,19 @@ package org.apache.ambari.server.ldap;
 
 import java.util.Map;
 
+/**
+ * Factory interface for AmbariLdapConfiguration instances.
+ * It's registered as a factory in the GUICE context ( so no implementations 
required)
+ *
+ * To be extended with other factory methods upon needs.
+ */
 public interface LdapConfigurationFactory {
+
+  /**
+   * Creates an AmbariLdapConfiguration instance with the provided map of 
configuration settings.
+   *
+   * @param configuration a map where keys are the configuration properties 
and values are the configuration values
+   * @return an AmbariLdapConfiguration instance
+   */
   AmbariLdapConfiguration createLdapConfiguration(Map 
configuration);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/a15c4e5f/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationService.java
deleted file mode 100644
index 69a641f..000
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapConfigurationService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.ldap;
-
-import java.util.Set;
-
-import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.ldap.service.AmbariLdapException;
-import org.apache.directory.ldap.client.api.LdapConnection;
-
-/**
- * Collection of operations for validating ldap configuration.
- * It's intended to decouple implementations using different libraries.
- */
-public interface LdapConfigurationService {
-
-  /**
-   * Tests the connection based on the provided configuration.
-   *
-   * @param ldapConnection connection instance
-   * @param configuration  the ambari ldap configuration instance
-   * @throws AmbariLdapException if the connection is not possible
-   */
-  void checkConnection(LdapConnection ldapConnection, 

[14/33] ambari git commit: AMBARI-21307 Add all known LDAP properties to AmbariConfigurationEnum (benyoka)

[lpuskas]

AMBARI-21307 Add all known LDAP properties to AmbariConfigurationEnum (benyoka)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 12be829194706b75404bb1ffd37e1c6d74740672
Parents: a5397e2
Author: Balazs Bence Sari 
Authored: Mon Sep 4 12:45:07 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:50 2017 +0200

--
 .../ambari/server/ldap/AmbariLdapConfiguration.java  | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/12be8291/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
index b1cbced..e913e77 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
@@ -40,22 +40,35 @@ public class AmbariLdapConfiguration {
 USE_SSL("ambari.ldap.usessl"),
 LDAP_SERVER_HOST("ambari.ldap.server.host"),
 LDAP_SERVER_PORT("ambari.ldap.server.port"),
+LDAP_TRUSTSTORE("ambari.ldap.truststore"),
 LDAP_TRUSTSTORE_TYPE("ambari.ldap.truststore.type"),
 LDAP_TRUSTSTORE_PATH("ambari.ldap.truststore.path"),
+LDAP_TRUSTSTORE_PASSWORD("ambari.ldap.truststore.password"),
 BASE_DN("ambari.ldap.bind.dn"),
+REFERRAL("ambari.ldap.referral"),
+PAGINATION_ENABLED("ambari.ldap.pagination.enabled"),
 
 BIND_ANONIMOUSLY("ambari.ldap.bindanonymously"),
 MANAGER_DN("ambari.ldap.managerdn"),
 MANAGER_PASSWORD("ambari.ldap.managerpassword"),
 USER_OBJECT_CLASS("ambari.ldap.user.object.class"),
 USER_NAME_ATTRIBUTE("ambari.ldap.user.name.attribute"),
+USER_NAME_FORCE_LOWERCASE("ambari.ldap.username.force.lowercase"),
 USER_SEARCH_BASE("ambari.ldap.user.search.base"),
+
SYNC_USER_MEMBER_REPLACE_PATTERN("ambari.ldap.sync.user.member.replacepattern"),
+SYNC_USER_MEMBER_FILTER("ambari.ldap.sync.user.member_filter"),
 
+ADMIN_GROUP_MAPPING_RULES ("ambari.ldap.admin.group.mappingrules"),
 GROUP_OBJECT_CLASS("ambari.ldap.group.object.class"),
 GROUP_NAME_ATTRIBUTE("ambari.ldap.group.name.attribute"),
 GROUP_MEMBER_ATTRIBUTE("ambari.ldap.group.member.attribute"),
 GROUP_SEARCH_BASE("ambari.ldap.group.search.base"),
-DN_ATTRIBUTE("authentication.ldap.dnAttribute");
+
SYNC_GROUP_MEMBER_REPLACE_PATTERN("ambari.ldap.sync.group.member.replacepattern"),
+SYNC_GROUP_MEMBER_FILTER("ambari.ldap.sync.group.member_filter"),
+DN_ATTRIBUTE("authentication.ldap.dnAttribute"),
+
+TEST_USER_NAME("ambari.ldap.test.user.name"),
+TEST_USER_PASSWORD("ambari.ldap.test.user.password");
 
 private String propertyName;
 

[21/33] ambari git commit: AMBARI-2130 ldap connections handled in thefacade. Code cleanup

[lpuskas]

AMBARI-2130 ldap connections handled in thefacade. Code cleanup


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 0467801fec1e17ec2123ef9586674cf4a6009520
Parents: 14ec2ae
Author: lpuskas 
Authored: Tue Sep 12 15:38:25 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:51 2017 +0200

--
 .../server/ldap/service/AmbariLdapFacade.java   | 51 +
 .../ldap/service/LdapConnectionService.java | 12 ++-
 .../ambari/server/ldap/service/LdapFacade.java  |  2 +-
 .../ads/DefaultLdapConfigurationService.java| 77 
 .../ads/DefaultLdapConnectionService.java   | 41 ++-
 .../OccurranceAndWeightBasedDetector.java   |  2 +-
 6 files changed, 103 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0467801f/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
index f159418..d2bdef3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
@@ -19,7 +19,6 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import org.apache.ambari.server.ldap.AmbariLdapConfiguration;
@@ -58,35 +57,59 @@ public class AmbariLdapFacade implements LdapFacade {
   @Inject
   private LdapAttributeDetectionService ldapAttributeDetectionService;
 
-  //todo remove this, added for testing purposes only
-  @Inject
-  private Provider ambariLdapConfigurationProvider;
-
   @Inject
   public AmbariLdapFacade() {
   }
 
   @Override
   public void checkConnection(AmbariLdapConfiguration ambariLdapConfiguration) 
throws AmbariLdapException {
+LdapConnection connection = null;
 try {
+
   LOGGER.info("Validating LDAP connection related configuration based on: 
{}", ambariLdapConfiguration);
-  LdapConnection connection = 
ldapConnectionService.createLdapConnection(ambariLdapConfiguration);
+  connection = 
ldapConnectionService.getBoundLdapConnection(ambariLdapConfiguration);
   ldapConfigurationService.checkConnection(connection, 
ambariLdapConfiguration);
-} catch (AmbariLdapException e) {
+  LOGGER.info("Validating LDAP connection related configuration: SUCCESS");
+
+} catch (Exception e) {
+
   LOGGER.error("Validating LDAP connection configuration failed", e);
-  throw e;
+  throw new AmbariLdapException(e);
+
+} finally {
+  try {
+connection.unBind();
+connection.close();
+  } catch (Exception e) {
+throw new AmbariLdapException(e);
+  }
 }
-LOGGER.info("Validating LDAP connection related configuration: SUCCESS");
+
   }
 
 
   @Override
-  public AmbariLdapConfiguration detectAttributes(AmbariLdapConfiguration 
ambariLdapConfiguration) {
+  public AmbariLdapConfiguration detectAttributes(AmbariLdapConfiguration 
ambariLdapConfiguration) throws AmbariLdapException {
 LOGGER.info("Detecting LDAP configuration attributes ...");
 
-LdapConnection connection = 
ldapConnectionService.createLdapConnection(ambariLdapConfiguration);
-ambariLdapConfiguration = 
ldapAttributeDetectionService.detectLdapUserAttributes(connection, 
ambariLdapConfiguration);
-return ambariLdapConfiguration;
+LdapConnection connection = 
ldapConnectionService.getBoundLdapConnection(ambariLdapConfiguration);
+try {
+
+  ambariLdapConfiguration = 
ldapAttributeDetectionService.detectLdapUserAttributes(connection, 
ambariLdapConfiguration);
+  ambariLdapConfiguration = 
ldapAttributeDetectionService.detectLdapGroupAttributes(connection, 
ambariLdapConfiguration);
+  return ambariLdapConfiguration;
+
+} catch (Exception e) {
+  LOGGER.error("Error during LDAP attribute detection", e);
+  throw new AmbariLdapException(e);
+} finally {
+  try {
+connection.unBind();
+connection.close();
+  } catch (Exception e) {
+throw new AmbariLdapException(e);
+  }
+}
   }
 
   @Override
@@ -98,7 +121,7 @@ public class AmbariLdapFacade implements LdapFacade {
   throw new IllegalArgumentException("No test user available for testing 
LDAP attributes");
 }
 

[22/33] ambari git commit: AMBARI-21307 implemented user attribute detection. Organized code

[lpuskas]

AMBARI-21307 implemented user attribute detection. Organized code


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d0e543cf7f244e89b2b220c23c21351d9d27f6c3
Parents: 3800adf
Author: lpuskas 
Authored: Tue Sep 12 08:10:47 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:51 2017 +0200

--
 .../services/ldap/LdapConfigurationService.java |   2 +-
 .../server/ldap/AmbariLdapConfiguration.java|   9 ++
 .../server/ldap/service/AmbariLdapFacade.java   |   2 +-
 .../server/ldap/service/AttributeDetector.java  |  38 ++
 .../service/LdapAttributeDetectionService.java  |   7 +-
 .../ambari/server/ldap/service/LdapFacade.java  |   2 +-
 .../server/ldap/service/LdapSearchService.java  |  18 ---
 .../ads/DefaultAttributeDetectionService.java   | 132 ++-
 .../ads/DefaultLdapConfigurationService.java|   2 +-
 .../ldap/service/ads/ObjectClassDetector.java   |  81 
 .../ads/OccurranceAndWeightBasedDetector.java   |  81 
 .../service/ads/UserNameAttributeDetector.java  |  75 +++
 .../DefaultAttributeDetectionServiceTest.java   |  35 ++---
 13 files changed, 440 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d0e543cf/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
index 1b8427b..66809c3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
@@ -107,7 +107,7 @@ public class LdapConfigurationService extends 
AmbariConfigurationService {
 case TEST_ATTRIBUTES:
 
   LOGGER.info("Testing LDAP attributes ");
-  groups = 
ldapFacade.checkLdapAttibutes(ldapConfigurationRequest.getRequestInfo().getParameters(),
 ambariLdapConfiguration);
+  groups = 
ldapFacade.checkLdapAttributes(ldapConfigurationRequest.getRequestInfo().getParameters(),
 ambariLdapConfiguration);
   setResult(groups, result);
 
   break;

http://git-wip-us.apache.org/repos/asf/ambari/blob/d0e543cf/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
index 76faeed..e28c6ed 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
@@ -98,6 +98,10 @@ public class AmbariLdapConfiguration {
 return value;
   }
 
+  public void setValueFor(AmbariLdapConfig ambariLdapConfig, Object value) {
+configurationMap.put(ambariLdapConfig.key(), value);
+  }
+
   @Inject
   public AmbariLdapConfiguration(@Assisted Map configuration) {
 this.configurationMap = configuration;
@@ -219,4 +223,9 @@ public class AmbariLdapConfiguration {
 return (String) configValue(AmbariLdapConfig.REFERRAL_HANDLING);
   }
 
+
+  @Override
+  public String toString() {
+return configurationMap.toString();
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/d0e543cf/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
index 16bf6b7..f159418 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
@@ -90,7 +90,7 @@ public class AmbariLdapFacade implements LdapFacade {
   }
 
   @Override
-  public Set checkLdapAttibutes(Map parameters, 
AmbariLdapConfiguration ldapConfiguration) throws AmbariLdapException {
+  public Set checkLdapAttributes(Map parameters, 

[07/33] ambari git commit: Added swagger annotations to the new endpoint

[lpuskas]

Added swagger annotations to the new endpoint


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 53b46279fd9f1a2fff59d9471174a9ee9fc72a35
Parents: 4d2425b
Author: Balázs Bence Sári 
Authored: Thu Jul 6 18:36:18 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:48 2017 +0200

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


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

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

[03/33] ambari git commit: AMBARI-22230 Hosts and Alerts tables UI tweaks. (atkach)

[lpuskas]

AMBARI-22230 Hosts and Alerts tables UI tweaks. (atkach)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 8f53bc453c47a4f95d5e58825feb77d69e6a6a22
Parents: a8ba5e6
Author: Andrii Tkach 
Authored: Fri Oct 13 13:45:06 2017 +0300
Committer: Andrii Tkach 
Committed: Fri Oct 13 13:45:06 2017 +0300

--
 ambari-web/app/models/alerts/alert_group.js |   2 +-
 ambari-web/app/styles/application.less  |   5 +
 ambari-web/app/styles/dashboard.less|   6 +-
 .../app/styles/theme/bootstrap-ambari.css   |   3 +-
 ambari-web/app/templates/main/alerts.hbs|   3 +-
 .../main/alerts/alert_definitions_actions.hbs   |   2 +-
 ambari-web/app/templates/main/dashboard.hbs |   2 +-
 .../templates/main/dashboard/config_history.hbs |   2 +-
 ambari-web/app/templates/main/host.hbs  |   2 +-
 .../templates/main/host/bulk_operation_menu.hbs | 132 ++-
 .../views/main/host/hosts_table_menu_view.js|   4 +-
 .../app/views/main/host/stack_versions_view.js  |   2 +-
 .../test/models/alerts/alert_group_test.js  |   5 +-
 13 files changed, 93 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/models/alerts/alert_group.js
--
diff --git a/ambari-web/app/models/alerts/alert_group.js 
b/ambari-web/app/models/alerts/alert_group.js
index 49a850f..3277fc8 100644
--- a/ambari-web/app/models/alerts/alert_group.js
+++ b/ambari-web/app/models/alerts/alert_group.js
@@ -55,7 +55,7 @@ App.AlertGroup = DS.Model.extend({
* @type {string}
*/
   displayName: function () {
-var name = App.config.truncateGroupName(this.get('name'));
+var name = App.config.truncateGroupName(App.format.role(this.get('name'), 
true));
 return this.get('default') ? name + ' Default' : name;
   }.property('name', 'default'),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 7c9cc8e..099f3cf 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2802,4 +2802,9 @@ a.abort-icon:hover {
 .breadcrumbs-forward-slash {
   display: inline;
   color: #D2D3D5;
+}
+
+.container-wrap-table {
+  padding: 0 10px;
+  background-color: @diff-background-equal;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/dashboard.less
--
diff --git a/ambari-web/app/styles/dashboard.less 
b/ambari-web/app/styles/dashboard.less
index 02835bd..6deb30c 100644
--- a/ambari-web/app/styles/dashboard.less
+++ b/ambari-web/app/styles/dashboard.less
@@ -18,14 +18,12 @@
 
 @import 'common.less';
 
-#dashboard-widgets-container{
-  .tabs-left {
-float: left;
-  }
+#dashboard-widgets-container {
   .btn-toolbar {
 float: right;
 padding-top: 5px;
 margin-bottom: 20px;
+margin-top: -60px;
   }
   .dashboard-widgets-box {
 clear: both;

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/theme/bootstrap-ambari.css
--
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css 
b/ambari-web/app/styles/theme/bootstrap-ambari.css
index 70579e7..cff73ad 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -479,11 +479,12 @@ h2.table-title {
 }
 .nav.nav-tabs li a .badge.badge-important {
   display: inline;
+  vertical-align: baseline;
 }
 .nav.nav-tabs li.active a {
   color: #333;
   border-bottom: 3px solid #3FAE2A;
-  padding-bottom: 1px;
+  padding-bottom: 2px;
 }
 .nav-tabs-left li,
 .nav-tabs-right li {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/templates/main/alerts.hbs
--
diff --git a/ambari-web/app/templates/main/alerts.hbs 
b/ambari-web/app/templates/main/alerts.hbs
index 40469d3..0f85e27 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-
+
   
 {{t menu.item.alerts}}
 
@@ -56,7 +56,6 @@
   {{view App.AlertDefinitionSummary 
contentBinding="alertDefinition"}}

[28/33] ambari git commit: AMBARI-21307 Refactor - using the LdapConnectionTemplate for ldap operations

[lpuskas]

AMBARI-21307 Refactor - using the LdapConnectionTemplate for ldap operations


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 1ecd85c4da518a0c59735f8a8d30f245a69bcae9
Parents: b8128f0
Author: lpuskas 
Authored: Wed Oct 4 15:54:34 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:52 2017 +0200

--
 .../services/ldap/LdapConfigurationService.java |   6 +-
 .../server/controller/ControllerModule.java |   2 +-
 .../apache/ambari/server/ldap/LdapModule.java   |  12 +-
 .../domain/AmbariLdapConfigurationFactory.java  |  34 +
 .../ldap/domain/LdapConfigurationFactory.java   |  34 -
 .../AmbariLdapConfigurationProvider.java|   5 +-
 .../server/ldap/service/AmbariLdapFacade.java   |  36 +
 .../server/ldap/service/AttributeDetector.java  |   2 +-
 .../service/LdapAttributeDetectionService.java  |   8 +-
 .../ldap/service/LdapConfigurationService.java  |  22 +--
 .../ldap/service/LdapConnectionService.java |  43 --
 .../service/LdapConnectionTemplateProvider.java |  56 
 .../DefaultLdapAttributeDetectionService.java   | 129 ++---
 .../ads/DefaultLdapConfigurationService.java| 110 +++---
 .../ads/DefaultLdapConnectionService.java   |  86 ---
 .../ads/LdapConnectionTemplateFactory.java  |  95 
 .../ads/detectors/GroupMemberAttrDetector.java  |   4 +-
 .../ads/detectors/GroupNameAttrDetector.java|   4 +-
 .../ads/detectors/GroupObjectClassDetector.java |   4 +-
 .../OccurranceAndWeightBasedDetector.java   | 103 -
 .../OccurrenceAndWeightBasedDetector.java   | 103 +
 .../detectors/UserGroupMemberAttrDetector.java  |   4 +-
 .../ads/detectors/UserNameAttrDetector.java |   4 +-
 .../ads/detectors/UserObjectClassDetector.java  |   4 +-
 .../server/ldap/LdapModuleFunctionalTest.java   | 143 +++
 .../domain/AmbariLdapConfigurationTest.java |  19 ---
 ...estAmbariAmbariLdapConfigurationFactory.java |  29 
 .../TestAmbariLdapConfigurationFactory.java |  29 
 ...efaultLdapAttributeDetectionServiceTest.java | 112 ---
 .../DefaultLdapConfigurationServiceTest.java| 129 -
 30 files changed, 601 insertions(+), 770 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1ecd85c4/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
index ff95066..13f8835 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
@@ -47,7 +47,7 @@ import org.apache.ambari.server.api.services.ResultStatus;
 import org.apache.ambari.server.controller.internal.ResourceImpl;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.ldap.domain.AmbariLdapConfiguration;
-import org.apache.ambari.server.ldap.domain.LdapConfigurationFactory;
+import org.apache.ambari.server.ldap.domain.AmbariLdapConfigurationFactory;
 import org.apache.ambari.server.ldap.service.LdapFacade;
 import org.apache.ambari.server.security.authorization.AuthorizationException;
 import org.apache.ambari.server.security.authorization.AuthorizationHelper;
@@ -72,7 +72,7 @@ public class LdapConfigurationService extends 
AmbariConfigurationService {
   private static LdapFacade ldapFacade;
 
   @Inject
-  private static LdapConfigurationFactory ldapConfigurationFactory;
+  private static AmbariLdapConfigurationFactory ambariLdapConfigurationFactory;
 
 
   @POST
@@ -93,7 +93,7 @@ public class LdapConfigurationService extends 
AmbariConfigurationService {
 
   validateRequest(ldapConfigurationRequest);
 
-  AmbariLdapConfiguration ambariLdapConfiguration = 
ldapConfigurationFactory.createLdapConfiguration(
+  AmbariLdapConfiguration ambariLdapConfiguration = 
ambariLdapConfigurationFactory.createLdapConfiguration(
 
ldapConfigurationRequest.getAmbariConfiguration().getData().iterator().next());
 
   LdapConfigOperation action = 
LdapConfigOperation.fromAction(ldapConfigurationRequest.getRequestInfo().getAction());

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 4d2425b5e9203d1bec7c2715110dba102cf8836b
Parents: 4735052
Author: lpuskas 
Authored: Thu Jul 6 18:15:18 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:48 2017 +0200

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


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

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

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 5b7c55f6c0ab42b7e3f5b513bd40934b2cfb6ad9
Parents: e87ca3c
Author: lpuskas 
Authored: Mon Aug 14 13:21:07 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:50 2017 +0200

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


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

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

[27/33] ambari git commit: AMBARI-21307 Refactor - using the LdapConnectionTemplate for ldap operations

[lpuskas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ecd85c4/ambari-server/src/test/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionServiceTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionServiceTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionServiceTest.java
deleted file mode 100644
index 878d1f0..000
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapAttributeDetectionServiceTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ambari.server.ldap.service.ads;
-
-
-import java.util.Map;
-
-import org.apache.ambari.server.ldap.domain.AmbariLdapConfigKeys;
-import org.apache.ambari.server.ldap.domain.AmbariLdapConfiguration;
-import org.apache.ambari.server.ldap.domain.TestAmbariLdapConfigurationFactory;
-import org.apache.ambari.server.ldap.service.LdapConnectionService;
-import org.apache.directory.api.ldap.model.constants.SchemaConstants;
-import org.apache.directory.ldap.client.api.LdapConnection;
-import org.easymock.EasyMockRule;
-import org.easymock.TestSubject;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Maps;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-public class DefaultLdapAttributeDetectionServiceTest {
-
-  private static final Logger LOGGER = 
LoggerFactory.getLogger(DefaultLdapAttributeDetectionServiceTest.class);
-
-  @Rule
-  public EasyMockRule mocks = new EasyMockRule(this);
-
-  private AmbariLdapConfiguration testLdapConfiguration;
-  private TestAmbariLdapConfigurationFactory ldapConfigurationFactory = new 
TestAmbariLdapConfigurationFactory();
-
-  private LdapConnection connection;
-
-  @TestSubject
-  private DefaultLdapAttributeDetectionService attributeDetectionService = new 
DefaultLdapAttributeDetectionService();
-
-  @Before
-  public void before() {
-
-Map initialProps = Maps.newHashMap();
-initialProps.put(AmbariLdapConfigKeys.BIND_DN.key(), "");
-testLdapConfiguration = 
ldapConfigurationFactory.createLdapConfiguration(initialProps);
-  }
-
-  @Test
-  public void 
testShouldUserNameAttributeBeDetectedWhenSearchReturnsValidUsers() throws 
Exception {
-// GIVEN
-// a set of entries returned from the LDAP search
-
-// WHEN
-AmbariLdapConfiguration ambariLdapConfiguration = 
attributeDetectionService.detectLdapUserAttributes(connection, 
testLdapConfiguration);
-
-// THEN
-Assert.assertNotNull(ambariLdapConfiguration);
-Assert.assertEquals("The username attribute is not the expected", "uid", 
ambariLdapConfiguration.userNameAttribute());
-
-  }
-
-
-  @Test
-  public void functionalTest() throws Exception {
-// GIVEN
-AmbariLdapConfiguration ambariLdapConfiguration = 
ldapConfigurationFactory.createLdapConfiguration(getTestPropertiesMap());
-LdapConnectionService connectionService = new 
DefaultLdapConnectionService();
-LdapConnection ldapConnection = 
connectionService.createLdapConnection(ambariLdapConfiguration);
-
-// WHEN
-AmbariLdapConfiguration config = 
attributeDetectionService.detectLdapUserAttributes(ldapConnection, 
ambariLdapConfiguration);
-config = 
attributeDetectionService.detectLdapGroupAttributes(ldapConnection, 
ambariLdapConfiguration);
-
-Gson gson = new GsonBuilder().create();
-LOGGER.info(gson.toJson(config));
-
-// THEN
-ldapConnection.close();
-
-  }
-
-  private Map getTestPropertiesMap() {
-Map ldapPropsMap = Maps.newHashMap();
-
-ldapPropsMap.put(AmbariLdapConfigKeys.ANONYMOUS_BIND.key(), "true");
-ldapPropsMap.put(AmbariLdapConfigKeys.SERVER_HOST.key(), 
"ldap.forumsys.com");
-ldapPropsMap.put(AmbariLdapConfigKeys.SERVER_PORT.key(), "389");
-ldapPropsMap.put(AmbariLdapConfigKeys.BIND_DN.key(), 
"cn=read-only-admin,dc=example,dc=com");
-ldapPropsMap.put(AmbariLdapConfigKeys.BIND_PASSWORD.key(), "password");
-ldapPropsMap.put(AmbariLdapConfigKeys.DN_ATTRIBUTE.key(), 
SchemaConstants.CN_AT);
-
-ldapPropsMap.put(AmbariLdapConfigKeys.USER_SEARCH_BASE.key(), 

[15/33] ambari git commit: AMBARI-21307 AddedLDAP configuration provider for loading and maintaining the LDAP configuration in the application

[lpuskas]

AMBARI-21307 AddedLDAP configuration provider for loading and maintaining the 
LDAP configuration in the application


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: a5397e2b91515bc75242112b13bdfd11715b2b24
Parents: 176356b
Author: lpuskas 
Authored: Tue Aug 29 14:55:09 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:50 2017 +0200

--
 .../services/ldap/LdapConfigurationService.java |   1 +
 .../AmbariConfigurationResourceProvider.java|  35 +-
 .../ambari/server/events/AmbariEvent.java   |  11 +-
 .../events/AmbariLdapConfigChangedEvent.java|  37 ++
 .../server/ldap/LdapConfigurationFactory.java   |   2 +-
 .../apache/ambari/server/ldap/LdapModule.java   |   3 +
 .../AmbariLdapConfigurationProvider.java| 114 +++
 .../server/ldap/service/AmbariLdapFacade.java   |   7 +-
 .../server/orm/dao/AmbariConfigurationDAO.java  |  48 
 .../orm/entities/AmbariConfigurationEntity.java |   4 +-
 .../DefaultLdapConfigurationServiceTest.java|  10 +-
 11 files changed, 260 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a5397e2b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
index fc6bd41..1b8427b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
@@ -82,6 +82,7 @@ public class LdapConfigurationService extends 
AmbariConfigurationService {
   @Produces(MediaType.APPLICATION_JSON)
   public Response validateConfiguration(LdapConfigurationRequest 
ldapConfigurationRequest) {
 
+// check if the user is authorized to perform the operation
 authorize();
 
 Set groups = Sets.newHashSet();

http://git-wip-us.apache.org/repos/asf/ambari/blob/a5397e2b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
index 2302d8b..4f4cc70 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariConfigurationResourceProvider.java
@@ -35,6 +35,9 @@ import 
org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
 import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.PredicateHelper;
+import org.apache.ambari.server.events.AmbariEvent;
+import org.apache.ambari.server.events.AmbariLdapConfigChangedEvent;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
 import org.apache.ambari.server.orm.dao.AmbariConfigurationDAO;
 import org.apache.ambari.server.orm.entities.AmbariConfigurationEntity;
 import org.apache.ambari.server.orm.entities.ConfigurationBaseEntity;
@@ -113,6 +116,10 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
   @Inject
   private AmbariConfigurationDAO ambariConfigurationDAO;
 
+  @Inject
+  private AmbariEventPublisher publisher;
+
+
   private Gson gson;
 
   @AssistedInject
@@ -142,7 +149,18 @@ public class AmbariConfigurationResourceProvider extends 
AbstractAuthorizedResou
 }
 
 LOGGER.info("Persisting new ambari configuration: {} ", 
ambariConfigurationEntity);
-ambariConfigurationDAO.create(ambariConfigurationEntity);
+
+try {
+  ambariConfigurationDAO.create(ambariConfigurationEntity);
+} catch (Exception e) {
+  LOGGER.error("Failed to create resource", e);
+  throw new ResourceAlreadyExistsException(e.getMessage());
+}
+
+// todo filter by configuration type
+// notify subscribers about the configuration changes
+publisher.publish(new 

[29/33] ambari git commit: AMBARI-21307 Added unit test for the LdapFacade

[lpuskas]

AMBARI-21307 Added unit test for the LdapFacade


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 2f059df32d74fbc32385838ff459eac481069647
Parents: 060b85c
Author: lpuskas 
Authored: Thu Oct 12 16:53:31 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:53 2017 +0200

--
 .../services/AmbariConfigurationService.java|   2 +-
 .../ldap/domain/AmbariLdapConfiguration.java|  22 ++
 .../server/ldap/service/AmbariLdapFacade.java   |  10 +-
 .../ldap/service/AmbariLdapFacadeTest.java  | 215 +++
 4 files changed, 245 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2f059df3/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
index 492509f..38ae766 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariConfigurationService.java
@@ -150,7 +150,7 @@ public class AmbariConfigurationService extends BaseService 
{
   @PUT
   @Path("{configurationId}")
   @Produces(MediaType.TEXT_PLAIN)
-  @ApiOperation(value = "Updates ambari configuration resources - Not 
implemented yet",
+  @ApiOperation(value = "Updates ambari configuration resources ",
 nickname = "AmbariConfigurationService#updateAmbariConfiguration")
   @ApiImplicitParams({
 @ApiImplicitParam(dataType = AMBARI_CONFIGURATION_REQUEST_TYPE, paramType 
= PARAM_TYPE_BODY),

http://git-wip-us.apache.org/repos/asf/ambari/blob/2f059df3/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
index d071ebe..8b26cd3 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
@@ -19,6 +19,8 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -174,4 +176,24 @@ public class AmbariLdapConfiguration {
   public String toString() {
 return configurationMap.toString();
   }
+
+  @Override
+  public boolean equals(Object o) {
+if (this == o) return true;
+
+if (o == null || getClass() != o.getClass()) return false;
+
+AmbariLdapConfiguration that = (AmbariLdapConfiguration) o;
+
+return new EqualsBuilder()
+  .append(configurationMap, that.configurationMap)
+  .isEquals();
+  }
+
+  @Override
+  public int hashCode() {
+return new HashCodeBuilder(17, 37)
+  .append(configurationMap)
+  .toHashCode();
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2f059df3/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
index c75b0c4..bbfbc8e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/AmbariLdapFacade.java
@@ -33,7 +33,7 @@ public class AmbariLdapFacade implements LdapFacade {
   /**
* Additional parameters expected to be provided along with the configuration
*/
-  private enum Parameters {
+  protected enum Parameters {
 TEST_USER_NAME("ambari.ldap.test.user.name"),
 TEST_USER_PASSWORD("ambari.ldap.test.user.password");
 
@@ -43,7 +43,7 @@ public class AmbariLdapFacade implements LdapFacade {
   this.parameterKey = parameterKey;
 }
 
-private String getParameterKey() {
+public String getParameterKey() {
   return parameterKey;
 }
 
@@ -62,6 +62,7 @@ public class 

[05/33] ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

[lpuskas]

AMBARI-6. RU: Downgrade is failed ZKFC (ncole)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 20faae7a3647943b61e46f41ce27da81e91dc519
Parents: 3a0d168
Author: Nate Cole 
Authored: Fri Oct 13 08:42:12 2017 -0400
Committer: Nate Cole 
Committed: Fri Oct 13 09:19:08 2017 -0400

--
 .../upgrades/FinalizeUpgradeAction.java | 21 ++--
 1 file changed, 10 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/20faae7a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index d6876d9..87ea1fc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -271,7 +271,7 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 errors.size())).append(System.lineSeparator());
 
 for (InfoTuple error : errors) {
-  messageBuff.append(String.format("%s: $s (current = %s, desired = %s 
", error.hostName,
+  messageBuff.append(String.format("%s: %s (current = %s, desired = 
%s)", error.hostName,
   error.componentName, error.currentVersion, error.targetVersion));
 
   messageBuff.append(System.lineSeparator());
@@ -367,23 +367,22 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 Set errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set servicesParticipating = upgradeContext.getSupportedServices();
 for (String serviceName : servicesParticipating) {
   Service service = cluster.getService(serviceName);
-  String targetVersion = upgradeContext.getTargetVersion(serviceName);
+  RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getTargetRepositoryVersion(serviceName);
+  StackId targetStackId = repositoryVersionEntity.getStackId();
+  String targetVersion = repositoryVersionEntity.getVersion();
 
   for (ServiceComponent serviceComponent : 
service.getServiceComponents().values()) {
-for (ServiceComponentHost serviceComponentHost : 
serviceComponent.getServiceComponentHosts().values()) {
-  ComponentInfo componentInfo = 
ambariMetaInfo.getComponent(targetStackId.getStackName(),
-  targetStackId.getStackVersion(), service.getName(), 
serviceComponent.getName());
+ComponentInfo componentInfo = 
ambariMetaInfo.getComponent(targetStackId.getStackName(),
+targetStackId.getStackVersion(), service.getName(), 
serviceComponent.getName());
 
-  if (!componentInfo.isVersionAdvertised()) {
-continue;
-  }
+if (!componentInfo.isVersionAdvertised()) {
+  continue;
+}
 
+for (ServiceComponentHost serviceComponentHost : 
serviceComponent.getServiceComponentHosts().values()) {
   if (!StringUtils.equals(targetVersion, 
serviceComponentHost.getVersion())) {
 errors.add(new InfoTuple(service.getName(), 
serviceComponent.getName(),
 serviceComponentHost.getHostName(), 
serviceComponentHost.getVersion(),

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

[lpuskas]

AMBARI-21307 Implemented PUT operation, added unit tests


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 1e8cde47d6c05b4b1310414f1dda92a4789e5730
Parents: 53b4627
Author: lpuskas 
Authored: Thu Jul 13 16:20:58 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:48 2017 +0200

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


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

[20/33] ambari git commit: AMBARI-21307 Implemented more detectors. Organized the code

[lpuskas]

 AMBARI-21307 Implemented more detectors. Organized the code


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 14ec2aee699254a5b0dedb6da974e4cdf6bb3fbb
Parents: d0e543c
Author: lpuskas 
Authored: Tue Sep 12 11:58:45 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:51 2017 +0200

--
 .../server/ldap/AmbariLdapConfiguration.java|   1 +
 .../ads/DefaultAttributeDetectionService.java   | 134 ++-
 .../ldap/service/ads/ObjectClassDetector.java   |  81 ---
 .../ads/OccurranceAndWeightBasedDetector.java   |  81 ---
 .../service/ads/UserNameAttributeDetector.java  |  75 ---
 .../ads/detectors/GroupMemberAttrDetector.java  |  56 
 .../ads/detectors/GroupNameAttrDetector.java|  61 +
 .../ads/detectors/GroupObjectClassDetector.java |  64 +
 .../OccurranceAndWeightBasedDetector.java   | 103 ++
 .../detectors/UserGroupMemberAttrDetector.java  |  56 
 .../ads/detectors/UserNameAttrDetector.java |  60 +
 .../ads/detectors/UserObjectClassDetector.java  |  64 +
 .../DefaultAttributeDetectionServiceTest.java   |  10 +-
 13 files changed, 571 insertions(+), 275 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/14ec2aee/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
index e28c6ed..ebb567d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
@@ -56,6 +56,7 @@ public class AmbariLdapConfiguration {
 
 USER_OBJECT_CLASS("ambari.ldap.attributes.user.object_class"),
 USER_NAME_ATTRIBUTE("ambari.ldap.attributes.user.name_attr"),
+
USER_GROUP_MEMBER_ATTRIBUTE("ambari.ldap.attributes.user.group_member_attr"),
 USER_SEARCH_BASE("ambari.ldap.attributes.user.search_base"),
 
 GROUP_OBJECT_CLASS("ambari.ldap.attributes.group.object_class"),

http://git-wip-us.apache.org/repos/asf/ambari/blob/14ec2aee/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultAttributeDetectionService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultAttributeDetectionService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultAttributeDetectionService.java
index 710adf1..b3a4fde 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultAttributeDetectionService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultAttributeDetectionService.java
@@ -14,15 +14,18 @@
 
 package org.apache.ambari.server.ldap.service.ads;
 
-import java.util.Set;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.apache.ambari.server.ldap.AmbariLdapConfiguration;
 import org.apache.ambari.server.ldap.service.AmbariLdapException;
-import org.apache.ambari.server.ldap.service.AttributeDetector;
 import org.apache.ambari.server.ldap.service.LdapAttributeDetectionService;
+import 
org.apache.ambari.server.ldap.service.ads.detectors.GroupMemberAttrDetector;
+import 
org.apache.ambari.server.ldap.service.ads.detectors.GroupNameAttrDetector;
+import 
org.apache.ambari.server.ldap.service.ads.detectors.GroupObjectClassDetector;
+import 
org.apache.ambari.server.ldap.service.ads.detectors.UserGroupMemberAttrDetector;
+import 
org.apache.ambari.server.ldap.service.ads.detectors.UserNameAttrDetector;
+import 
org.apache.ambari.server.ldap.service.ads.detectors.UserObjectClassDetector;
 import org.apache.directory.api.ldap.model.cursor.SearchCursor;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.message.Response;
@@ -37,24 +40,29 @@ import 
org.apache.directory.ldap.client.api.search.FilterBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Sets;
-
 @Singleton
 public class DefaultAttributeDetectionService implements 
LdapAttributeDetectionService {
 
   private static final Logger LOGGER = 
LoggerFactory.getLogger(DefaultAttributeDetectionService.class);
   private static final int 

[31/33] ambari git commit: AMBARI-21307 cleand apache ditectory related dependencies

[lpuskas]

AMBARI-21307 cleand apache ditectory related dependencies


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 060b85ca37f97c5499cc5b9dcf8e57c24d085cb1
Parents: 9a50bc1
Author: lpuskas 
Authored: Wed Oct 11 17:54:57 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:53 2017 +0200

--
 ambari-funtest/pom.xml | 67 
 ambari-project/pom.xml | 51 ---
 ambari-server/pom.xml  | 84 -
 3 files changed, 14 insertions(+), 188 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/060b85ca/ambari-funtest/pom.xml
--
diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml
index bb2068d..6466af3 100644
--- a/ambari-funtest/pom.xml
+++ b/ambari-funtest/pom.xml
@@ -197,73 +197,6 @@
   spring-ldap-core
 
 
-  org.apache.directory.server
-  apacheds-server-annotations
-  test
-  
-
-  net.sf.ehcache
-  ehcache-core
-
-  
-
-
-  org.apache.directory.server
-  apacheds-core-integ
-  test
-  
-
-  net.sf.ehcache
-  ehcache-core
-
-  
-
-
-  org.apache.directory.server
-  apacheds-server-integ
-  test
-
-
-  org.apache.directory.server
-  apacheds-jdbm
-  test
-
-
-  org.apache.directory.server
-  apacheds-kerberos-codec
-  
-
-  net.sf.ehcache
-  ehcache-core
-
-  
-
-
-  org.apache.directory.server
-  apacheds-core
-  test
-  
-
-  net.sf.ehcache
-  ehcache-core
-
-  
-
-
-  org.apache.directory.server
-  apacheds-protocol-ldap
-  test
-
-
-  org.apache.directory.server
-  kerberos-client
-
-
-  org.apache.directory.shared
-  shared-ldap
-  test
-
-
   org.slf4j
   slf4j-api
   1.7.20

http://git-wip-us.apache.org/repos/asf/ambari/blob/060b85ca/ambari-project/pom.xml
--
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index e4d4423..f6e3bc7 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -162,57 +162,6 @@
 2.0.4.RELEASE
   
   
-org.apache.directory.server
-apacheds-server-annotations
-2.0.0-M19
-  
-  
-org.apache.directory.server
-apacheds-core-integ
-2.0.0-M19
-  
-  
-org.apache.directory.server
-apacheds-server-integ
-2.0.0-M19
-  
-  
-org.apache.directory.server
-apacheds-jdbm
-2.0.0-M5
-  
-  
-org.apache.directory.server
-apacheds-kerberos-codec
-2.0.0-M19
-  
-  
-org.apache.directory.server
-apacheds-core
-2.0.0-M19
-  
-  
-org.apache.directory.server
-kerberos-client
-2.0.0-M19
-  
-  
-org.apache.directory.server
-apacheds-protocol-ldap
-2.0.0-M19
-
-  
-org.apache.directory.jdbm
-apacheds-jdbm1
-  
-
-  
-  
-org.apache.directory.shared
-shared-ldap
-0.9.17
-  
-  
 org.slf4j
 slf4j-api
 ${slf4j.version}

http://git-wip-us.apache.org/repos/asf/ambari/blob/060b85ca/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 8d52821..a86acf5 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1225,73 +1225,6 @@
   spring-ldap-core
 
 
-  org.apache.directory.server
-  apacheds-server-annotations
-  test
-  
-
-  net.sf.ehcache
-  ehcache-core
-
-  
-
-
-  org.apache.directory.server
-  apacheds-core-integ
-  test
-  
-
-  net.sf.ehcache
-  ehcache-core
-
-  
-
-
-  org.apache.directory.server
-  apacheds-server-integ
-  test
-
-
-  org.apache.directory.server
-  apacheds-jdbm
-  test
-
-
-  org.apache.directory.server
-  apacheds-kerberos-codec
-  
-
-  net.sf.ehcache
-  ehcache-core
-
-  
-
-
-  

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 28180465404d20e61f4b71167042ae551569bec1
Parents: 86e105f
Author: lpuskas 
Authored: Tue Aug 8 15:50:29 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:49 2017 +0200

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


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

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

[09/33] ambari git commit: AMBARI-21307 Rest resource for supporting ambari configurations

[lpuskas]

AMBARI-21307 Rest resource for supporting ambari configurations


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 473505226b6d1cdca200011c13b68ae99fa83248
Parents: 20faae7
Author: lpuskas 
Authored: Wed Jul 5 14:20:18 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:48 2017 +0200

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


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

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

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: d062cf05e4947e3b728b1495e4c19da5fc2cafc7
Parents: 5b7c55f
Author: lpuskas 
Authored: Mon Aug 21 15:53:45 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:50 2017 +0200

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


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

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 8d2e13451781d4255f5f73a811233a492a6b3e2e
Parents: 1e8cde4
Author: lpuskas 
Authored: Tue Jul 18 17:48:07 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:49 2017 +0200

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


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

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d2e1345/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index e250da7..8d52821 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1689,6 +1689,11 @@
   4.2.2
 
 
+  org.apache.directory.api
+  api-all
+  ${ldap-api.version}
+
+
   com.networknt
   json-schema-validator
   0.1.10

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

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

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

[lpuskas]

AMBARI-21307 refactoring - renamed, moved classes, variables


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 176356bde7cddcd203ec576a420371e40bf389a2
Parents: d062cf0
Author: lpuskas 
Authored: Tue Aug 22 10:03:24 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:50 2017 +0200

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


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

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

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

[lpuskas]

AMBARI-21307 Draft implementation of the group related attributes


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 86e105f8d7ae76318132f2e3ff8f3833c0af14b2
Parents: 8d2e134
Author: lpuskas 
Authored: Tue Aug 8 13:54:29 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:49 2017 +0200

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


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

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

[01/33] ambari git commit: AMBARI-22224. host and hostname built-in variables are not populated when performing Kerberos-related operations (rlevas) [Forced Update!]

[lpuskas]

Repository: ambari
Updated Branches:
  refs/heads/feature-branch-AMBARI-21307 b7f03cac8 -> d623a21fe (forced update)


AMBARI-4. host and hostname built-in variables are not populated when 
performing Kerberos-related operations (rlevas)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 0f76c7f9d642bced5c89e0a25986c12c89213912
Parents: d88d3cc
Author: Robert Levas 
Authored: Thu Oct 12 15:49:57 2017 -0400
Committer: Robert Levas 
Committed: Thu Oct 12 15:49:57 2017 -0400

--
 .../ambari/server/controller/KerberosHelperImpl.java  |  2 +-
 .../kerberos/AbstractPrepareKerberosServerAction.java | 14 ++
 .../upgrades/PreconfigureKerberosAction.java  | 13 +
 .../AbstractPrepareKerberosServerActionTest.java  |  5 +
 4 files changed, 33 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0f76c7f9/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index f8fe31a..4f14614 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -1644,7 +1644,7 @@ public class KerberosHelperImpl implements KerberosHelper 
{
 // Calculate the current host-specific configurations. These will 
be used to replace
 // variables within the Kerberos descriptor data
 Map> configurations = 
calculateConfigurations(cluster,
-hostname.equals(ambariServerHostname) ? null : hostname,
+hostname,
 kerberosDescriptor,
 false,
 false);

http://git-wip-us.apache.org/repos/asf/ambari/blob/0f76c7f9/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
index 3db844a..7948a60 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
@@ -40,6 +40,7 @@ import 
org.apache.ambari.server.state.kerberos.KerberosDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
 import org.apache.ambari.server.utils.StageUtils;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -141,6 +142,19 @@ public abstract class AbstractPrepareKerberosServerAction 
extends KerberosServer
   if (serviceDescriptor != null) {
 List serviceIdentities = 
serviceDescriptor.getIdentities(true, filterContext);
 
+if (!StringUtils.isEmpty(hostName)) {
+  // Update the configurations with the relevant hostname
+  Map generalProperties = 
currentConfigurations.get("");
+  if (generalProperties == null) {
+generalProperties = new HashMap<>();
+currentConfigurations.put("", generalProperties);
+  }
+
+  // Add the current hostname under "host" and "hostname"
+  generalProperties.put("host", hostName);
+  generalProperties.put("hostname", hostName);
+}
+
 // Add service-level principals (and keytabs)
 kerberosHelper.addIdentities(kerberosIdentityDataFileWriter, 
serviceIdentities,
 identityFilter, hostName, serviceName, componentName, 
kerberosConfigurations, currentConfigurations, excludeHeadless);

http://git-wip-us.apache.org/repos/asf/ambari/blob/0f76c7f9/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosAction.java
--
diff --git 

[32/33] ambari git commit: AMBARI-21307 Ldapconnection template optimization, basic support for custom trust store

[lpuskas]

AMBARI-21307 Ldapconnection template optimization, basic support for custom 
trust store


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 9a50bc154b193594f506dcd32cfd1323700fa99c
Parents: 1ecd85c
Author: lpuskas 
Authored: Mon Oct 9 17:20:38 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:53 2017 +0200

--
 .../apache/ambari/server/ldap/LdapModule.java   |   8 +-
 .../service/LdapAttributeDetectionService.java  |   4 +-
 .../service/LdapConnectionConfigService.java|  34 ++
 .../service/LdapConnectionTemplateProvider.java |  56 -
 .../DefaultLdapAttributeDetectionService.java   |   4 +-
 .../ads/DefaultLdapConfigurationService.java|  11 +-
 .../ads/LdapConnectionTemplateFactory.java  |  56 +
 .../DefaultLdapConnectionConfigService.java | 116 +++
 .../server/ldap/LdapModuleFunctionalTest.java   |  28 +
 9 files changed, 224 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9a50bc15/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java
index d59264a..4abf4e7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/LdapModule.java
@@ -21,11 +21,11 @@ import 
org.apache.ambari.server.ldap.service.AmbariLdapConfigurationProvider;
 import org.apache.ambari.server.ldap.service.AmbariLdapFacade;
 import org.apache.ambari.server.ldap.service.LdapAttributeDetectionService;
 import org.apache.ambari.server.ldap.service.LdapConfigurationService;
-import org.apache.ambari.server.ldap.service.LdapConnectionTemplateProvider;
+import org.apache.ambari.server.ldap.service.LdapConnectionConfigService;
 import org.apache.ambari.server.ldap.service.LdapFacade;
 import 
org.apache.ambari.server.ldap.service.ads.DefaultLdapAttributeDetectionService;
 import 
org.apache.ambari.server.ldap.service.ads.DefaultLdapConfigurationService;
-import org.apache.directory.ldap.client.template.LdapConnectionTemplate;
+import 
org.apache.ambari.server.ldap.service.ads.detectors.DefaultLdapConnectionConfigService;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
@@ -40,13 +40,11 @@ public class LdapModule extends AbstractModule {
 bind(LdapFacade.class).to(AmbariLdapFacade.class);
 
bind(LdapConfigurationService.class).to(DefaultLdapConfigurationService.class);
 
bind(LdapAttributeDetectionService.class).to(DefaultLdapAttributeDetectionService.class);
+
bind(LdapConnectionConfigService.class).to(DefaultLdapConnectionConfigService.class);
 
 // this binding requires the JPA module!
 
bind(AmbariLdapConfiguration.class).toProvider(AmbariLdapConfigurationProvider.class);
 
-// bind to the provider implementation (let GUICE deal with instantiating 
3rd party instances)
-
bind(LdapConnectionTemplate.class).toProvider(LdapConnectionTemplateProvider.class);
-
 install(new 
FactoryModuleBuilder().build(AmbariLdapConfigurationFactory.class));
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/9a50bc15/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/LdapAttributeDetectionService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/LdapAttributeDetectionService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/LdapAttributeDetectionService.java
index 6cd369b..c08a2e0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/LdapAttributeDetectionService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/LdapAttributeDetectionService.java
@@ -27,7 +27,7 @@ public interface LdapAttributeDetectionService {
* @param ambariLdapConfiguration configuration instance holding connection 
details
* @return the configuration decorated with user related attributes
*/
-  AmbariLdapConfiguration detectLdapUserAttributes(AmbariLdapConfiguration 
ambariLdapConfiguration);
+  AmbariLdapConfiguration detectLdapUserAttributes(AmbariLdapConfiguration 
ambariLdapConfiguration) throws AmbariLdapException;
 
   /**
* Decorates the passed in configuration with the detected ldap group 

[23/33] ambari git commit: AMBARI-21307 organized code, fixed build failures

[lpuskas]

AMBARI-21307 organized code, fixed build failures


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: b8128f0922fc54105017b8d5beb40b57ee165960
Parents: 38724b9
Author: lpuskas 
Authored: Thu Sep 14 17:58:59 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:52 2017 +0200

--
 .../ldap/domain/AmbariLdapConfigKeys.java   | 72 
 .../ldap/domain/AmbariLdapConfiguration.java|  3 -
 .../ldap/domain/LdapConfigurationFactory.java   |  2 +-
 .../ldap/service/AmbariLdapConfigKeys.java  | 72 
 .../DefaultLdapAttributeDetectionService.java   |  2 +-
 .../domain/AmbariLdapConfigurationTest.java | 19 ++
 .../TestAmbariLdapConfigurationFactory.java | 29 
 ...efaultLdapAttributeDetectionServiceTest.java |  9 ++-
 .../DefaultLdapConfigurationServiceTest.java| 19 +-
 9 files changed, 144 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b8128f09/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfigKeys.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfigKeys.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfigKeys.java
new file mode 100644
index 000..b7b41a3
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfigKeys.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.ldap.domain;
+
+/**
+ * Constants representing supported LDAP related property names
+ * // todo extend this with validation information, description, defaults maybe
+ */
+public enum AmbariLdapConfigKeys {
+
+  LDAP_ENABLED("ambari.ldap.authentication.enabled"),
+  SERVER_HOST("ambari.ldap.connectivity.server.host"),
+  SERVER_PORT("ambari.ldap.connectivity.server.port"),
+  USE_SSL("ambari.ldap.connectivity.use_ssl"),
+
+  TRUST_STORE("ambari.ldap.connectivity.trust_store"),
+  TRUST_STORE_TYPE("ambari.ldap.connectivity.trust_store.type"),
+  TRUST_STORE_PATH("ambari.ldap.connectivity.trust_store.path"),
+  TRUST_STORE_PASSWORD("ambari.ldap.connectivity.trust_store.password"),
+  ANONYMOUS_BIND("ambari.ldap.connectivity.anonymous_bind"),
+
+  BIND_DN("ambari.ldap.connectivity.bind_dn"),
+  BIND_PASSWORD("ambari.ldap.connectivity.bind_password"),
+
+  ATTR_DETECTION("ambari.ldap.attributes.detection"), // manual | auto
+
+  DN_ATTRIBUTE("ambari.ldap.attributes.dn_attr"),
+
+  USER_OBJECT_CLASS("ambari.ldap.attributes.user.object_class"),
+  USER_NAME_ATTRIBUTE("ambari.ldap.attributes.user.name_attr"),
+  USER_GROUP_MEMBER_ATTRIBUTE("ambari.ldap.attributes.user.group_member_attr"),
+  USER_SEARCH_BASE("ambari.ldap.attributes.user.search_base"),
+
+  GROUP_OBJECT_CLASS("ambari.ldap.attributes.group.object_class"),
+  GROUP_NAME_ATTRIBUTE("ambari.ldap.attributes.group.name_attr"),
+  GROUP_MEMBER_ATTRIBUTE("ambari.ldap.attributes.group.member_attr"),
+  GROUP_SEARCH_BASE("ambari.ldap.attributes.group.search_base"),
+
+  USER_SEARCH_FILTER("ambari.ldap.advanced.user_search_filter"),
+  
USER_MEMBER_REPLACE_PATTERN("ambari.ldap.advanced.user_member_replace_pattern"),
+  USER_MEMBER_FILTER("ambari.ldap.advanced.user_member_filter"),
+
+  GROUP_SEARCH_FILTER("ambari.ldap.advanced.group_search_filter"),
+  
GROUP_MEMBER_REPLACE_PATTERN("ambari.ldap.advanced.group_member_replace_pattern"),
+  GROUP_MEMBER_FILTER("ambari.ldap.advanced.group_member_filter"),
+
+  FORCE_LOWERCASE_USERNAMES("ambari.ldap.advanced.force_lowercase_usernames"),
+  REFERRAL_HANDLING("ambari.ldap.advanced.referrals"), // folow
+  PAGINATION_ENABLED("ambari.ldap.advanced.pagination_enabled"); // true | 
false
+
+  private String propertyName;
+
+  AmbariLdapConfigKeys(String propName) {
+this.propertyName = propName;
+  }
+
+  public String key() {
+return this.propertyName;
+  }
+}

[24/33] ambari git commit: AMBARI-21307 Testing the attribute detection - fixing bugs, cleanup

[lpuskas]

AMBARI-21307 Testing the attribute detection - fixing bugs, cleanup


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: dd9900973cc84c7bffe4919fb40b81b2383d86ec
Parents: 0467801
Author: lpuskas 
Authored: Tue Sep 12 18:58:44 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:52 2017 +0200

--
 .../api/services/ldap/LdapConfigurationService.java  | 11 +++
 .../ambari/server/ldap/AmbariLdapConfiguration.java  |  2 +-
 .../org/apache/ambari/server/ldap/LdapModule.java|  3 +++
 .../ambari/server/ldap/service/AmbariLdapFacade.java |  6 ++
 .../ads/DefaultAttributeDetectionService.java| 15 +++
 .../service/ads/DefaultLdapConfigurationService.java |  3 ---
 .../ads/detectors/GroupMemberAttrDetector.java   |  3 +++
 .../service/ads/detectors/GroupNameAttrDetector.java |  3 +++
 .../ads/detectors/GroupObjectClassDetector.java  |  3 +++
 .../ads/detectors/UserGroupMemberAttrDetector.java   |  3 +++
 .../service/ads/detectors/UserNameAttrDetector.java  |  3 +++
 .../ads/DefaultAttributeDetectionServiceTest.java|  3 +--
 .../ads/DefaultLdapConfigurationServiceTest.java |  4 ++--
 13 files changed, 42 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dd990097/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
index 66809c3..ae47a87 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
@@ -86,6 +86,7 @@ public class LdapConfigurationService extends 
AmbariConfigurationService {
 authorize();
 
 Set groups = Sets.newHashSet();
+Object responseEntity = null;
 
 Result result = new ResultImpl(new ResultStatus(ResultStatus.STATUS.OK));
 try {
@@ -108,13 +109,14 @@ public class LdapConfigurationService extends 
AmbariConfigurationService {
 
   LOGGER.info("Testing LDAP attributes ");
   groups = 
ldapFacade.checkLdapAttributes(ldapConfigurationRequest.getRequestInfo().getParameters(),
 ambariLdapConfiguration);
-  setResult(groups, result);
+  responseEntity = groups;
 
   break;
 case DETECT_ATTRIBUTES:
 
   LOGGER.info("Detecting LDAP attributes ...");
-  ldapFacade.detectAttributes(ambariLdapConfiguration);
+  ambariLdapConfiguration = 
ldapFacade.detectAttributes(ambariLdapConfiguration);
+  responseEntity = ambariLdapConfiguration;
 
   break;
 default:
@@ -123,10 +125,11 @@ public class LdapConfigurationService extends 
AmbariConfigurationService {
   }
 
 } catch (Exception e) {
-  result.setResultStatus(new ResultStatus(ResultStatus.STATUS.BAD_REQUEST, 
e));
+  result.setResultStatus(new 
ResultStatus(ResultStatus.STATUS.SERVER_ERROR, e));
+  responseEntity = e.getMessage();
 }
 
-return 
Response.status(result.getStatus().getStatusCode()).entity(getResultSerializer().serialize(result)).build();
+return 
Response.status(result.getStatus().getStatusCode()).entity(responseEntity).build();
   }
 
   private void setResult(Set groups, Result result) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/dd990097/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
index ebb567d..5bdda7a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
@@ -62,7 +62,7 @@ public class AmbariLdapConfiguration {
 GROUP_OBJECT_CLASS("ambari.ldap.attributes.group.object_class"),
 GROUP_NAME_ATTRIBUTE("ambari.ldap.attributes.group.name_attr"),
 GROUP_MEMBER_ATTRIBUTE("ambari.ldap.attributes.group.member_attr"),
-GROUP_SEARCH_BASE("ambari.ldap.attributes.user.search_base"),
+

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

[lpuskas]

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


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: e87ca3cec5768e887b12e9fe3e500317664e8c36
Parents: 2818046
Author: Balazs Bence Sari 
Authored: Tue Aug 8 20:17:14 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:49 2017 +0200

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


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

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

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

[02/33] ambari git commit: AMBARI-22229.Handle upload of interpreter.json to remote storage in Ambari(Prabhjyot Singh via Venkata Sairam)

[lpuskas]

AMBARI-9.Handle upload of interpreter.json to remote storage in 
Ambari(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/a8ba5e61
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8ba5e61
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8ba5e61

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: a8ba5e61c50ac92b787d3b2de4cec8d29da92d74
Parents: 0f76c7f
Author: Venkata Sairam 
Authored: Fri Oct 13 15:22:33 2017 +0530
Committer: Venkata Sairam 
Committed: Fri Oct 13 15:22:33 2017 +0530

--
 .../common-services/ZEPPELIN/0.7.0/package/scripts/master.py | 3 ++-
 .../src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py | 8 
 2 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a8ba5e61/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index a8b1b32..6a84d79 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -305,7 +305,8 @@ class Master(Script):
   def get_zeppelin_conf_FS_directory(self, params):
 hdfs_interpreter_config = 
params.config['configurations']['zeppelin-config']['zeppelin.config.fs.dir']
 
-if not hdfs_interpreter_config.startswith("/"):
+# if it doesn't start from "/" or doesn't contains "://" as in hdfs://, 
file://, etc then make it a absolute path
+if not (hdfs_interpreter_config.startswith("/") or '://' in 
hdfs_interpreter_config):
   hdfs_interpreter_config = "/user/" + format("{zeppelin_user}") + "/" + 
hdfs_interpreter_config
 
 return hdfs_interpreter_config

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8ba5e61/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py 
b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
index e5d0240..400350c 100644
--- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
+++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
@@ -342,7 +342,7 @@ class TestZeppelin070(RMFTestCase):
   )
 
 self.assertResourceCalled('HdfsResource',
-  '/user/zeppelin/hdfs:///user/zeppelin/conf',
+  'hdfs:///user/zeppelin/conf',
   security_enabled=False,
   
hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
   keytab=UnknownConfigurationMock(),
@@ -368,7 +368,7 @@ class TestZeppelin070(RMFTestCase):
 
 
 self.assertResourceCalled('HdfsResource',
-  
'/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+  'hdfs:///user/zeppelin/conf/interpreter.json',
   security_enabled=False,
   
hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
   keytab=UnknownConfigurationMock(),
@@ -395,7 +395,7 @@ class TestZeppelin070(RMFTestCase):
   )
 
 self.assertResourceCalled('HdfsResource',
-  
'/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+  'hdfs:///user/zeppelin/conf/interpreter.json',
   security_enabled=False,
   
hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
   keytab=UnknownConfigurationMock(),
@@ -421,7 +421,7 @@ class TestZeppelin070(RMFTestCase):
   group='zeppelin',
   )
 
-self.assertResourceCalled('HdfsResource', 
'/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+self.assertResourceCalled('HdfsResource', 
'hdfs:///user/zeppelin/conf/interpreter.json',
 security_enabled = False,
 hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
 keytab = UnknownConfigurationMock(),

[25/33] ambari git commit: AMBARI-21307 Extracted config keys into an enum. Organized code (created domain package, moved classes)

[lpuskas]

AMBARI-21307 Extracted config keys into an enum. Organized code (created domain 
package, moved classes)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 38724b9211104d752cfed9e684a83f0c22ccb6bb
Parents: a15c4e5
Author: lpuskas 
Authored: Thu Sep 14 16:33:41 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:52 2017 +0200

--
 .../services/ldap/LdapConfigurationService.java |   4 +-
 .../server/ldap/AmbariLdapConfiguration.java| 232 ---
 .../server/ldap/LdapConfigurationFactory.java   |  34 ---
 .../apache/ambari/server/ldap/LdapModule.java   |   2 +
 .../ldap/domain/AmbariLdapConfiguration.java| 180 ++
 .../ldap/domain/LdapConfigurationFactory.java   |  34 +++
 .../ldap/service/AmbariLdapConfigKeys.java  |  72 ++
 .../AmbariLdapConfigurationProvider.java|   4 +-
 .../server/ldap/service/AmbariLdapFacade.java   |   2 +-
 .../service/LdapAttributeDetectionService.java  |   2 +-
 .../ldap/service/LdapConfigurationService.java  |   2 +-
 .../ldap/service/LdapConnectionService.java |   2 +-
 .../ambari/server/ldap/service/LdapFacade.java  |   2 +-
 .../DefaultLdapAttributeDetectionService.java   |  15 +-
 .../ads/DefaultLdapConfigurationService.java|   2 +-
 .../ads/DefaultLdapConnectionService.java   |  16 +-
 ...efaultLdapAttributeDetectionServiceTest.java |  21 +-
 .../DefaultLdapConfigurationServiceTest.java|  31 +--
 18 files changed, 334 insertions(+), 323 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/38724b92/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
index ae47a87..ff95066 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ldap/LdapConfigurationService.java
@@ -46,8 +46,8 @@ import org.apache.ambari.server.api.services.ResultImpl;
 import org.apache.ambari.server.api.services.ResultStatus;
 import org.apache.ambari.server.controller.internal.ResourceImpl;
 import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.ldap.AmbariLdapConfiguration;
-import org.apache.ambari.server.ldap.LdapConfigurationFactory;
+import org.apache.ambari.server.ldap.domain.AmbariLdapConfiguration;
+import org.apache.ambari.server.ldap.domain.LdapConfigurationFactory;
 import org.apache.ambari.server.ldap.service.LdapFacade;
 import org.apache.ambari.server.security.authorization.AuthorizationException;
 import org.apache.ambari.server.security.authorization.AuthorizationHelper;

http://git-wip-us.apache.org/repos/asf/ambari/blob/38724b92/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
deleted file mode 100644
index 5bdda7a..000
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/ldap/AmbariLdapConfiguration.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ambari.server.ldap;
-
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.inject.assistedinject.Assisted;
-
-/**
- * This class is an immutable representation of all the LDAP related 
configurationMap entries.
- */
-@Singleton
-public class AmbariLdapConfiguration {
-
-  private static final Logger LOGGER = 

[04/33] ambari git commit: AMBARI-22231 Stopping and starting HDFS component in Ambari will result in Namenode to stay in SAFEMODE (dsen)

[lpuskas]

AMBARI-22231 Stopping and starting HDFS component in Ambari will result in 
Namenode to stay in SAFEMODE (dsen)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 3a0d168c08edf559bc91f3eb76485797f83a6e48
Parents: 8f53bc4
Author: Dmytro Sen 
Authored: Fri Oct 13 15:53:09 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 13 15:53:09 2017 +0300

--
 .../src/main/resources/stacks/HDP/3.0/role_command_order.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3a0d168c/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json 
b/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
index 576910f..223eee5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
+++ b/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
@@ -87,7 +87,7 @@
 "PXF_SERVICE_CHECK-SERVICE_CHECK" : ["PXF-START", 
"HDFS_SERVICE_CHECK-SERVICE_CHECK", "HBASE_SERVICE_CHECK-SERVICE_CHECK", 
"HIVE_SERVICE_CHECK-SERVICE_CHECK"],
 
 "RANGER_ADMIN-START": ["ZOOKEEPER_SERVER-START", "INFRA_SOLR-START"],
-"RANGER_USERSYNC-START" : ["RANGER_ADMIN-START", 
"RANGER_KMS_SERVER-START"],
+"RANGER_USERSYNC-START" : ["RANGER_ADMIN-START"],
 "RANGER_KMS_SERVER-START" : ["RANGER_ADMIN-START"],
 "RANGER_KMS_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_KMS_SERVER-START"],
 "RANGER_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_USERSYNC-START", 
"RANGER_ADMIN-START"],

[30/33] ambari git commit: AMBARI-21307 Fixed failing unit tests (in most cases the new guice module was needed)

[lpuskas]

AMBARI-21307 Fixed failing unit tests (in most cases the new guice module was 
needed)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 36a49d17841db2fc46ab683d5d5928d6d7b54044
Parents: 2f059df
Author: lpuskas 
Authored: Thu Oct 12 19:25:24 2017 +0200
Committer: lpuskas 
Committed: Fri Oct 13 17:20:53 2017 +0200

--
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  2 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  2 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  2 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  2 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  2 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  2 +-
 .../api/services/ldap/LDAPServiceTest.java  | 85 
 .../server/checks/UpgradeCheckOrderTest.java|  3 +-
 ...AmbariConfigurationResourceProviderTest.java | 24 +-
 .../server/ldap/LdapModuleFunctionalTest.java   |  4 +-
 .../notifications/DispatchFactoryTest.java  |  3 +-
 .../server/orm/InMemoryDefaultTestModule.java   |  2 +
 .../ambari/server/orm/JdbcPropertyTest.java |  5 +-
 ...uthenticationProviderForDNWithSpaceTest.java | 35 
 .../AmbariLdapAuthenticationProviderTest.java   |  3 +-
 .../AmbariLocalUserProviderTest.java|  3 +-
 .../authorization/LdapServerPropertiesTest.java |  5 +-
 17 files changed, 65 insertions(+), 119 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/36a49d17/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
index cebd33e..20d64de 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
@@ -98,7 +98,7 @@ CREATE TABLE configuration_base (
 CREATE TABLE ambari_configuration (
   id BIGINT NOT NULL,
   CONSTRAINT PK_ambari_configuration PRIMARY KEY (id),
-  CONSTRAINT FK_ambari_configuration_configuration_base FOREIGN KEY (id) 
REFERENCES configuration_base (id)
+  CONSTRAINT FK_ambari_conf_conf_base FOREIGN KEY (id) REFERENCES 
configuration_base (id)
 );
 
 CREATE TABLE serviceconfig (

http://git-wip-us.apache.org/repos/asf/ambari/blob/36a49d17/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index b8b506a..dc1dea9 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -118,7 +118,7 @@ CREATE TABLE configuration_base (
 CREATE TABLE ambari_configuration (
   id BIGINT NOT NULL,
   CONSTRAINT PK_ambari_configuration PRIMARY KEY (id),
-  CONSTRAINT FK_ambari_configuration_configuration_base FOREIGN KEY (id) 
REFERENCES configuration_base (id)
+  CONSTRAINT FK_ambari_conf_conf_base FOREIGN KEY (id) REFERENCES 
configuration_base (id)
 );
 
 CREATE TABLE serviceconfig (

http://git-wip-us.apache.org/repos/asf/ambari/blob/36a49d17/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index 1e90426..7c34304 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -98,7 +98,7 @@ CREATE TABLE configuration_base (
 CREATE TABLE ambari_configuration (
   id NUMBER(19) NOT NULL,
   CONSTRAINT PK_ambari_configuration PRIMARY KEY (id),
-  CONSTRAINT FK_ambari_configuration_configuration_base FOREIGN KEY (id) 
REFERENCES configuration_base (id)
+  CONSTRAINT FK_ambari_conf_conf_base FOREIGN KEY (id) REFERENCES 
configuration_base (id)
 );
 
 CREATE TABLE serviceconfig (

http://git-wip-us.apache.org/repos/asf/ambari/blob/36a49d17/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
index 583a51b..9270522 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ 

[23/50] [abbrv] ambari git commit: AMBARI-22162. Move out the druid configurations from hive-site to hive-interactive-site. (Slim Bouguerra via Swapan Shridhar).

[rlevas]

AMBARI-22162. Move out the druid configurations from hive-site to 
hive-interactive-site. (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/7e885a39
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e885a39
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e885a39

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 7e885a390888a5cddc4cf448af3cfd225f59cf3d
Parents: 03273bd
Author: Swapan Shridhar 
Authored: Wed Oct 11 00:57:01 2017 -0700
Committer: Swapan Shridhar 
Committed: Wed Oct 11 00:57:13 2017 -0700

--
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 217 --
 .../configuration/hive-interactive-site.xml | 225 +++
 .../stacks/HDP/2.6/services/stack_advisor.py|  13 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  21 +-
 .../stacks/2.6/common/test_stack_advisor.py |  17 +-
 5 files changed, 250 insertions(+), 243 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7e885a39/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 d66cf4c..69d1c69 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
@@ -451,223 +451,6 @@ limitations under the License.
 
   
 
-  
-  
-hive.druid.broker.address.default
-localhost:8082
-Host name of druid router if any or broker
-
-
-  
-druid-router
-druid.port
-  
-
-  
-
-  
-hive.druid.metadata.uri
-jdbc:mysql://localhost:3355/druid
-URI to connect to the database (for example 
jdbc:mysql://hostname:port/DBName)
-
-
-  
-druid-common
-druid.metadata.storage.connector.connectURI
-  
-
-  
-
-  
-hive.druid.coordinator.address.default
-localhost:8082
-Host name of druid router if any or broker
-
-
-  
-druid-coordinator
-druid.port
-  
-
-  
-
-  
-hive.druid.metadata.password
-{{druid_metadata_password}}
-PASSWORD
-Druid Metadata Password
-Druid meta data storage password
-
-  password
-  true
-
-
-  
-
-   
-hive.druid.metadata.username
-druid
-Username used to connect to druid metadata 
storage
-
- 
-  
-druid-common
-druid.metadata.storage.connector.user
-  
-
-  
-
-  
-hive.druid.indexer.segments.granularity
-Default Granularity for the Druid segments
-
-  value-list
-  
-
-  YEAR
-
-
-  MONTH
-
-
-  WEEK
-
-
-  DAY
-
-
-  HOUR
-
-
-  MINUTE
-
-
-  SECOND
-
-  
-
-MINUTE
-Default Granularity for the segments created by the Druid 
storage handler, this can be overridden per table using table property 
druid.segment.granularity 
-
-  
-   
-hive.druid.indexer.partition.size.max
-500
-Maximum number of records per segment partition
-
-  
-   
-hive.druid.indexer.memory.rownum.max
-75000
-Maximum number of records in memory while storing data in 
Druid
-
-  
-
-  
-hive.druid.select.distribute
-true
-If it is set to true, we distribute the execution of Druid 
Select queries
-
-
-  boolean
-
-  
-
-  
-hive.druid.basePersistDirectory
-
-
-  Local temporary directory used to persist intermediate indexing state,
-  if empty (recommended) will default to JVM system property 
java.io.tmpdir.
-
-
-  true
-
-
-  
-
-  
-hive.druid.storage.storageDirectory
-{{druid_storage_dir}}
-
-  Druid deep storage location for segments.
-
-
-  
-  
-hive.druid.metadata.db.type
-Druid metadata storage type 
-
-  false
-  value-list
-  
-
-  mysql
-  MYSQL
-
-
-  postgresql
-  POSTGRESQL
-
-  
-
-mysql
-
-  
-druid-common
-druid.metadata.storage.type
-  
-
-Druid metadata storage type
-
-  
-
-  
-hive.druid.passiveWaitTimeMs
-3
-
-  Wait time in ms default to 30 seconds.
-
-
-  
-
-  
-hive.druid.working.directory
-  

[18/50] [abbrv] ambari git commit: AMBARI-21406. Refresh configurations without restart command (magyari_sandor)

[rlevas]

AMBARI-21406. Refresh configurations without restart command (magyari_sandor)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 57682942b7368a8de3f0a76f65e45b13c1626deb
Parents: 8908d3e
Author: Sandor Magyari 
Authored: Fri Aug 25 14:08:55 2017 +0200
Committer: Sandor Magyari 
Committed: Tue Oct 10 16:46:30 2017 +0200

--
 .../libraries/script/script.py  |  23 ++-
 .../AmbariCustomCommandExecutionHelper.java |  10 ++
 .../AmbariManagementControllerImpl.java |   4 +-
 .../ServiceComponentHostResponse.java   |  15 ++
 .../internal/HostComponentResourceProvider.java |   4 +
 .../ambari/server/metadata/ActionMetadata.java  |   1 +
 .../apache/ambari/server/stack/StackModule.java |  29 +++-
 .../ambari/server/state/ConfigHelper.java   | 164 ++-
 .../ambari/server/state/PropertyInfo.java   |  29 
 .../ambari/server/state/RefreshCommand.java |  52 ++
 .../state/RefreshCommandConfiguration.java  |  71 
 .../apache/ambari/server/state/StackInfo.java   |  10 ++
 .../svccomphost/ServiceComponentHostImpl.java   |  10 ++
 .../HDFS/2.1.0.2.0/configuration/core-site.xml  |  12 ++
 .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml  |   3 +
 .../HDFS/2.1.0.2.0/package/scripts/datanode.py  |  13 +-
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py  |  52 +-
 .../2.1.0.2.0/package/scripts/hdfs_client.py|   5 +
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |  21 +++
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |  21 ++-
 .../HDFS/2.1.0.2.0/package/scripts/snamenode.py |  10 ++
 .../HDFS/3.0.0.3.0/configuration/hdfs-site.xml  |   6 +
 .../HDFS/3.0.0.3.0/package/scripts/datanode.py  |  13 +-
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py  |  52 +-
 .../3.0.0.3.0/package/scripts/hdfs_client.py|   5 +
 .../3.0.0.3.0/package/scripts/hdfs_namenode.py  |  20 +++
 .../HDFS/3.0.0.3.0/package/scripts/namenode.py  |  21 ++-
 .../HDFS/3.0.0.3.0/package/scripts/snamenode.py |  10 ++
 .../src/main/resources/configuration-schema.xsd |  12 ++
 .../src/main/resources/properties.json  |   1 +
 .../services/HDFS/configuration/hdfs-site.xml   |   3 +
 .../ambari/server/state/ConfigHelperTest.java   |  76 -
 .../ambari/server/state/PropertyInfoTest.java   |  20 +++
 .../python/stacks/2.0.6/HDFS/test_datanode.py   |  17 ++
 .../python/stacks/2.0.6/HDFS/test_namenode.py   |  33 
 .../services/HDFS/configuration/hdfs-site.xml   |   8 +
 36 files changed, 835 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/57682942/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index bf8c0dc..12e6f98 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -1006,12 +1006,33 @@ class Script(object):
 
   def configure(self, env, upgrade_type=None, config_dir=None):
 """
-To be overridden by subclasses
+To be overridden by subclasses (may invoke save_configs)
 :param upgrade_type: only valid during RU/EU, otherwise will be None
 :param config_dir: for some clients during RU, the location to save 
configs to, otherwise None
 """
 self.fail_with_error('configure method isn\'t implemented')
 
+  def save_configs(self, env):
+"""
+To be overridden by subclasses
+Creates / updates configuration files
+"""
+self.fail_with_error('save_configs method isn\'t implemented')
+
+  def reconfigure(self, env):
+"""
+Default implementation of RECONFIGURE action which may be overridden by 
subclasses
+"""
+Logger.info("Refresh config files ...")
+self.save_configs(env)
+
+config = self.get_config()
+if "reconfigureAction" in config["commandParams"] and 
config["commandParams"]["reconfigureAction"] is not None:
+  reconfigure_action = config["commandParams"]["reconfigureAction"]
+  Logger.info("Call %s" % reconfigure_action)
+  method = self.choose_method_to_execute(reconfigure_action)
+  method(env)
+
   def generate_configs_get_template_file_content(self, filename, dicts):
 config = self.get_config()
 content = ''

[47/50] [abbrv] ambari git commit: AMBARI-22230 Hosts and Alerts tables UI tweaks. (atkach)

[rlevas]

AMBARI-22230 Hosts and Alerts tables UI tweaks. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 8f53bc453c47a4f95d5e58825feb77d69e6a6a22
Parents: a8ba5e6
Author: Andrii Tkach 
Authored: Fri Oct 13 13:45:06 2017 +0300
Committer: Andrii Tkach 
Committed: Fri Oct 13 13:45:06 2017 +0300

--
 ambari-web/app/models/alerts/alert_group.js |   2 +-
 ambari-web/app/styles/application.less  |   5 +
 ambari-web/app/styles/dashboard.less|   6 +-
 .../app/styles/theme/bootstrap-ambari.css   |   3 +-
 ambari-web/app/templates/main/alerts.hbs|   3 +-
 .../main/alerts/alert_definitions_actions.hbs   |   2 +-
 ambari-web/app/templates/main/dashboard.hbs |   2 +-
 .../templates/main/dashboard/config_history.hbs |   2 +-
 ambari-web/app/templates/main/host.hbs  |   2 +-
 .../templates/main/host/bulk_operation_menu.hbs | 132 ++-
 .../views/main/host/hosts_table_menu_view.js|   4 +-
 .../app/views/main/host/stack_versions_view.js  |   2 +-
 .../test/models/alerts/alert_group_test.js  |   5 +-
 13 files changed, 93 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/models/alerts/alert_group.js
--
diff --git a/ambari-web/app/models/alerts/alert_group.js 
b/ambari-web/app/models/alerts/alert_group.js
index 49a850f..3277fc8 100644
--- a/ambari-web/app/models/alerts/alert_group.js
+++ b/ambari-web/app/models/alerts/alert_group.js
@@ -55,7 +55,7 @@ App.AlertGroup = DS.Model.extend({
* @type {string}
*/
   displayName: function () {
-var name = App.config.truncateGroupName(this.get('name'));
+var name = App.config.truncateGroupName(App.format.role(this.get('name'), 
true));
 return this.get('default') ? name + ' Default' : name;
   }.property('name', 'default'),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 7c9cc8e..099f3cf 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2802,4 +2802,9 @@ a.abort-icon:hover {
 .breadcrumbs-forward-slash {
   display: inline;
   color: #D2D3D5;
+}
+
+.container-wrap-table {
+  padding: 0 10px;
+  background-color: @diff-background-equal;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/dashboard.less
--
diff --git a/ambari-web/app/styles/dashboard.less 
b/ambari-web/app/styles/dashboard.less
index 02835bd..6deb30c 100644
--- a/ambari-web/app/styles/dashboard.less
+++ b/ambari-web/app/styles/dashboard.less
@@ -18,14 +18,12 @@
 
 @import 'common.less';
 
-#dashboard-widgets-container{
-  .tabs-left {
-float: left;
-  }
+#dashboard-widgets-container {
   .btn-toolbar {
 float: right;
 padding-top: 5px;
 margin-bottom: 20px;
+margin-top: -60px;
   }
   .dashboard-widgets-box {
 clear: both;

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/theme/bootstrap-ambari.css
--
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css 
b/ambari-web/app/styles/theme/bootstrap-ambari.css
index 70579e7..cff73ad 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -479,11 +479,12 @@ h2.table-title {
 }
 .nav.nav-tabs li a .badge.badge-important {
   display: inline;
+  vertical-align: baseline;
 }
 .nav.nav-tabs li.active a {
   color: #333;
   border-bottom: 3px solid #3FAE2A;
-  padding-bottom: 1px;
+  padding-bottom: 2px;
 }
 .nav-tabs-left li,
 .nav-tabs-right li {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/templates/main/alerts.hbs
--
diff --git a/ambari-web/app/templates/main/alerts.hbs 
b/ambari-web/app/templates/main/alerts.hbs
index 40469d3..0f85e27 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-
+
   
 {{t menu.item.alerts}}
 
@@ -56,7 +56,6 @@
   {{view App.AlertDefinitionSummary 
contentBinding="alertDefinition"}}

[27/50] [abbrv] ambari git commit: AMBARI-22194 - Prevent Patch Upgrades With Known Service Incompatibilities (jonathanhurley)

[rlevas]

AMBARI-22194 - Prevent Patch Upgrades With Known Service Incompatibilities 
(jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: c19f363c86623fd42d285717e6e95b9036ad
Parents: 8ec33db
Author: Jonathan Hurley 
Authored: Tue Oct 10 15:42:30 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Oct 11 09:08:27 2017 -0400

--
 .../server/checks/AbstractCheckDescriptor.java  |  81 +++--
 .../ambari/server/checks/CheckDescription.java  |   8 ++
 .../RequiredServicesInRepositoryCheck.java  |  91 +++
 .../ambari/server/checks/UpgradeCheck.java  |  11 ++
 .../ClusterStackVersionResourceProvider.java|  26 +
 .../ambari/server/state/RepositoryType.java |  18 +++
 .../server/state/repository/StackPackage.java   |  69 +++
 .../state/repository/VersionDefinitionXml.java  |  87 ++
 .../HDP/2.0.6/properties/stack_packages.json|   6 +-
 .../checks/AbstractCheckDescriptorTest.java |   3 +
 .../checks/AutoStartDisabledCheckTest.java  |  12 +-
 .../checks/ClientRetryPropertyCheckTest.java|   2 +
 .../checks/ComponentExistsInRepoCheckTest.java  |   2 +
 .../checks/ComponentsInstallationCheckTest.java |   3 +
 .../checks/ConfigurationMergeCheckTest.java |   2 +
 .../checks/DruidHighAvailabilityCheckTest.java  |   2 +
 .../checks/HiveMultipleMetastoreCheckTest.java  |   3 +
 .../checks/HiveNotRollingWarningTest.java   |   3 +
 .../server/checks/HostsHeartbeatCheckTest.java  |   2 +
 .../checks/HostsMasterMaintenanceCheckTest.java |   5 +-
 .../checks/HostsRepositoryVersionCheckTest.java |   2 +
 .../server/checks/InstallPackagesCheckTest.java |   2 +
 .../server/checks/KafkaKerberosCheckTest.java   |   2 +
 ...duce2JobHistoryStatePreservingCheckTest.java |   2 +
 .../server/checks/RangerAuditDbCheckTest.java   |   3 +
 .../server/checks/RangerPasswordCheckTest.java  |   3 +
 .../server/checks/RangerSSLConfigCheckTest.java |   3 +
 .../RequiredServicesInRepositoryCheckTest.java  | 116 +++
 .../SecondaryNamenodeDeletedCheckTest.java  |   3 +
 .../ServicesMaintenanceModeCheckTest.java   |   2 +
 ...vicesMapReduceDistributedCacheCheckTest.java |   3 +
 ...rvicesNamenodeHighAvailabilityCheckTest.java |   3 +
 .../ServicesNamenodeTruncateCheckTest.java  |   2 +
 .../ServicesTezDistributedCacheCheckTest.java   |   3 +
 .../server/checks/ServicesUpCheckTest.java  |   2 +
 .../ServicesYarnWorkPreservingCheckTest.java|   2 +
 .../server/checks/StormShutdownWarningTest.java |   3 +
 .../ambari/server/state/CheckHelperTest.java|   7 ++
 38 files changed, 588 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c19f363c/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
index 6726d30..478489d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/checks/AbstractCheckDescriptor.java
@@ -35,6 +35,7 @@ import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
 import org.apache.ambari.server.state.DesiredConfig;
+import org.apache.ambari.server.state.RepositoryType;
 import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.repository.ClusterVersionSummary;
 import org.apache.ambari.server.state.repository.VersionDefinitionXml;
@@ -44,11 +45,11 @@ import 
org.apache.ambari.server.state.stack.PrerequisiteCheck;
 import org.apache.ambari.server.state.stack.UpgradePack;
 import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
 import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Lists;
+import com.google.gson.Gson;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
@@ -57,8 +58,6 @@ import com.google.inject.Provider;
  */
 public abstract class AbstractCheckDescriptor {
 
-  private static final Logger LOG = 
LoggerFactory.getLogger(AbstractCheckDescriptor.class);
-
   

[24/50] [abbrv] ambari git commit: AMBARI-22199.Zeppelin start fails due to permission denied error during kinit(Venkata Sairam)

[rlevas]

AMBARI-22199.Zeppelin start fails due to permission denied error during 
kinit(Venkata Sairam)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 33d67f3ead24fcda4fcdb7d5920ccc76d1743657
Parents: 7e885a3
Author: Venkata Sairam 
Authored: Wed Oct 11 14:46:39 2017 +0530
Committer: Venkata Sairam 
Committed: Wed Oct 11 14:46:39 2017 +0530

--
 .../ZEPPELIN/0.7.0/package/scripts/master.py|  48 ---
 .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py| 140 ---
 2 files changed, 147 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/33d67f3e/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index d615d06..09944bd 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -192,8 +192,7 @@ class Master(Script):
   notebook_directory = "/user/" + format("{zeppelin_user}") + "/" + \

params.config['configurations']['zeppelin-config']['zeppelin.notebook.dir']
 
-
-if self.is_path_exists_in_HDFS(notebook_directory, params.zeppelin_user):
+if not self.is_path_exists_in_HDFS(notebook_directory, 
params.zeppelin_user):
   # hdfs dfs -mkdir {notebook_directory}
   params.HdfsResource(format("{notebook_directory}"),
   type="directory",
@@ -231,14 +230,14 @@ class Master(Script):
 Execute(("chown", "-R", format("{zeppelin_user}") + ":" + 
format("{zeppelin_group}"),
  os.path.join(params.zeppelin_dir, "notebook")), sudo=True)
 
+if params.security_enabled:
+  zeppelin_kinit_cmd = format("{kinit_path_local} -kt 
{zeppelin_kerberos_keytab} {zeppelin_kerberos_principal}; ")
+  Execute(zeppelin_kinit_cmd, user=params.zeppelin_user)
+
 if 'zeppelin.notebook.storage' in 
params.config['configurations']['zeppelin-config'] \
 and 
params.config['configurations']['zeppelin-config']['zeppelin.notebook.storage'] 
== 'org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo':
   self.check_and_copy_notebook_in_hdfs(params)
 
-if params.security_enabled:
-zeppelin_kinit_cmd = format("{kinit_path_local} -kt 
{zeppelin_kerberos_keytab} {zeppelin_kerberos_principal}; ")
-Execute(zeppelin_kinit_cmd, user=params.zeppelin_user)
-
 zeppelin_spark_dependencies = self.get_zeppelin_spark_dependencies()
 if zeppelin_spark_dependencies and 
os.path.exists(zeppelin_spark_dependencies[0]):
   self.create_zeppelin_dir(params)
@@ -292,14 +291,17 @@ class Master(Script):
 if params.version and check_stack_feature(StackFeature.ROLLING_UPGRADE, 
format_stack_version(params.version)):
   stack_select.select_packages(params.version)
 
-  def getZeppelinConfFS(self, params):
-hdfs_interpreter_config = 
params.config['configurations']['zeppelin-config']['zeppelin.config.fs.dir'] + 
"/interpreter.json"
+  def get_zeppelin_conf_FS_directory(self, params):
+hdfs_interpreter_config = 
params.config['configurations']['zeppelin-config']['zeppelin.config.fs.dir']
 
 if not hdfs_interpreter_config.startswith("/"):
   hdfs_interpreter_config = "/user/" + format("{zeppelin_user}") + "/" + 
hdfs_interpreter_config
 
 return hdfs_interpreter_config
 
+  def get_zeppelin_conf_FS(self, params):
+return self.get_zeppelin_conf_FS_directory(params) + "/interpreter.json"
+
   def is_path_exists_in_HDFS(self, path, as_user):
 kinit_path_local = 
get_kinit_path(default('/configurations/kerberos-env/executable_search_paths', 
None))
 kinit_if_needed = format("{kinit_path_local} -kt 
{zeppelin_kerberos_keytab} {zeppelin_kerberos_principal};")
@@ -325,17 +327,15 @@ class Master(Script):
   and 
params.config['configurations']['zeppelin-config']['zeppelin.notebook.storage'] 
== 'org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo':
 
   if 'zeppelin.config.fs.dir' in 
params.config['configurations']['zeppelin-config']:
-zeppelin_conf_fs = self.getZeppelinConfFS(params)
+zeppelin_conf_fs = self.get_zeppelin_conf_FS(params)
 
 if self.is_path_exists_in_HDFS(zeppelin_conf_fs, params.zeppelin_user):
   

[07/50] [abbrv] ambari git commit: AMBARI-22138. When regenerating keytab files for a service, non-service-specific principals are affected (rlevas)

[rlevas]

AMBARI-22138. When regenerating keytab files for a service, 
non-service-specific principals are affected (rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 5af1e539cce928b32fc5aca67c7bf8dbc2bd3c2e
Parents: b0c24a5
Author: Robert Levas 
Authored: Mon Oct 9 13:06:13 2017 -0400
Committer: Robert Levas 
Committed: Mon Oct 9 13:06:19 2017 -0400

--
 .../server/controller/KerberosHelper.java   |   9 +-
 .../server/controller/KerberosHelperImpl.java   | 244 ---
 .../utilities/RemovableIdentities.java  |   2 +-
 .../kerberos/CreateKeytabFilesServerAction.java |   2 +-
 .../kerberos/CreatePrincipalsServerAction.java  |   2 +-
 .../kerberos/KerberosServerAction.java  |  71 --
 .../PrepareDisableKerberosServerAction.java |   3 +-
 .../PrepareEnableKerberosServerAction.java  |   6 +-
 .../PrepareKerberosIdentitiesServerAction.java  | 142 ---
 .../kerberos/AbstractKerberosDescriptor.java|  25 ++
 .../AbstractKerberosDescriptorContainer.java|  18 +-
 .../kerberos/KerberosIdentityDescriptor.java| 160 
 .../server/controller/KerberosHelperTest.java   |   5 -
 .../utilities/KerberosIdentityCleanerTest.java  |   8 +-
 .../state/kerberos/KerberosDescriptorTest.java  | 150 +++-
 15 files changed, 665 insertions(+), 182 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5af1e539/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
index 20c5708..b8e1be1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
@@ -442,12 +442,6 @@ public interface KerberosHelper {
* @param hostFilter a set of hostname indicating the set of 
hosts to process -
*   if null, no filter is relevant; if empty, 
the filter
*   indicates no relevant hosts
-   * @param identityFilter a Collection of identity names indicating 
the relevant
-   *   identities - if null, no filter is 
relevant; if empty,
-   *   the filter indicates no relevant identities
-   * @param shouldProcessCommand   a Command implementation to determine if 
the relevant component
-   *   is in a state in which is should be process 
for the current
-   *   Kerberos operation.
* @return a list of ServiceComponentHost instances and should be processed 
during the relevant
* Kerberos operation.
* @throws AmbariException
@@ -455,8 +449,7 @@ public interface KerberosHelper {
   List getServiceComponentHostsToProcess(Cluster cluster,

KerberosDescriptor kerberosDescriptor,
Map serviceComponentFilter,
-   
Collection hostFilter, Collection identityFilter,
-   
Command shouldProcessCommand)
+   
Collection hostFilter)
   throws AmbariException;
 
   Set getHostsWithValidKerberosClient(Cluster cluster) throws 
AmbariException;

http://git-wip-us.apache.org/repos/asf/ambari/blob/5af1e539/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index b691968..f8fe31a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -122,6 +122,7 @@ import 
org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
 import org.apache.ambari.server.state.kerberos.VariableReplacementHelper;
 import 

[35/50] [abbrv] ambari git commit: AMBARI-22202 : Hive View 2.0 in Ambari 2.5.1 does not use the specified YARN queue when using the "Upload Table" feature. (nitirajrathore)

[rlevas]

AMBARI-22202 : Hive View 2.0 in Ambari 2.5.1 does not use the specified YARN 
queue when using the "Upload Table" feature. (nitirajrathore)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 5de82da3b293a0306d796d79960af45bc7c88372
Parents: 85fb356
Author: Nitiraj Singh Rathore 
Authored: Thu Oct 12 12:45:56 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Thu Oct 12 12:47:12 2017 +0530

--
 .../view/hive20/resources/browser/DDLProxy.java | 154 +--
 .../hive20/resources/uploads/UploadService.java |  12 +-
 .../uploads/query/InsertFromQueryInput.java |  13 +-
 .../databases/database/tables/upload-table.js   |  12 ++
 4 files changed, 140 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5de82da3/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLProxy.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLProxy.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLProxy.java
index 77857f9..6d793d3 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLProxy.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/browser/DDLProxy.java
@@ -19,6 +19,7 @@
 package org.apache.ambari.view.hive20.resources.browser;
 
 import com.google.common.base.Function;
+import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
@@ -54,6 +55,8 @@ import 
org.apache.ambari.view.hive20.resources.jobs.viewJobs.Job;
 import org.apache.ambari.view.hive20.resources.jobs.viewJobs.JobController;
 import org.apache.ambari.view.hive20.resources.jobs.viewJobs.JobImpl;
 import 
org.apache.ambari.view.hive20.resources.jobs.viewJobs.JobResourceManager;
+import org.apache.ambari.view.hive20.resources.settings.Setting;
+import 
org.apache.ambari.view.hive20.resources.settings.SettingsResourceManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,11 +76,13 @@ public class DDLProxy {
 
   private final ViewContext context;
   private final TableMetaParserImpl tableMetaParser;
+  private SettingsResourceManager settingsResourceManager;
 
   @Inject
-  public DDLProxy(ViewContext context, TableMetaParserImpl tableMetaParser) {
+  public DDLProxy(ViewContext context, TableMetaParserImpl tableMetaParser, 
SettingsResourceManager settingsResourceManager) {
 this.context = context;
 this.tableMetaParser = tableMetaParser;
+this.settingsResourceManager = settingsResourceManager;
 LOG.info("Creating DDLProxy");
   }
 
@@ -130,15 +135,19 @@ public class DDLProxy {
   }
 
   public Job getColumnStatsJob(final String databaseName, final String 
tableName, final String columnName,
- JobResourceManager resourceManager) throws 
ServiceException {
+   JobResourceManager resourceManager) throws 
ServiceException {
 FetchColumnStatsQueryGenerator queryGenerator = new 
FetchColumnStatsQueryGenerator(databaseName, tableName,
-  columnName);
+columnName);
 Optional q = queryGenerator.getQuery();
 String jobTitle = "Fetch column stats for " + databaseName + "." + 
tableName + "." + columnName;
-if(q.isPresent()) {
+if (q.isPresent()) {
   String query = q.get();
+  Optional settingsString = generateSettingsString();
+  if (settingsString.isPresent()) {
+query = settingsString.get() + query;
+  }
   return createJob(databaseName, query, jobTitle, resourceManager);
-}else{
+} else {
   throw new ServiceException("Failed to generate job for {}" + jobTitle);
 }
   }
@@ -228,32 +237,56 @@ public class DDLProxy {
   tableMeta.setDatabase(databaseName);
 }
 Optional createTableQuery = new 
CreateTableQueryGenerator(tableMeta).getQuery();
-if(createTableQuery.isPresent()) {
+if (createTableQuery.isPresent()) {
   LOG.info("generated create table query : {}", createTableQuery);
   return createTableQuery.get();
-}else {
+} else {
   throw new ServiceException("could not generate create table query for 
database : " + databaseName + " table : " + tableMeta.getTable());
 }
   }
 
   public Job createTable(String databaseName, TableMeta tableMeta, 
JobResourceManager resourceManager) 

[33/50] [abbrv] ambari git commit: AMBARI-22211. RU was not started on Oracle due to missing table (ncole)

[rlevas]

AMBARI-22211. RU was not started on Oracle due to missing table (ncole)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: c10019736972825c8b60a82c42cfe5713ddbe073
Parents: 323974e
Author: Nate Cole 
Authored: Wed Oct 11 15:44:03 2017 -0400
Committer: Nate Cole 
Committed: Wed Oct 11 15:44:03 2017 -0400

--
 .../src/main/resources/Ambari-DDL-Oracle-CREATE.sql  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c1001973/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
--
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index 02f6e3e..ebe5f12 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -846,12 +846,12 @@ CREATE TABLE upgrade_item (
 );
 
 CREATE TABLE upgrade_history(
-  id BIGINT NOT NULL,
-  upgrade_id BIGINT NOT NULL,
+  id NUMBER(19) NOT NULL,
+  upgrade_id NUMBER(19) NOT NULL,
   service_name VARCHAR2(255) NOT NULL,
   component_name VARCHAR2(255) NOT NULL,
-  from_repo_version_id BIGINT NOT NULL,
-  target_repo_version_id BIGINT NOT NULL,
+  from_repo_version_id NUMBER(19) NOT NULL,
+  target_repo_version_id NUMBER(19) NOT NULL,
   CONSTRAINT PK_upgrade_hist PRIMARY KEY (id),
   CONSTRAINT FK_upgrade_hist_upgrade_id FOREIGN KEY (upgrade_id) REFERENCES 
upgrade (upgrade_id),
   CONSTRAINT FK_upgrade_hist_from_repo FOREIGN KEY (from_repo_version_id) 
REFERENCES repo_version (repo_version_id),

[40/50] [abbrv] ambari git commit: AMBARI-22214.Livy protocol to be set to https in Zeppelin's interpreter setting(Venkata Sairam)

[rlevas]

AMBARI-22214.Livy protocol to be set to https in Zeppelin's interpreter 
setting(Venkata Sairam)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 3c3b1b810ee05490fe2fe370de6132ba31bf8b72
Parents: b86f53f
Author: Venkata Sairam 
Authored: Thu Oct 12 17:05:12 2017 +0530
Committer: Venkata Sairam 
Committed: Thu Oct 12 17:05:12 2017 +0530

--
 .../common-services/ZEPPELIN/0.7.0/package/scripts/master.py   | 6 --
 .../common-services/ZEPPELIN/0.7.0/package/scripts/params.py   | 6 ++
 2 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c3b1b81/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index 09944bd..eaa2cb9 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -530,14 +530,16 @@ class Master(Script):
 
   elif interpreter['group'] == 'livy' and interpreter['name'] == 'livy':
 if params.livy_livyserver_host:
-  interpreter['properties']['zeppelin.livy.url'] = "http://; + 
params.livy_livyserver_host + \
+  interpreter['properties']['zeppelin.livy.url'] = 
params.livy_livyserver_protocol + \
+   "://" + 
params.livy_livyserver_host + \
":" + 
params.livy_livyserver_port
 else:
   del interpreter_settings[setting_key]
 
   elif interpreter['group'] == 'livy' and interpreter['name'] == 'livy2':
 if params.livy2_livyserver_host:
-  interpreter['properties']['zeppelin.livy.url'] = "http://; + 
params.livy2_livyserver_host + \
+  interpreter['properties']['zeppelin.livy.url'] = 
params.livy2_livyserver_protocol + \
+   "://" + 
params.livy2_livyserver_host + \
":" + 
params.livy2_livyserver_port
 else:
   del interpreter_settings[setting_key]

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c3b1b81/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/params.py
index 3242f26..b7d3df0 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/params.py
@@ -219,17 +219,23 @@ livy2_hosts = 
default("/clusterHostInfo/livy2_server_hosts", [])
 
 livy_livyserver_host = None
 livy_livyserver_port = None
+livy_livyserver_protocol = 'http'
 livy2_livyserver_host = None
 livy2_livyserver_port = None
+livy2_livyserver_protocol = 'http'
 if stack_version_formatted and check_stack_feature(StackFeature.SPARK_LIVY, 
stack_version_formatted) and \
 len(livy_hosts) > 0:
   livy_livyserver_host = str(livy_hosts[0])
   livy_livyserver_port = 
config['configurations']['livy-conf']['livy.server.port']
+  if 'livy.keystore' in config['configurations']['livy-conf']:
+livy_livyserver_protocol = 'https'
 
 if stack_version_formatted and check_stack_feature(StackFeature.SPARK_LIVY2, 
stack_version_formatted) and \
 len(livy2_hosts) > 0:
   livy2_livyserver_host = str(livy2_hosts[0])
   livy2_livyserver_port = 
config['configurations']['livy2-conf']['livy.server.port']
+  if 'livy.keystore' in config['configurations']['livy2-conf']:
+livy2_livyserver_protocol = 'https'
 
 hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
 security_enabled = config['configurations']['cluster-env']['security_enabled']

[01/50] [abbrv] ambari git commit: AMBARI-22089. Hive View 2.0 - Unable to update existing saved queries, view creates new records under saved queries tab (pallavkul)

[rlevas]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-20859 e1699b092 -> 77d40577b


AMBARI-22089. Hive View 2.0 - Unable to update existing saved queries, view 
creates new records under saved queries tab (pallavkul)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: beef96d413d4986cb0cc11c317d11d5a181da14c
Parents: fc80a18
Author: pallavkul 
Authored: Mon Oct 9 21:17:35 2017 +0530
Committer: pallavkul 
Committed: Mon Oct 9 21:17:35 2017 +0530

--
 .../savedQueries/SavedQueryResourceManager.java | 17 --
 .../savedQueries/SavedQueryService.java | 46 +++
 .../resources/ui/app/routes/queries/query.js| 60 ++--
 .../resources/ui/app/services/saved-queries.js  | 21 +++
 .../hive20/src/main/resources/ui/yarn.lock  |  2 +-
 5 files changed, 98 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/beef96d4/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java
index 3690683..fff202c 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryResourceManager.java
@@ -115,12 +115,17 @@ public class SavedQueryResourceManager extends 
PersonalCRUDResourceManagerhttp://git-wip-us.apache.org/repos/asf/ambari/blob/beef96d4/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryService.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryService.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryService.java
index 7139ce8..35382f9 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryService.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/savedQueries/SavedQueryService.java
@@ -83,36 +83,36 @@ public class SavedQueryService extends BaseService {
   @Path("{queryId}")
   @Produces(MediaType.APPLICATION_JSON)
   public Response getOne(@PathParam("queryId") String queryId,
-@QueryParam("op") String operation) {
+ @QueryParam("op") String operation) {
 try {
-  final SavedQuery savedQuery = getResourceManager().read(queryId);
-  if(operation.equals("download")) {
-   StreamingOutput stream = new StreamingOutput() {
-   @Override
-   public void write(OutputStream os) throws IOException, 
WebApplicationException {
- Writer writer = new BufferedWriter(new OutputStreamWriter(os));
- try { 
+  final SavedQuery savedQuery = getResourceManager().read(queryId);
+  if(operation!= null && operation.equals("download")) {
+  StreamingOutput stream = new StreamingOutput() {
+  @Override
+  public void write(OutputStream os) throws IOException, 
WebApplicationException {
+Writer writer = new BufferedWriter(new OutputStreamWriter(os));
+try {
 BufferedReader br=new BufferedReader(new 
InputStreamReader(getSharedObjectsFactory().getHdfsApi().open(savedQuery.getQueryFile(;
-   String line;
-   line=br.readLine();
-   while (line != null){
- writer.write(line+"\n");  
- line = br.readLine();
+  String line;
+  line=br.readLine();
+  while (line != null){
+writer.write(line+"\n");
+line = br.readLine();
 }
 writer.flush();
- } catch (InterruptedException e) {
-   e.printStackTrace();
- } finally {
-   writer.close();
- }
-   }
-   };
-   return Response.ok(stream).
+} catch (InterruptedException e) {
+  e.printStackTrace();
+} finally {
+  writer.close();
+}
+  }
+  };
+  return Response.ok(stream).
type(MediaType.TEXT_PLAIN).
-  build();
+ 

[13/50] [abbrv] ambari git commit: AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)

[rlevas]

AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: e037a8d7194ac97da9f746e52eb53cf15ba2415f
Parents: 3b8e807
Author: Andrew Onishuk 
Authored: Tue Oct 10 14:30:13 2017 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 10 14:30:13 2017 +0300

--
 .../libraries/script/script.py  | 45 ++--
 .../stacks/2.0.6/HBASE/test_hbase_master.py |  2 +
 .../src/test/python/stacks/utils/RMFTestCase.py |  4 +-
 3 files changed, 37 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e037a8d7/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index d5b4469..4282213 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -501,6 +501,7 @@ class Script(object):
   Script.stack_version_from_distro_select = 
pkg_provider.get_installed_package_version(
   
stack_tools.get_stack_tool_package(stack_tools.STACK_SELECTOR_NAME))
 
+
 return Script.stack_version_from_distro_select
 
 
@@ -525,22 +526,20 @@ class Script(object):
 """
 This function replaces ${stack_version} placeholder with actual version.  
If the package
 version is passed from the server, use that as an absolute truth.
-
+
 :param name name of the package
 :param repo_version actual version of the repo currently installing
 """
-stack_version_package_formatted = ""
+if not STACK_VERSION_PLACEHOLDER in name:
+  return name
 
-if not repo_version:
-  repo_version = self.get_stack_version_before_packages_installed()
+stack_version_package_formatted = ""
 
 package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
 
 # repositoryFile is the truth
 # package_version should be made to the form W_X_Y_Z_
 package_version = default("repositoryFile/repoVersion", None)
-if package_version is not None:
-  package_version = package_version.replace('.', 
package_delimiter).replace('-', package_delimiter)
 
 # TODO remove legacy checks
 if package_version is None:
@@ -550,6 +549,17 @@ class Script(object):
 if package_version is None:
   package_version = default("hostLevelParams/package_version", None)
 
+package_version = None
+if (package_version is None or '-' not in package_version) and 
default('/repositoryFile', None):
+  self.load_available_packages()
+  package_name = self.get_package_from_available(name, 
self.available_packages_in_repos)
+  if package_name is None:
+raise Fail("Cannot match package for regexp name {0}. Available 
packages: {1}".format(name, self.available_packages_in_repos))
+  return package_name
+
+if package_version is not None:
+  package_version = package_version.replace('.', 
package_delimiter).replace('-', package_delimiter)
+
 # The cluster effective version comes down when the version is known after 
the initial
 # install.  In that case we should not be guessing which version when 
invoking INSTALL, but
 # use the supplied version to build the package_version
@@ -568,6 +578,7 @@ class Script(object):
 
 # Wildcards cause a lot of troubles with installing packages, if the 
version contains wildcards we try to specify it.
 if not package_version or '*' in package_version:
+  repo_version = self.get_stack_version_before_packages_installed()
   stack_version_package_formatted = repo_version.replace('.', 
package_delimiter).replace('-', package_delimiter) if STACK_VERSION_PLACEHOLDER 
in name else name
 
 package_name = name.replace(STACK_VERSION_PLACEHOLDER, 
stack_version_package_formatted)
@@ -760,6 +771,19 @@ class Script(object):
 """
 self.install_packages(env)
 
+  def load_available_packages(self):
+if self.available_packages_in_repos:
+  return self.available_packages_in_repos
+
+
+pkg_provider = get_provider("Package")   
+try:
+  available_packages_in_repos = 
pkg_provider.get_available_packages_in_repos(self.get_config()['repositoryFile']['repositories'])
+except Exception as err:
+  Logger.exception("Unable to load available 

[10/50] [abbrv] ambari git commit: Revert "Revert "AMBARI-21205 Make ToggleKerberos and AddDeleteService experimental features (Duc Le via rzang)""

[rlevas]

Revert "Revert "AMBARI-21205 Make ToggleKerberos and AddDeleteService 
experimental features (Duc Le via rzang)""

This reverts commit 7e0fe2913619f4b70097e3ebcd7fb89e84eee62d.


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 4242225ca6aa89512886bcc74eb5c49e65bd259c
Parents: 0ca8513
Author: Jaimin Jetly 
Authored: Mon Oct 9 13:03:49 2017 -0700
Committer: Jaimin Jetly 
Committed: Mon Oct 9 13:04:36 2017 -0700

--
 ambari-web/app/config.js|  6 ++--
 ambari-web/app/routes/add_service_routes.js |  2 +-
 ambari-web/app/routes/main.js   |  2 +-
 .../app/templates/main/admin/kerberos.hbs   | 34 +++-
 .../main/service/all_services_actions.hbs   |  6 ++--
 ambari-web/app/views/main/admin.js  | 14 
 .../main/admin/stack_upgrade/services_view.js   |  2 +-
 ambari-web/app/views/main/menu.js   | 16 +
 ambari-web/app/views/main/service/item.js   |  2 +-
 .../admin/stack_upgrade/services_view_test.js   |  1 +
 10 files changed, 49 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4242225c/ambari-web/app/config.js
--
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index ba1b75d..0963f70 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -86,9 +86,11 @@ App.supports = {
   addingNewRepository: false,
   kerberosStackAdvisor: true,
   logCountVizualization: false,
-  manageJournalNode: true,
   createAlerts: false,
-  enabledWizardForHostOrderedUpgrade: true
+  enabledWizardForHostOrderedUpgrade: true,
+  manageJournalNode: true,
+  enableToggleKerberos: true,
+  enableAddDeleteServices: true
 };
 
 if (App.enableExperimental) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/4242225c/ambari-web/app/routes/add_service_routes.js
--
diff --git a/ambari-web/app/routes/add_service_routes.js 
b/ambari-web/app/routes/add_service_routes.js
index 1615f0d..75b3586 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -24,7 +24,7 @@ module.exports = App.WizardRoute.extend({
   route: '/service/add',
 
   enter: function (router) {
-if (App.isAuthorized('SERVICE.ADD_DELETE_SERVICES')) {
+if (App.isAuthorized('SERVICE.ADD_DELETE_SERVICES') && 
App.supports.enableAddDeleteServices) {
   // `getSecurityStatus` call is required to retrieve information related 
to kerberos type: Manual or automated kerberos
   
router.get('mainController').isLoading.call(router.get('clusterController'),'isClusterNameLoaded').done(function
 () {
 
App.router.get('mainAdminKerberosController').getSecurityStatus().always(function
 () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/4242225c/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 30cc8aa..7ed18de 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -460,7 +460,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 
   route: '/kerberos',
   enter: function (router, transition) {
-if (router.get('loggedIn') && 
!App.isAuthorized('CLUSTER.TOGGLE_KERBEROS')) {
+if (router.get('loggedIn') && 
(!App.isAuthorized('CLUSTER.TOGGLE_KERBEROS') || 
!App.supports.enableToggleKerberos)) {
   router.transitionTo('main.dashboard.index');
 }
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/4242225c/ambari-web/app/templates/main/admin/kerberos.hbs
--
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs 
b/ambari-web/app/templates/main/admin/kerberos.hbs
index e7bb618..2b41122 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -20,20 +20,22 @@
 
   {{t admin.security.enabled}}
 {{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
-  {{t 
admin.kerberos.button.disable}} 
-  {{#unless isManualKerberos}}
-
-   {{t 
admin.kerberos.button.regenerateKeytabs}}
-{{#if App.isCredentialStorePersistent}}
-  {{t 
admin.kerberos.credentials.store.menu.label}}
+{{#if App.supports.enableToggleKerberos}}
+  {{t 

[29/50] [abbrv] ambari git commit: AMBARI-22206. Downgrade UI shown Null when on Patch revert (alexantonenko)

[rlevas]

AMBARI-22206. Downgrade UI shown Null when on Patch revert (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 734156756c1f8b35f6af0a4c8d9669e61daa8042
Parents: 08bdd80
Author: Alex Antonenko 
Authored: Wed Oct 11 19:02:28 2017 +0300
Committer: Alex Antonenko 
Committed: Wed Oct 11 19:02:28 2017 +0300

--
 .../app/controllers/main/admin/stack_and_upgrade_controller.js   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/73415675/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 29e0687..2f0cb68 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
@@ -2147,9 +2147,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 });
 this.loadRepoVersionsToModel().done(function () {
   var toVersion = 
App.RepositoryVersion.find().findProperty('repositoryVersion', 
lastUpgradeData.Upgrade.associated_version);
-  if (!isDowngrade) {
-self.setDBProperty('upgradeVersion', toVersion && 
toVersion.get('displayName'));
-  }
+  self.setDBProperty('upgradeVersion', toVersion && 
toVersion.get('displayName'));
   self.initDBProperties();
   self.loadUpgradeData(true);
 });

[08/50] [abbrv] ambari git commit: Revert "AMBARI-21205 Make ToggleKerberos and AddDeleteService experimental features (Duc Le via rzang)"

[rlevas]

Revert "AMBARI-21205 Make ToggleKerberos and AddDeleteService experimental 
features (Duc Le via rzang)"

This reverts commit 57bb1365e414c1f110d2d142fa198fb8e043af95.


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 7e0fe2913619f4b70097e3ebcd7fb89e84eee62d
Parents: 5af1e53
Author: Jaimin Jetly 
Authored: Mon Oct 9 11:26:04 2017 -0700
Committer: Jaimin Jetly 
Committed: Mon Oct 9 11:26:04 2017 -0700

--
 ambari-web/app/config.js|  6 ++--
 ambari-web/app/routes/add_service_routes.js |  2 +-
 ambari-web/app/routes/main.js   |  2 +-
 .../app/templates/main/admin/kerberos.hbs   | 34 +---
 .../main/service/all_services_actions.hbs   |  6 ++--
 ambari-web/app/views/main/admin.js  | 14 
 .../main/admin/stack_upgrade/services_view.js   |  2 +-
 ambari-web/app/views/main/menu.js   | 16 -
 ambari-web/app/views/main/service/item.js   |  2 +-
 .../admin/stack_upgrade/services_view_test.js   |  1 -
 10 files changed, 36 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7e0fe291/ambari-web/app/config.js
--
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 0963f70..ba1b75d 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -86,11 +86,9 @@ App.supports = {
   addingNewRepository: false,
   kerberosStackAdvisor: true,
   logCountVizualization: false,
-  createAlerts: false,
-  enabledWizardForHostOrderedUpgrade: true,
   manageJournalNode: true,
-  enableToggleKerberos: true,
-  enableAddDeleteServices: true
+  createAlerts: false,
+  enabledWizardForHostOrderedUpgrade: true
 };
 
 if (App.enableExperimental) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e0fe291/ambari-web/app/routes/add_service_routes.js
--
diff --git a/ambari-web/app/routes/add_service_routes.js 
b/ambari-web/app/routes/add_service_routes.js
index 75b3586..1615f0d 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -24,7 +24,7 @@ module.exports = App.WizardRoute.extend({
   route: '/service/add',
 
   enter: function (router) {
-if (App.isAuthorized('SERVICE.ADD_DELETE_SERVICES') && 
App.supports.enableAddDeleteServices) {
+if (App.isAuthorized('SERVICE.ADD_DELETE_SERVICES')) {
   // `getSecurityStatus` call is required to retrieve information related 
to kerberos type: Manual or automated kerberos
   
router.get('mainController').isLoading.call(router.get('clusterController'),'isClusterNameLoaded').done(function
 () {
 
App.router.get('mainAdminKerberosController').getSecurityStatus().always(function
 () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e0fe291/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 7ed18de..30cc8aa 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -460,7 +460,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 
   route: '/kerberos',
   enter: function (router, transition) {
-if (router.get('loggedIn') && 
(!App.isAuthorized('CLUSTER.TOGGLE_KERBEROS') || 
!App.supports.enableToggleKerberos)) {
+if (router.get('loggedIn') && 
!App.isAuthorized('CLUSTER.TOGGLE_KERBEROS')) {
   router.transitionTo('main.dashboard.index');
 }
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/7e0fe291/ambari-web/app/templates/main/admin/kerberos.hbs
--
diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs 
b/ambari-web/app/templates/main/admin/kerberos.hbs
index 2b41122..e7bb618 100644
--- a/ambari-web/app/templates/main/admin/kerberos.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos.hbs
@@ -20,22 +20,20 @@
 
   {{t admin.security.enabled}}
 {{#isAuthorized "CLUSTER.TOGGLE_KERBEROS"}}
-{{#if App.supports.enableToggleKerberos}}
-  {{t 
admin.kerberos.button.disable}} 
-  {{#unless isManualKerberos}}
-
-   {{t 
admin.kerberos.button.regenerateKeytabs}}
-{{#if App.isCredentialStorePersistent}}
-  {{t 
admin.kerberos.credentials.store.menu.label}}
-

[39/50] [abbrv] ambari git commit: AMBARI-22213. "ambari-server upgrade" failed on db schema [Upgrade] (dlysnichenko)

[rlevas]

AMBARI-22213. "ambari-server upgrade" failed on db schema [Upgrade] 
(dlysnichenko)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: b86f53fbe1c940811c3e49d658aad870d1dd53da
Parents: a8caac3
Author: Lisnichenko Dmitro 
Authored: Thu Oct 12 13:57:24 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Thu Oct 12 13:58:23 2017 +0300

--
 .../apache/ambari/server/orm/DBAccessorImpl.java| 16 
 1 file changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b86f53fb/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 26670fc..faa58f2 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -1551,8 +1551,12 @@ public class DBAccessorImpl implements DBAccessor {
*/
   @Override
   public void clearTable(String tableName) throws SQLException {
-String sqlQuery = "DELETE FROM " + convertObjectName(tableName);
-executeQuery(sqlQuery);
+if (tableExists(tableName)){
+  String sqlQuery = "DELETE FROM " + convertObjectName(tableName);
+  executeQuery(sqlQuery);
+} else {
+  LOG.warn("{} table doesn't exists, skipping", tableName);
+}
   }
 
   /**
@@ -1564,7 +1568,11 @@ public class DBAccessorImpl implements DBAccessor {
*/
   @Override
   public void clearTableColumn(String tableName, String columnName, Object 
value) throws SQLException {
-String sqlQuery = String.format("UPDATE %s SET %s = ?", 
convertObjectName(tableName), convertObjectName(columnName));
-executePreparedUpdate(sqlQuery, value);
+if (tableExists(tableName)){
+  String sqlQuery = String.format("UPDATE %s SET %s = ?", 
convertObjectName(tableName), convertObjectName(columnName));
+  executePreparedUpdate(sqlQuery, value);
+} else {
+  LOG.warn("{} table doesn't exists, skipping", tableName);
+}
   }
 }

[43/50] [abbrv] ambari git commit: AMBARI-22218 Log Search UI generated by maven build uses mock data instead of real API. (ababiichuk)

[rlevas]

AMBARI-22218 Log Search UI generated by maven build uses mock data instead of 
real API. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 527e45d50f2a6faebd7cf842297aa37ef53f8b16
Parents: 68df85d
Author: ababiichuk 
Authored: Thu Oct 12 15:54:31 2017 +0300
Committer: ababiichuk 
Committed: Thu Oct 12 17:15:32 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/527e45d5/ambari-logsearch/ambari-logsearch-web/package.json
--
diff --git a/ambari-logsearch/ambari-logsearch-web/package.json 
b/ambari-logsearch/ambari-logsearch-web/package.json
index f8525c4..2c6aa8d 100644
--- a/ambari-logsearch/ambari-logsearch-web/package.json
+++ b/ambari-logsearch/ambari-logsearch-web/package.json
@@ -6,7 +6,7 @@
 "ng": "ng",
 "start": "webpack-dev-server --port=4200",
 "build": "webpack",
-"build-prod": "NODE_ENV='production' webpack -p",
+"build-prod": "NODE_ENV=production webpack -p",
 "test": "karma start ./karma.conf.js",
 "lint": "ng lint",
 "e2e": "protractor ./protractor.conf.js",

http://git-wip-us.apache.org/repos/asf/ambari/blob/527e45d5/ambari-logsearch/ambari-logsearch-web/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-web/pom.xml 
b/ambari-logsearch/ambari-logsearch-web/pom.xml
index a0621d9..953f0df 100644
--- a/ambari-logsearch/ambari-logsearch-web/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-web/pom.xml
@@ -76,6 +76,9 @@
 
 generate-resources
 
+  
+production
+  
   
   -p

[26/50] [abbrv] ambari git commit: AMBARI-22203. ZKFC start failed due to hadoop-hdfs-zkfc is not supported (aonishuk)

[rlevas]

AMBARI-22203. ZKFC start failed due to hadoop-hdfs-zkfc is not supported 
(aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 8ec33db0803a7c7a7ef51b87e98bc610c9c72196
Parents: aeb1865
Author: Andrew Onishuk 
Authored: Wed Oct 11 15:57:51 2017 +0300
Committer: Andrew Onishuk 
Committed: Wed Oct 11 15:57:51 2017 +0300

--
 .../resources/stacks/HDP/2.0.6/properties/stack_packages.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8ec33db0/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
index 2db0a74..8f685f6 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
@@ -360,6 +360,7 @@
 },
 "ZKFC": {
   "STACK-SELECT-PACKAGE": "hadoop-hdfs-zkfc",
+  "LEGACY": "hadoop-client",
   "INSTALL": [
 "hadoop-hdfs-zkfc"
   ],
@@ -367,7 +368,7 @@
 "hadoop-hdfs-zkfc"
   ],
   "STANDARD": [
-"hadoop-hdfs-zkfc"
+"hadoop-client"
   ]
 }
   },

[38/50] [abbrv] ambari git commit: AMBARI-22131 Move resources/stacks/HDP/3.0/widgets.json to resources/widgets.json (additional patch) (dsen)

[rlevas]

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


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: a8caac375a66911ffb13f38093731158238177ec
Parents: c3f6ba7
Author: Dmytro Sen 
Authored: Thu Oct 12 13:54:07 2017 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 12 13:54:07 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/a8caac37/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 37283fa..cbf11c5 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -397,6 +397,11 @@
   /var/lib/ambari-server/resources
 
 
+  755
+  src/main/resources/widgets.json
+  /var/lib/ambari-server/resources
+
+
   644
   src/main/resources/slider_resources/README.txt
   /var/lib/ambari-server/resources/apps

[03/50] [abbrv] ambari git commit: Revert "AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)"

[rlevas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c4626b/ambari-server/bin/src/main/resources/Ambari-DDL-AzureDB-CREATE.sql
--
diff --git a/ambari-server/bin/src/main/resources/Ambari-DDL-AzureDB-CREATE.sql 
b/ambari-server/bin/src/main/resources/Ambari-DDL-AzureDB-CREATE.sql
deleted file mode 100644
index b54132c..000
--- a/ambari-server/bin/src/main/resources/Ambari-DDL-AzureDB-CREATE.sql
+++ /dev/null
@@ -1,2147 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License") you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Schema population script for $(AMBARIDBNAME)
-
-Use this script in sqlcmd mode, setting the environment variables like this:
-set AMBARIDBNAME=ambari
-
-sqlcmd -S localhost\SQLEXPRESS -i 
C:\app\ambari-server-1.3.0-SNAPSHOT\resources\Ambari-DDL-SQLServer-CREATE.sql
-*/
-
-
---create the database--
-
---create tables and grant privileges to db user-
-IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = OBJECT_ID('stack') 
AND type = 'U')
-BEGIN
-CREATE TABLE stack(
-  stack_id BIGINT NOT NULL,
-  stack_name VARCHAR(255) NOT NULL,
-  stack_version VARCHAR(255) NOT NULL,
-  CONSTRAINT PK_stack PRIMARY KEY CLUSTERED (stack_id),
-  CONSTRAINT UQ_stack UNIQUE (stack_name, stack_version))
-END
-
-
-IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('extension') AND type = 'U')
-BEGIN
-CREATE TABLE extension(
-  extension_id BIGINT NOT NULL,
-  extension_name VARCHAR(255) NOT NULL,
-  extension_version VARCHAR(255) NOT NULL,
-  CONSTRAINT PK_extension PRIMARY KEY CLUSTERED (extension_id),
-  CONSTRAINT UQ_extension UNIQUE (extension_name, extension_version))
-END
-
-
-IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('extensionlink') AND type = 'U')
-BEGIN
-CREATE TABLE extensionlink(
-  link_id BIGINT NOT NULL,
-  stack_id BIGINT NOT NULL,
-  extension_id BIGINT NOT NULL,
-  CONSTRAINT PK_extensionlink PRIMARY KEY CLUSTERED (link_id),
-  CONSTRAINT FK_extensionlink_stack_id FOREIGN KEY (stack_id) REFERENCES 
stack(stack_id),
-  CONSTRAINT FK_extensionlink_extension_id FOREIGN KEY (extension_id) 
REFERENCES extension(extension_id),
-  CONSTRAINT UQ_extension_link UNIQUE (stack_id, extension_id))
-END
-
-
-IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('adminresourcetype') AND type = 'U')
-BEGIN
-CREATE TABLE adminresourcetype (
-  resource_type_id INTEGER NOT NULL,
-  resource_type_name VARCHAR(255) NOT NULL,
-  CONSTRAINT PK_adminresourcetype PRIMARY KEY CLUSTERED (resource_type_id)
-  )
-END
-
-
-IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('adminresource') AND type = 'U')
-BEGIN
-CREATE TABLE adminresource (
-  resource_id BIGINT NOT NULL,
-  resource_type_id INTEGER NOT NULL,
-  CONSTRAINT PK_adminresource PRIMARY KEY CLUSTERED (resource_id),
-  CONSTRAINT FK_resource_resource_type_id FOREIGN KEY (resource_type_id) 
REFERENCES adminresourcetype(resource_type_id))
-END
-
-
-IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('clusters') AND type = 'U')
-BEGIN
-CREATE TABLE clusters (
-  cluster_id BIGINT NOT NULL,
-  resource_id BIGINT NOT NULL,
-  upgrade_id BIGINT,
-  cluster_info VARCHAR(255) NOT NULL,
-  cluster_name VARCHAR(100) NOT NULL UNIQUE,
-  provisioning_state VARCHAR(255) NOT NULL DEFAULT 'INIT',
-  security_type VARCHAR(32) NOT NULL DEFAULT 'NONE',
-  desired_cluster_state VARCHAR(255) NOT NULL,
-  desired_stack_id BIGINT NOT NULL,
-  CONSTRAINT PK_clusters PRIMARY KEY CLUSTERED (cluster_id),
-  CONSTRAINT FK_clusters_desired_stack_id FOREIGN KEY (desired_stack_id) 
REFERENCES stack(stack_id),
-  CONSTRAINT FK_clusters_resource_id FOREIGN KEY (resource_id) REFERENCES 
adminresource(resource_id))
-END
-
-
-IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('clusterconfig') AND type = 'U')
-BEGIN
-CREATE TABLE clusterconfig (
-  config_id BIGINT NOT NULL,
-  version_tag VARCHAR(255) NOT NULL,
-  version BIGINT NOT NULL,
-  type_name VARCHAR(255) NOT NULL,
-  cluster_id BIGINT NOT NULL,
-  stack_id BIGINT NOT NULL,
-  selected SMALLINT NOT NULL DEFAULT 0,
-  config_data VARCHAR(MAX) NOT NULL,
-  config_attributes VARCHAR(MAX),
-  create_timestamp BIGINT NOT NULL,
-  unmapped SMALLINT NOT 

[45/50] [abbrv] ambari git commit: AMBARI-22224. host and hostname built-in variables are not populated when performing Kerberos-related operations (rlevas)

[rlevas]

AMBARI-4. host and hostname built-in variables are not populated when 
performing Kerberos-related operations (rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 0f76c7f9d642bced5c89e0a25986c12c89213912
Parents: d88d3cc
Author: Robert Levas 
Authored: Thu Oct 12 15:49:57 2017 -0400
Committer: Robert Levas 
Committed: Thu Oct 12 15:49:57 2017 -0400

--
 .../ambari/server/controller/KerberosHelperImpl.java  |  2 +-
 .../kerberos/AbstractPrepareKerberosServerAction.java | 14 ++
 .../upgrades/PreconfigureKerberosAction.java  | 13 +
 .../AbstractPrepareKerberosServerActionTest.java  |  5 +
 4 files changed, 33 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0f76c7f9/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index f8fe31a..4f14614 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -1644,7 +1644,7 @@ public class KerberosHelperImpl implements KerberosHelper 
{
 // Calculate the current host-specific configurations. These will 
be used to replace
 // variables within the Kerberos descriptor data
 Map> configurations = 
calculateConfigurations(cluster,
-hostname.equals(ambariServerHostname) ? null : hostname,
+hostname,
 kerberosDescriptor,
 false,
 false);

http://git-wip-us.apache.org/repos/asf/ambari/blob/0f76c7f9/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
index 3db844a..7948a60 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/AbstractPrepareKerberosServerAction.java
@@ -40,6 +40,7 @@ import 
org.apache.ambari.server.state.kerberos.KerberosDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
 import org.apache.ambari.server.utils.StageUtils;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -141,6 +142,19 @@ public abstract class AbstractPrepareKerberosServerAction 
extends KerberosServer
   if (serviceDescriptor != null) {
 List serviceIdentities = 
serviceDescriptor.getIdentities(true, filterContext);
 
+if (!StringUtils.isEmpty(hostName)) {
+  // Update the configurations with the relevant hostname
+  Map generalProperties = 
currentConfigurations.get("");
+  if (generalProperties == null) {
+generalProperties = new HashMap<>();
+currentConfigurations.put("", generalProperties);
+  }
+
+  // Add the current hostname under "host" and "hostname"
+  generalProperties.put("host", hostName);
+  generalProperties.put("hostname", hostName);
+}
+
 // Add service-level principals (and keytabs)
 kerberosHelper.addIdentities(kerberosIdentityDataFileWriter, 
serviceIdentities,
 identityFilter, hostName, serviceName, componentName, 
kerberosConfigurations, currentConfigurations, excludeHeadless);

http://git-wip-us.apache.org/repos/asf/ambari/blob/0f76c7f9/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/PreconfigureKerberosAction.java
 

[49/50] [abbrv] ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

[rlevas]

AMBARI-6. RU: Downgrade is failed ZKFC (ncole)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 20faae7a3647943b61e46f41ce27da81e91dc519
Parents: 3a0d168
Author: Nate Cole 
Authored: Fri Oct 13 08:42:12 2017 -0400
Committer: Nate Cole 
Committed: Fri Oct 13 09:19:08 2017 -0400

--
 .../upgrades/FinalizeUpgradeAction.java | 21 ++--
 1 file changed, 10 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/20faae7a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index d6876d9..87ea1fc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -271,7 +271,7 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 errors.size())).append(System.lineSeparator());
 
 for (InfoTuple error : errors) {
-  messageBuff.append(String.format("%s: $s (current = %s, desired = %s 
", error.hostName,
+  messageBuff.append(String.format("%s: %s (current = %s, desired = 
%s)", error.hostName,
   error.componentName, error.currentVersion, error.targetVersion));
 
   messageBuff.append(System.lineSeparator());
@@ -367,23 +367,22 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 Set errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set servicesParticipating = upgradeContext.getSupportedServices();
 for (String serviceName : servicesParticipating) {
   Service service = cluster.getService(serviceName);
-  String targetVersion = upgradeContext.getTargetVersion(serviceName);
+  RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getTargetRepositoryVersion(serviceName);
+  StackId targetStackId = repositoryVersionEntity.getStackId();
+  String targetVersion = repositoryVersionEntity.getVersion();
 
   for (ServiceComponent serviceComponent : 
service.getServiceComponents().values()) {
-for (ServiceComponentHost serviceComponentHost : 
serviceComponent.getServiceComponentHosts().values()) {
-  ComponentInfo componentInfo = 
ambariMetaInfo.getComponent(targetStackId.getStackName(),
-  targetStackId.getStackVersion(), service.getName(), 
serviceComponent.getName());
+ComponentInfo componentInfo = 
ambariMetaInfo.getComponent(targetStackId.getStackName(),
+targetStackId.getStackVersion(), service.getName(), 
serviceComponent.getName());
 
-  if (!componentInfo.isVersionAdvertised()) {
-continue;
-  }
+if (!componentInfo.isVersionAdvertised()) {
+  continue;
+}
 
+for (ServiceComponentHost serviceComponentHost : 
serviceComponent.getServiceComponentHosts().values()) {
   if (!StringUtils.equals(targetVersion, 
serviceComponentHost.getVersion())) {
 errors.add(new InfoTuple(service.getName(), 
serviceComponent.getName(),
 serviceComponentHost.getHostName(), 
serviceComponentHost.getVersion(),

[05/50] [abbrv] ambari git commit: AMBARI-22159. Replace hostgroup vars for Druid

[rlevas]

AMBARI-22159. Replace hostgroup vars for Druid


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 75465a83bd743bb3a2fa74acf30cfca4d0a2287c
Parents: f1c4626
Author: Attila Doroszlai 
Authored: Mon Oct 9 14:40:02 2017 +0200
Committer: Attila Doroszlai 
Committed: Mon Oct 9 18:39:22 2017 +0200

--
 .../BlueprintConfigurationProcessor.java| 81 +++-
 .../BlueprintConfigurationProcessorTest.java| 32 
 2 files changed, 92 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/75465a83/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 5a6e2cc..03f84a5 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -32,6 +32,7 @@ import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -1367,11 +1368,56 @@ public class BlueprintConfigurationProcessor {
  ClusterTopology topology);
   }
 
+  private static class HostGroupUpdater implements PropertyUpdater {
+
+public static final PropertyUpdater INSTANCE = new HostGroupUpdater();
+
+@Override
+public String updateForClusterCreate(String propertyName,
+  String origValue,
+  Map> properties,
+  ClusterTopology topology) {
+
+  //todo: getHostStrings
+  Matcher m = HostGroup.HOSTGROUP_REGEX.matcher(origValue);
+  if (m.find()) {
+String hostGroupName = m.group(1);
+
+HostGroupInfo groupInfo = 
topology.getHostGroupInfo().get(hostGroupName);
+if (groupInfo == null) {
+  //todo: this should be validated in configuration validation
+  throw new RuntimeException(
+"Encountered a host group token in configuration which couldn't be 
matched to a host group: "
+  + hostGroupName);
+}
+
+//todo: warn if > hosts
+return origValue.replace(m.group(0), 
groupInfo.getHostNames().iterator().next());
+  }
+
+  return origValue;
+}
+
+@Override
+public Collection getRequiredHostGroups(String propertyName,
+  String origValue,
+  Map> properties,
+  ClusterTopology topology) {
+  //todo: getHostStrings
+  Matcher m = HostGroup.HOSTGROUP_REGEX.matcher(origValue);
+  if (m.find()) {
+String hostGroupName = m.group(1);
+return Collections.singleton(hostGroupName);
+  }
+  return Collections.emptySet();
+}
+  }
+
   /**
* Topology based updater which replaces the original host name of a 
property with the host name
* which runs the associated (master) component in the new cluster.
*/
-  private static class SingleHostTopologyUpdater implements PropertyUpdater {
+  private static class SingleHostTopologyUpdater extends HostGroupUpdater {
 /**
  * Component name
  */
@@ -1402,21 +1448,9 @@ public class BlueprintConfigurationProcessor {
  Map> 
properties,
  ClusterTopology topology)  {
 
-  //todo: getHostStrings
-  Matcher m = HostGroup.HOSTGROUP_REGEX.matcher(origValue);
-  if (m.find()) {
-String hostGroupName = m.group(1);
-
-HostGroupInfo groupInfo = 
topology.getHostGroupInfo().get(hostGroupName);
-if (groupInfo == null) {
-  //todo: this should be validated in configuration validation
-  throw new RuntimeException(
-  "Encountered a host group token in configuration which couldn't 
be matched to a host group: "
-  + hostGroupName);
-}
-
-//todo: warn if > hosts
-return origValue.replace(m.group(0), 
groupInfo.getHostNames().iterator().next());
+  String replacedValue = super.updateForClusterCreate(propertyName, 
origValue, 

[41/50] [abbrv] ambari git commit: AMBARI-22212.Alter logic for storing interpreter.json(Prabhjyot Singh via Venkata Sairam)

[rlevas]

AMBARI-22212.Alter logic for storing interpreter.json(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/be605cbf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be605cbf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be605cbf

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: be605cbfdc977ff927df89fc772b8fbb1f589fce
Parents: 3c3b1b8
Author: Venkata Sairam 
Authored: Thu Oct 12 17:17:07 2017 +0530
Committer: Venkata Sairam 
Committed: Thu Oct 12 17:17:07 2017 +0530

--
 .../ZEPPELIN/0.7.0/package/scripts/master.py| 69 +---
 .../ZEPPELIN/0.7.0/package/scripts/params.py|  5 ++
 .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py| 52 +++
 3 files changed, 44 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/be605cbf/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index eaa2cb9..a8b1b32 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -242,6 +242,17 @@ class Master(Script):
 if zeppelin_spark_dependencies and 
os.path.exists(zeppelin_spark_dependencies[0]):
   self.create_zeppelin_dir(params)
 
+if params.conf_stored_in_hdfs:
+  if not 
self.is_path_exists_in_HDFS(self.get_zeppelin_conf_FS_directory(params), 
params.zeppelin_user):
+# hdfs dfs -mkdir {zeppelin's conf directory}
+params.HdfsResource(self.get_zeppelin_conf_FS_directory(params),
+type="directory",
+action="create_on_execute",
+owner=params.zeppelin_user,
+recursive_chown=True,
+recursive_chmod=True
+)
+
 # if first_setup:
 if not glob.glob(params.conf_dir + "/interpreter.json") and \
   not os.path.exists(params.conf_dir + "/interpreter.json"):
@@ -323,21 +334,16 @@ class Master(Script):
 import json
 
 interpreter_config = os.path.join(params.conf_dir, "interpreter.json")
-if 'zeppelin.notebook.storage' in 
params.config['configurations']['zeppelin-config'] \
-  and 
params.config['configurations']['zeppelin-config']['zeppelin.notebook.storage'] 
== 'org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo':
-
-  if 'zeppelin.config.fs.dir' in 
params.config['configurations']['zeppelin-config']:
-zeppelin_conf_fs = self.get_zeppelin_conf_FS(params)
-
-if self.is_path_exists_in_HDFS(zeppelin_conf_fs, params.zeppelin_user):
-  # copy from hdfs to /etc/zeppelin/conf/interpreter.json
-  kinit_path_local = 
get_kinit_path(default('/configurations/kerberos-env/executable_search_paths',None))
-  kinit_if_needed = format("{kinit_path_local} -kt 
{zeppelin_kerberos_keytab} {zeppelin_kerberos_principal};")
-  shell.call(format("rm {interpreter_config};"
-"{kinit_if_needed} hdfs --config {hadoop_conf_dir} 
dfs -get {zeppelin_conf_fs} {interpreter_config}"),
- user=params.zeppelin_user)
-else:
-  Logger.info(format("{zeppelin_conf_fs} does not exist. Skipping 
upload of DFS."))
+if params.conf_stored_in_hdfs:
+  zeppelin_conf_fs = self.get_zeppelin_conf_FS(params)
+
+  if self.is_path_exists_in_HDFS(zeppelin_conf_fs, params.zeppelin_user):
+# copy from hdfs to /etc/zeppelin/conf/interpreter.json
+kinit_path_local = 
get_kinit_path(default('/configurations/kerberos-env/executable_search_paths',None))
+kinit_if_needed = format("{kinit_path_local} -kt 
{zeppelin_kerberos_keytab} {zeppelin_kerberos_principal};")
+shell.call(format("rm {interpreter_config};"
+  "{kinit_if_needed} hdfs --config {hadoop_conf_dir} 
dfs -get {zeppelin_conf_fs} {interpreter_config}"),
+   user=params.zeppelin_user)
 
 config_content = sudo.read_file(interpreter_config)
 config_data = json.loads(config_content)
@@ -353,28 +359,15 @@ class Master(Script):
  owner=params.zeppelin_user,
  content=json.dumps(config_data, indent=2))
 
-if 'zeppelin.notebook.storage' in 
params.config['configurations']['zeppelin-config'] \
-  and 

[48/50] [abbrv] ambari git commit: AMBARI-22231 Stopping and starting HDFS component in Ambari will result in Namenode to stay in SAFEMODE (dsen)

[rlevas]

AMBARI-22231 Stopping and starting HDFS component in Ambari will result in 
Namenode to stay in SAFEMODE (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 3a0d168c08edf559bc91f3eb76485797f83a6e48
Parents: 8f53bc4
Author: Dmytro Sen 
Authored: Fri Oct 13 15:53:09 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 13 15:53:09 2017 +0300

--
 .../src/main/resources/stacks/HDP/3.0/role_command_order.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3a0d168c/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json 
b/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
index 576910f..223eee5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
+++ b/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
@@ -87,7 +87,7 @@
 "PXF_SERVICE_CHECK-SERVICE_CHECK" : ["PXF-START", 
"HDFS_SERVICE_CHECK-SERVICE_CHECK", "HBASE_SERVICE_CHECK-SERVICE_CHECK", 
"HIVE_SERVICE_CHECK-SERVICE_CHECK"],
 
 "RANGER_ADMIN-START": ["ZOOKEEPER_SERVER-START", "INFRA_SOLR-START"],
-"RANGER_USERSYNC-START" : ["RANGER_ADMIN-START", 
"RANGER_KMS_SERVER-START"],
+"RANGER_USERSYNC-START" : ["RANGER_ADMIN-START"],
 "RANGER_KMS_SERVER-START" : ["RANGER_ADMIN-START"],
 "RANGER_KMS_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_KMS_SERVER-START"],
 "RANGER_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_USERSYNC-START", 
"RANGER_ADMIN-START"],

[22/50] [abbrv] ambari git commit: AMBARI-22137 - Different stack versions should be able to link to different extension versions

[rlevas]

AMBARI-22137 - Different stack versions should be able to link to different 
extension versions


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 03273bdce970a1282d89056aa48dc2ffe3b7b712
Parents: a3a8afc
Author: Tim Thorpe 
Authored: Tue Oct 10 13:54:01 2017 -0700
Committer: Tim Thorpe 
Committed: Tue Oct 10 13:54:01 2017 -0700

--
 .../controller/AmbariManagementHelper.java  |   2 +-
 .../ambari/server/stack/ExtensionHelper.java|  57 ++-
 .../apache/ambari/server/stack/StackModule.java |   4 +
 .../server/stack/StackManagerExtensionTest.java |  31 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |   2 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |   2 +-
 .../stacks_with_extensions/HDP/0.4/metainfo.xml |  22 ++
 .../HDP/0.4/repos/repoinfo.xml  |  63 +++
 .../HDP/0.4/services/HBASE/metainfo.xml |  26 ++
 .../0.4/services/HDFS/configuration/global.xml  | 145 +++
 .../services/HDFS/configuration/hadoop-env.xml  | 223 +++
 .../services/HDFS/configuration/hbase-site.xml  | 137 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  | 199 ++
 .../services/HDFS/configuration/hdfs-site.xml   | 396 +++
 .../HDP/0.4/services/HDFS/metainfo.xml  |  30 ++
 .../0.4/services/HDFS/package/dummy-script.py   |  20 +
 .../HDP/0.4/services/HIVE/metainfo.xml  |  26 ++
 .../HDP/0.4/services/MAPREDUCE/metainfo.xml |  23 ++
 .../HDP/0.4/services/ZOOKEEPER/metainfo.xml |  26 ++
 19 files changed, 1425 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
index 2dd6f12..0c8edfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
@@ -70,7 +70,7 @@ public class AmbariManagementHelper {
*/
   public void createExtensionLink(StackManager stackManager, StackInfo 
stackInfo, ExtensionInfo extensionInfo) throws AmbariException {
 validateCreateExtensionLinkRequest(stackInfo, extensionInfo);
-ExtensionHelper.validateCreateLink(stackInfo, extensionInfo);
+ExtensionHelper.validateCreateLink(stackManager, stackInfo, extensionInfo);
 ExtensionLinkEntity linkEntity = createExtensionLinkEntity(stackInfo, 
extensionInfo);
 stackManager.linkStackToExtension(stackInfo, extensionInfo);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/03273bdc/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
index 86e532a..91dc870 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ExtensionHelper.java
@@ -27,6 +27,8 @@ import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.stack.ExtensionMetainfoXml;
 import org.apache.ambari.server.utils.VersionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An extension version is like a stack version but it contains custom 
services.  Linking an extension
@@ -35,6 +37,8 @@ import org.apache.ambari.server.utils.VersionUtils;
  */
 public class ExtensionHelper {
 
+  private final static Logger LOG = 
LoggerFactory.getLogger(ExtensionHelper.class);
+
   public static void validateDeleteLink(Clusters clusters, StackInfo stack, 
ExtensionInfo extension) throws AmbariException {
 validateNotRequiredExtension(stack, extension);
 validateServicesNotInstalled(clusters, stack, extension);
@@ -62,9 +66,9 @@ public class ExtensionHelper {
 }
   }
 
-  public static void validateCreateLink(StackInfo stack, ExtensionInfo 
extension) throws AmbariException {
+  public static void validateCreateLink(StackManager stackManager, StackInfo 
stack, ExtensionInfo extension) throws AmbariException {
 

[11/50] [abbrv] ambari git commit: AMBARI-22166 - Not able to perform revert after deleting the upgraded service (jonathanhurley)

[rlevas]

AMBARI-22166 - Not able to perform revert after deleting the upgraded service 
(jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 8cffd72227c22da2bc3bad30f1c3e877bd26cad4
Parents: 4242225
Author: Jonathan Hurley 
Authored: Mon Oct 9 13:21:40 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Oct 9 16:40:45 2017 -0400

--
 .../ambari/server/state/UpgradeContext.java | 24 ++--
 .../ambari/server/state/UpgradeContextTest.java | 60 +++-
 2 files changed, 76 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8cffd722/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
index 67a8950..de0f868 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java
@@ -304,8 +304,8 @@ public class UpgradeContext {
 throw new AmbariException(
 String.format("There are no upgrades for cluster %s which are 
marked as revertable",
 cluster.getClusterName()));
-  }  
-  
+  }
+
   if (!revertUpgrade.getOrchestration().isRevertable()) {
 throw new AmbariException(String.format("The %s repository type is not 
revertable",
 revertUpgrade.getOrchestration()));
@@ -323,14 +323,26 @@ public class UpgradeContext {
 revertableUpgrade.getRepositoryVersion().getVersion()));
   }
 
+  // !!! build all service-specific reversions
   Set priors = new HashSet<>();
+  Map clusterServices = cluster.getServices();
   for (UpgradeHistoryEntity history : revertUpgrade.getHistory()) {
+String serviceName = history.getServiceName();
+String componentName = history.getComponentName();
+
 priors.add(history.getFromReposistoryVersion());
 
-// !!! build all service-specific
-m_services.add(history.getServiceName());
-m_sourceRepositoryMap.put(history.getServiceName(), 
history.getTargetRepositoryVersion());
-m_targetRepositoryMap.put(history.getServiceName(), 
history.getFromReposistoryVersion());
+// if the service is no longer installed, do nothing
+if (!clusterServices.containsKey(serviceName)) {
+  LOG.warn("{}/{} will not be reverted since it is no longer installed 
in the cluster",
+  serviceName, componentName);
+
+  continue;
+}
+
+m_services.add(serviceName);
+m_sourceRepositoryMap.put(serviceName, 
history.getTargetRepositoryVersion());
+m_targetRepositoryMap.put(serviceName, 
history.getFromReposistoryVersion());
   }
 
   if (priors.size() != 1) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8cffd722/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
index dc77fa6..5176ffe 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeContextTest.java
@@ -23,6 +23,7 @@ import static junit.framework.Assert.assertTrue;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,6 +112,11 @@ public class UpgradeContextTest extends EasyMockSupport {
   private VersionDefinitionXml m_vdfXml;
 
   /**
+   * The upgrade history to return for the completed upgrade.
+   */
+  private List m_upgradeHistory = new ArrayList<>();
+
+  /**
* The cluster services.
*/
   private Map m_services = new HashMap<>();
@@ -128,7 +134,7 @@ public class UpgradeContextTest extends EasyMockSupport {
 
expect(upgradeHistoryEntity.getServiceName()).andReturn(HDFS_SERVICE_NAME).anyTimes();
 
expect(upgradeHistoryEntity.getFromReposistoryVersion()).andReturn(m_sourceRepositoryVersion).anyTimes();
 

[09/50] [abbrv] ambari git commit: AMBARI-22079. Addendum: Upgrade Yarn version for Logsearch Web (Istvan Tobias via oleewere)

[rlevas]

AMBARI-22079. Addendum: Upgrade Yarn version for Logsearch Web (Istvan Tobias 
via oleewere)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 0ca85137fdf1667e3fddb28c220a6e1f6e88a2ee
Parents: 7e0fe29
Author: Istvan Tobias 
Authored: Mon Oct 9 21:21:52 2017 +0200
Committer: Oliver Szabo 
Committed: Mon Oct 9 21:21:52 2017 +0200

--
 ambari-logsearch/ambari-logsearch-web/pom.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ca85137/ambari-logsearch/ambari-logsearch-web/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-web/pom.xml 
b/ambari-logsearch/ambari-logsearch-web/pom.xml
index d641d5a..a0621d9 100644
--- a/ambari-logsearch/ambari-logsearch-web/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-web/pom.xml
@@ -69,13 +69,16 @@
 
   
   
-generate dist
-generate-resources
+webpack build
 
- yarn
+  webpack
 
+
+generate-resources
 
-  build-prod
+  
+  -p
 
   
   

[30/50] [abbrv] ambari git commit: AMBARI-22188. Make hive server create directories related to replication (echekanskiy)

[rlevas]

AMBARI-22188. Make hive server create directories related to replication 
(echekanskiy)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 4a47e792ae6e4fe4fb67ca80c96c5e2054f7a9cd
Parents: 7341567
Author: Eugene Chekanskiy 
Authored: Wed Oct 11 19:38:41 2017 +0300
Committer: Eugene Chekanskiy 
Committed: Wed Oct 11 19:38:41 2017 +0300

--
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 47 +++
 .../HIVE/0.12.0.2.0/package/scripts/hive.py | 34 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |  4 ++
 .../HIVE/2.1.0.3.0/configuration/hive-site.xml  | 48 
 .../HIVE/2.1.0.3.0/package/scripts/hive.py  | 32 +
 .../2.1.0.3.0/package/scripts/params_linux.py   |  4 ++
 6 files changed, 168 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4a47e792/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 69d1c69..762530b 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
@@ -471,4 +471,51 @@ limitations under the License.
 
 
   
+
+  
+  
+hive.metastore.dml.events
+
+If true, the metastore will be asked to fire events for DML 
operations
+
+  true
+
+
+  
+  
+hive.repl.cm.enabled
+
+Turn on ChangeManager, so delete files will go to 
cmrootdir.
+
+  true
+
+
+  
+  
+hive.metastore.transactional.event.listeners
+
+A comma separated list of Java classes that implement the 
org.apache.hadoop.hive.metastore.MetaStoreEventListener interface. Both the 
metastore event and corresponding listener method will be invoked in the same 
JDO transaction.
+
+  true
+
+
+  
+  
+hive.repl.cmrootdir
+
+Root dir for ChangeManager, used for deleted 
files.
+
+  true
+
+
+  
+  
+hive.repl.rootdir
+
+HDFS root dir for all replication dumps.
+
+  true
+
+
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4a47e792/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index 8e176b6..c4b34a5 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -245,7 +245,22 @@ def setup_hiveserver2():
  owner=params.hive_user,
  group=params.hdfs_user,
  mode=0777) # Hive expects this dir to be writeable by 
everyone as it is used as a temp dir
-
+
+  if params.hive_repl_cmrootdir is not None:
+params.HdfsResource(params.hive_repl_cmrootdir,
+type = "directory",
+action = "create_on_execute",
+owner = params.hive_user,
+group=params.user_group,
+mode = 01777)
+  if params.hive_repl_rootdir is not None:
+params.HdfsResource(params.hive_repl_rootdir,
+type = "directory",
+action = "create_on_execute",
+owner = params.hive_user,
+group=params.user_group,
+mode = 0700)
+
   params.HdfsResource(None, action="execute")
   
 def setup_non_client():
@@ -310,6 +325,23 @@ def setup_metastore():
  create_parents = True,
  mode=0777)
 
+  if params.hive_repl_cmrootdir is not None:
+params.HdfsResource(params.hive_repl_cmrootdir,
+type = "directory",
+action = "create_on_execute",
+owner = params.hive_user,
+group=params.user_group,
+mode = 01777)
+  if 

[12/50] [abbrv] ambari git commit: Revert "AMBARI-22162. Move out the druid configurations from hive-site to hive-interactive-site. (Slim Bouguerra via Swapan Shridhar)."

[rlevas]

Revert "AMBARI-22162. Move out the druid configurations from hive-site to 
hive-interactive-site. (Slim Bouguerra via Swapan Shridhar)."

This reverts commit ce2a0a00921bde8d780c82561902773f76431fce.


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 3b8e807100a988fafc4d55e7a0ad7644fac6cef2
Parents: 8cffd72
Author: Jonathan Hurley 
Authored: Mon Oct 9 16:59:04 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Oct 9 16:59:04 2017 -0400

--
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 217 ++
 .../configuration/hive-interactive-site.xml | 225 ---
 .../stacks/HDP/2.6/services/stack_advisor.py|  12 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |  21 +-
 4 files changed, 234 insertions(+), 241 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3b8e8071/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 69d1c69..d66cf4c 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-site.xml
@@ -451,6 +451,223 @@ limitations under the License.
 
   
 
+  
+  
+hive.druid.broker.address.default
+localhost:8082
+Host name of druid router if any or broker
+
+
+  
+druid-router
+druid.port
+  
+
+  
+
+  
+hive.druid.metadata.uri
+jdbc:mysql://localhost:3355/druid
+URI to connect to the database (for example 
jdbc:mysql://hostname:port/DBName)
+
+
+  
+druid-common
+druid.metadata.storage.connector.connectURI
+  
+
+  
+
+  
+hive.druid.coordinator.address.default
+localhost:8082
+Host name of druid router if any or broker
+
+
+  
+druid-coordinator
+druid.port
+  
+
+  
+
+  
+hive.druid.metadata.password
+{{druid_metadata_password}}
+PASSWORD
+Druid Metadata Password
+Druid meta data storage password
+
+  password
+  true
+
+
+  
+
+   
+hive.druid.metadata.username
+druid
+Username used to connect to druid metadata 
storage
+
+ 
+  
+druid-common
+druid.metadata.storage.connector.user
+  
+
+  
+
+  
+hive.druid.indexer.segments.granularity
+Default Granularity for the Druid segments
+
+  value-list
+  
+
+  YEAR
+
+
+  MONTH
+
+
+  WEEK
+
+
+  DAY
+
+
+  HOUR
+
+
+  MINUTE
+
+
+  SECOND
+
+  
+
+MINUTE
+Default Granularity for the segments created by the Druid 
storage handler, this can be overridden per table using table property 
druid.segment.granularity 
+
+  
+   
+hive.druid.indexer.partition.size.max
+500
+Maximum number of records per segment partition
+
+  
+   
+hive.druid.indexer.memory.rownum.max
+75000
+Maximum number of records in memory while storing data in 
Druid
+
+  
+
+  
+hive.druid.select.distribute
+true
+If it is set to true, we distribute the execution of Druid 
Select queries
+
+
+  boolean
+
+  
+
+  
+hive.druid.basePersistDirectory
+
+
+  Local temporary directory used to persist intermediate indexing state,
+  if empty (recommended) will default to JVM system property 
java.io.tmpdir.
+
+
+  true
+
+
+  
+
+  
+hive.druid.storage.storageDirectory
+{{druid_storage_dir}}
+
+  Druid deep storage location for segments.
+
+
+  
+  
+hive.druid.metadata.db.type
+Druid metadata storage type 
+
+  false
+  value-list
+  
+
+  mysql
+  MYSQL
+
+
+  postgresql
+  POSTGRESQL
+
+  
+
+mysql
+
+  
+druid-common
+druid.metadata.storage.type
+  
+
+Druid metadata storage type
+
+  
+
+  
+hive.druid.passiveWaitTimeMs
+3
+
+  Wait time in ms default to 30 seconds.
+
+
+  
+
+  
+

[50/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-20859

[rlevas]

Merge branch 'trunk' into branch-feature-AMBARI-20859


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 77d40577b11aad4fff56db206897c6ef4c39b1ed
Parents: e1699b0 20faae7
Author: Robert Levas 
Authored: Fri Oct 13 11:10:03 2017 -0400
Committer: Robert Levas 
Committed: Fri Oct 13 11:10:03 2017 -0400

--
 .../resource_management/TestPackageResource.py  |   4 +-
 .../python/resource_management/TestScript.py|  26 +-
 .../core/providers/package/__init__.py  |   4 +-
 .../core/providers/package/apt.py   |  35 +-
 .../core/providers/package/choco.py |   8 +-
 .../core/providers/package/yumrpm.py|   8 +-
 .../core/providers/package/zypper.py|   7 +-
 .../core/resources/packaging.py |  14 +-
 .../libraries/functions/conf_select.py  | 285 +++
 .../libraries/functions/repository_util.py  |   8 +-
 .../libraries/script/script.py  |  90 ++-
 .../ambari-logsearch-web/package.json   |   2 +-
 ambari-logsearch/ambari-logsearch-web/pom.xml   |  14 +-
 .../ambari-logsearch-web/src/app/app.module.ts  |   2 +
 .../accordion-panel.component.less  |   2 +-
 .../src/app/components/app.component.less   |   2 +-
 .../collapsible-panel.component.html|  27 +
 .../collapsible-panel.component.less|  42 +
 .../collapsible-panel.component.spec.ts | 129 +++
 .../collapsible-panel.component.ts  |  89 +++
 .../dropdown-button.component.less  |   2 +-
 .../dropdown-list/dropdown-list.component.less  |   2 +-
 .../filters-panel/filters-panel.component.html  |   2 +-
 .../filters-panel/filters-panel.component.less  |   8 +-
 .../log-file-entry.component.less   |   2 +-
 .../logs-container.component.html   |  14 +-
 .../logs-container.component.spec.ts|   5 +
 .../logs-container/logs-container.component.ts  |  10 +
 .../logs-list/logs-list.component.less  |   2 +-
 .../main-container.component.less   |   2 +-
 .../src/app/components/main.less|  20 +
 .../menu-button/menu-button.component.less  |  18 +-
 .../menu-button/menu-button.component.ts|   5 +-
 .../src/app/components/mixins.less  | 200 +
 .../pagination-controls.component.less  |   2 +-
 .../pagination/pagination.component.less|   4 +-
 .../search-box/search-box.component.less|   2 +-
 .../time-histogram.component.less   |   2 +-
 .../time-range-picker.component.less|   2 +-
 .../components/top-menu/top-menu.component.html |   2 +-
 .../components/top-menu/top-menu.component.less |   2 +-
 .../src/app/components/variables.less   | 123 +--
 .../src/app/services/filtering.service.ts   |  19 +-
 .../src/assets/i18n/en.json |   9 +-
 .../flume/FlumeTimelineMetricsSinkTest.java |  27 +-
 ambari-server/src/main/assemblies/server.xml|  10 +
 .../ambari/server/actionmanager/Stage.java  |   3 +-
 .../server/api/services/AmbariMetaInfo.java |  60 +-
 .../server/checks/AbstractCheckDescriptor.java  |  81 +-
 .../ambari/server/checks/CheckDescription.java  |   8 +
 .../RequiredServicesInRepositoryCheck.java  |  91 +++
 .../ambari/server/checks/UpgradeCheck.java  |  11 +
 .../AmbariCustomCommandExecutionHelper.java |  10 +
 .../AmbariManagementControllerImpl.java |  28 +-
 .../controller/AmbariManagementHelper.java  |   2 +-
 .../server/controller/KerberosHelper.java   |   9 +-
 .../server/controller/KerberosHelperImpl.java   | 252 +++---
 .../ServiceComponentHostResponse.java   |  15 +
 .../server/controller/StackVersionResponse.java |  29 -
 .../BlueprintConfigurationProcessor.java|  87 +-
 .../ClusterStackVersionResourceProvider.java|  31 +-
 .../internal/HostComponentResourceProvider.java |   4 +
 .../internal/ServiceResourceProvider.java   |   8 -
 .../internal/StackArtifactResourceProvider.java |  35 +-
 .../internal/UpgradeResourceProvider.java   |  74 +-
 .../utilities/RemovableIdentities.java  |   2 +-
 .../upgrade/HostVersionOutOfSyncListener.java   |  11 +
 .../ambari/server/metadata/ActionMetadata.java  |   1 +
 .../ambari/server/orm/DBAccessorImpl.java   |  16 +-
 .../server/orm/entities/WidgetLayoutEntity.java |   6 +-
 .../AbstractPrepareKerberosServerAction.java|  14 +
 .../kerberos/CreateKeytabFilesServerAction.java |   2 +-
 .../kerberos/CreatePrincipalsServerAction.java  |   2 +-
 .../kerberos/KerberosServerAction.java  |  71 +-
 

[28/50] [abbrv] ambari git commit: AMBARI-22194 - Prevent Patch Upgrades With Known Service Incompatibilities (part2) (jonathanhurley)

[rlevas]

AMBARI-22194 - Prevent Patch Upgrades With Known Service Incompatibilities 
(part2) (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 08bdd803c51b6a1c7c16d7aa04b6207538f2fd9c
Parents: c19f363
Author: Jonathan Hurley 
Authored: Wed Oct 11 10:24:53 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Oct 11 10:25:25 2017 -0400

--
 .../ambari/server/checks/RequiredServicesInRepositoryCheckTest.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/08bdd803/ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
index 0285c0a..5984871 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/checks/RequiredServicesInRepositoryCheckTest.java
@@ -39,7 +39,6 @@ import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import com.google.common.collect.Sets;
-import com.google.gson.Gson;
 import com.google.inject.Provider;
 
 /**

[16/50] [abbrv] ambari git commit: AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)

[rlevas]

AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: b1295362b9e702dd37bbb3995437d0c4e311ce9f
Parents: cec9f73
Author: Andrew Onishuk 
Authored: Tue Oct 10 16:09:28 2017 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 10 16:09:28 2017 +0300

--
 .../libraries/script/script.py  | 45 ++--
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py  | 10 +++--
 .../2.1.0.2.0/package/scripts/install_params.py |  6 ---
 .../2.1.0.2.0/package/scripts/params_linux.py   |  2 -
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py  | 10 +++--
 .../3.0.0.3.0/package/scripts/install_params.py |  6 ---
 .../3.0.0.3.0/package/scripts/params_linux.py   |  2 -
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py|  6 ++-
 .../4.0.0.2.0/package/scripts/params_linux.py   |  3 --
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py|  5 ++-
 .../4.2.0.3.0/package/scripts/params_linux.py   |  3 --
 .../stacks/2.0.6/HBASE/test_hbase_master.py |  2 +
 .../src/test/python/stacks/utils/RMFTestCase.py |  4 +-
 13 files changed, 56 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b1295362/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index d5b4469..bf8c0dc 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -501,6 +501,7 @@ class Script(object):
   Script.stack_version_from_distro_select = 
pkg_provider.get_installed_package_version(
   
stack_tools.get_stack_tool_package(stack_tools.STACK_SELECTOR_NAME))
 
+
 return Script.stack_version_from_distro_select
 
 
@@ -525,22 +526,20 @@ class Script(object):
 """
 This function replaces ${stack_version} placeholder with actual version.  
If the package
 version is passed from the server, use that as an absolute truth.
-
+
 :param name name of the package
 :param repo_version actual version of the repo currently installing
 """
-stack_version_package_formatted = ""
+if not STACK_VERSION_PLACEHOLDER in name:
+  return name
 
-if not repo_version:
-  repo_version = self.get_stack_version_before_packages_installed()
+stack_version_package_formatted = ""
 
 package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
 
 # repositoryFile is the truth
 # package_version should be made to the form W_X_Y_Z_
 package_version = default("repositoryFile/repoVersion", None)
-if package_version is not None:
-  package_version = package_version.replace('.', 
package_delimiter).replace('-', package_delimiter)
 
 # TODO remove legacy checks
 if package_version is None:
@@ -550,6 +549,17 @@ class Script(object):
 if package_version is None:
   package_version = default("hostLevelParams/package_version", None)
 
+package_version = None
+if (package_version is None or '-' not in package_version) and 
default('/repositoryFile', None):
+  self.load_available_packages()
+  package_name = self.get_package_from_available(name, 
self.available_packages_in_repos)
+  if package_name is None:
+raise Fail("Cannot match package for regexp name {0}. Available 
packages: {1}".format(name, self.available_packages_in_repos))
+  return package_name
+
+if package_version is not None:
+  package_version = package_version.replace('.', 
package_delimiter).replace('-', package_delimiter)
+
 # The cluster effective version comes down when the version is known after 
the initial
 # install.  In that case we should not be guessing which version when 
invoking INSTALL, but
 # use the supplied version to build the package_version
@@ -568,6 +578,7 @@ class Script(object):
 
 # Wildcards cause a lot of troubles with installing packages, if the 
version contains wildcards we try to specify it.
 if not package_version or '*' in package_version:
+  repo_version = self.get_stack_version_before_packages_installed()
   stack_version_package_formatted = repo_version.replace('.', 
package_delimiter).replace('-', package_delimiter) if STACK_VERSION_PLACEHOLDER 
in name else name
 
 

[31/50] [abbrv] ambari git commit: AMBARI-22208 Log Search UI: small fixes for top part of Service Logs page. (Istvan Tobias via ababiichuk)

[rlevas]

AMBARI-22208 Log Search UI: small fixes for top part of Service Logs page. 
(Istvan Tobias via ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 6f598067f7f10b0543a3239884d380546fcdec56
Parents: 4a47e79
Author: Istvan Tobias 
Authored: Wed Oct 11 19:27:37 2017 +0300
Committer: ababiichuk 
Committed: Wed Oct 11 20:07:35 2017 +0300

--
 .../ambari-logsearch-web/src/app/app.module.ts  |   2 +
 .../accordion-panel.component.less  |   2 +-
 .../src/app/components/app.component.less   |   2 +-
 .../collapsible-panel.component.html|  27 +++
 .../collapsible-panel.component.less|  42 
 .../collapsible-panel.component.spec.ts | 129 
 .../collapsible-panel.component.ts  |  89 +
 .../dropdown-button.component.less  |   2 +-
 .../dropdown-list/dropdown-list.component.less  |   2 +-
 .../filters-panel/filters-panel.component.html  |   2 +-
 .../filters-panel/filters-panel.component.less  |   6 +-
 .../log-file-entry.component.less   |   2 +-
 .../logs-container.component.html   |  14 +-
 .../logs-container.component.spec.ts|   5 +
 .../logs-container/logs-container.component.ts  |  10 +
 .../logs-list/logs-list.component.less  |   2 +-
 .../main-container.component.less   |   2 +-
 .../src/app/components/main.less|  20 ++
 .../menu-button/menu-button.component.less  |  18 +-
 .../menu-button/menu-button.component.ts|   5 +-
 .../src/app/components/mixins.less  | 200 +++
 .../pagination-controls.component.less  |   2 +-
 .../pagination/pagination.component.less|   4 +-
 .../search-box/search-box.component.less|   2 +-
 .../time-histogram.component.less   |   2 +-
 .../time-range-picker.component.less|   2 +-
 .../components/top-menu/top-menu.component.html |   2 +-
 .../components/top-menu/top-menu.component.less |   2 +-
 .../src/app/components/variables.less   | 123 +---
 .../src/assets/i18n/en.json |   9 +-
 30 files changed, 591 insertions(+), 140 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6f598067/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
--
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts 
b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
index ff791fe..12b95a7 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
@@ -65,6 +65,7 @@ import {FilterDropdownComponent} from 
'@app/components/filter-dropdown/filter-dr
 import {DropdownListComponent} from 
'@app/components/dropdown-list/dropdown-list.component';
 import {FilterButtonComponent} from 
'@app/components/filter-button/filter-button.component';
 import {AccordionPanelComponent} from 
'@app/components/accordion-panel/accordion-panel.component';
+import {CollapsiblePanelComponent} from 
'@app/components/collapsible-panel/collapsible-panel.component';
 import {LogsListComponent} from 
'@app/components/logs-list/logs-list.component';
 import {DropdownButtonComponent} from 
'@app/components/dropdown-button/dropdown-button.component';
 import {PaginationComponent} from 
'@app/components/pagination/pagination.component';
@@ -115,6 +116,7 @@ export function getXHRBackend(injector: Injector, browser: 
BrowserXhr, xsrf: XSR
 FilterDropdownComponent,
 FilterButtonComponent,
 AccordionPanelComponent,
+CollapsiblePanelComponent,
 LogsListComponent,
 DropdownButtonComponent,
 PaginationComponent,

http://git-wip-us.apache.org/repos/asf/ambari/blob/6f598067/ambari-logsearch/ambari-logsearch-web/src/app/components/accordion-panel/accordion-panel.component.less
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/accordion-panel/accordion-panel.component.less
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/accordion-panel/accordion-panel.component.less
index 8366952..3d083be 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/accordion-panel/accordion-panel.component.less
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/accordion-panel/accordion-panel.component.less
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-@import 

[25/50] [abbrv] ambari git commit: AMBARI-22174. Remove unnecessary Kerberos related properties from BlueprintConfigurationProcessor (magyari_sandor)

[rlevas]

AMBARI-22174. Remove unnecessary Kerberos related properties from 
BlueprintConfigurationProcessor (magyari_sandor)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: aeb1865c95b86980ac31bc9362203f4bd84a027d
Parents: 33d67f3
Author: Sandor Magyari 
Authored: Mon Jan 16 14:30:28 2017 +0100
Committer: Sandor Magyari 
Committed: Wed Oct 11 12:59:55 2017 +0200

--
 .../BlueprintConfigurationProcessor.java|  6 -
 .../BlueprintConfigurationProcessorTest.java| 28 
 2 files changed, 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aeb1865c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 03f84a5..5a7cda0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -2556,7 +2556,6 @@ public class BlueprintConfigurationProcessor {
 multiCoreSiteMap.put("hadoop.proxyuser.yarn.hosts", new 
MultipleHostTopologyUpdater("RESOURCEMANAGER"));
 multiCoreSiteMap.put("hadoop.security.key.provider.path", new 
MultipleHostTopologyUpdater("RANGER_KMS_SERVER", ';', false, false, true));
 multiWebhcatSiteMap.put("templeton.hive.properties", new 
TempletonHivePropertyUpdater());
-multiWebhcatSiteMap.put("templeton.kerberos.principal", new 
MultipleHostTopologyUpdater("WEBHCAT_SERVER"));
 multiHiveSiteMap.put("hive.zookeeper.quorum", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
 
multiHiveSiteMap.put("hive.cluster.delegation.token.store.zookeeper.connectString",
 new MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
 
@@ -2674,9 +2673,6 @@ public class BlueprintConfigurationProcessor {
   oozieStringPropertyUpdaterMap = new HashMap<>();
 }
 oozieStringPropertyUpdaterMap.put("oozie.base.url", new 
SingleHostTopologyUpdater("OOZIE_SERVER"));
-
oozieStringPropertyUpdaterMap.put("oozie.authentication.kerberos.principal", 
new SingleHostTopologyUpdater("OOZIE_SERVER"));
-
oozieStringPropertyUpdaterMap.put("oozie.ha.authentication.kerberos.principal", 
new SingleHostTopologyUpdater("OOZIE_SERVER"));
-
oozieStringPropertyUpdaterMap.put("oozie.service.HadoopAccessorService.kerberos.principal",
 new SingleHostTopologyUpdater("OOZIE_SERVER"));
 singleHostTopologyUpdaters.put("oozie-site", 
oozieStringPropertyUpdaterMap);
 
 multiCoreSiteMap.put("hadoop.proxyuser.oozie.hosts", new 
MultipleHostTopologyUpdater("OOZIE_SERVER"));
@@ -2728,8 +2724,6 @@ public class BlueprintConfigurationProcessor {
 
 // FALCON
 falconStartupPropertiesMap.put("*.broker.url", new 
SingleHostTopologyUpdater("FALCON_SERVER"));
-
falconStartupPropertiesMap.put("*.falcon.service.authentication.kerberos.principal",
 new SingleHostTopologyUpdater("FALCON_SERVER"));
-
falconStartupPropertiesMap.put("*.falcon.http.authentication.kerberos.principal",
 new SingleHostTopologyUpdater("FALCON_SERVER"));
 
 // KAFKA
 kafkaBrokerMap.put("kafka.ganglia.metrics.host", new 
OptionalSingleHostTopologyUpdater("GANGLIA_SERVER"));

http://git-wip-us.apache.org/repos/asf/ambari/blob/aeb1865c/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index d137f2c..22b0e6b 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -897,11 +897,6 @@ public class BlueprintConfigurationProcessorTest extends 
EasyMockSupport {
 assertEquals("Falcon Broker URL property not properly exported",
   createExportedAddress(expectedPortNum, expectedHostGroupName), 

[14/50] [abbrv] ambari git commit: AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)

[rlevas]

 AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: e19db403e8a3320a5b47503e43e2a35277149a3f
Parents: e037a8d
Author: Andrew Onishuk 
Authored: Tue Oct 10 15:32:10 2017 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 10 15:32:10 2017 +0300

--
 .../python/resource_management/libraries/script/script.py |  4 ++--
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py| 10 ++
 .../HDFS/2.1.0.2.0/package/scripts/install_params.py  |  6 --
 .../HDFS/2.1.0.2.0/package/scripts/params_linux.py|  2 --
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py| 10 ++
 .../HDFS/3.0.0.3.0/package/scripts/install_params.py  |  6 --
 .../HDFS/3.0.0.3.0/package/scripts/params_linux.py|  2 --
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py  |  6 --
 .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py   |  3 ---
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py  |  5 +++--
 .../OOZIE/4.2.0.3.0/package/scripts/params_linux.py   |  3 ---
 11 files changed, 21 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e19db403/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 4282213..bf8c0dc 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -778,10 +778,10 @@ class Script(object):
 
 pkg_provider = get_provider("Package")   
 try:
-  available_packages_in_repos = 
pkg_provider.get_available_packages_in_repos(self.get_config()['repositoryFile']['repositories'])
+  self.available_packages_in_repos = 
pkg_provider.get_available_packages_in_repos(self.get_config()['repositoryFile']['repositories'])
 except Exception as err:
   Logger.exception("Unable to load available packages")
-  available_packages_in_repos = []
+  self.available_packages_in_repos = []
 
 
   def install_packages(self, env):

http://git-wip-us.apache.org/repos/asf/ambari/blob/e19db403/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
index e054209..07c7616 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
@@ -25,6 +25,7 @@ from resource_management.core.resources import Package
 from resource_management.core.source import Template
 from resource_management.core.resources.service import ServiceConfig
 from resource_management.libraries.resources.xml_config import XmlConfig
+from resource_management.libraries.functions.get_lzo_packages import 
get_lzo_packages
 import os
 from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
 from ambari_commons import OSConst
@@ -138,10 +139,11 @@ def hdfs(name=None):
content=Template("slaves.j2")
   )
   
-  if params.lzo_enabled and len(params.lzo_packages) > 0:
-  Package(params.lzo_packages,
-  
retry_on_repo_unavailability=params.agent_stack_retry_on_unavailability,
-  retry_count=params.agent_stack_retry_count)
+  if params.lzo_enabled:
+lzo_packages = get_lzo_packages(params.stack_version_unformatted)
+Package(lzo_packages,
+
retry_on_repo_unavailability=params.agent_stack_retry_on_unavailability,
+retry_count=params.agent_stack_retry_count)
   
 def install_snappy():
   import params

http://git-wip-us.apache.org/repos/asf/ambari/blob/e19db403/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/install_params.py
index 

[44/50] [abbrv] ambari git commit: AMBARI-22221. Fix initialization of Druid Script object. (nishantmonu51)

[rlevas]

AMBARI-1. Fix initialization of Druid Script object. (nishantmonu51)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: d88d3cc06f5355802a95db35c26e383502b658c7
Parents: 527e45d
Author: Nishant 
Authored: Thu Oct 12 21:20:11 2017 +0530
Committer: Nishant 
Committed: Thu Oct 12 22:37:26 2017 +0530

--
 .../common-services/DRUID/0.10.1/package/scripts/druid_node.py  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d88d3cc0/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid_node.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid_node.py
 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid_node.py
index 8053dcb..8e1a44f 100644
--- 
a/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid_node.py
+++ 
b/ambari-server/src/main/resources/common-services/DRUID/0.10.1/package/scripts/druid_node.py
@@ -32,6 +32,7 @@ from druid import druid, get_daemon_cmd, getPid
 
 class DruidBase(Script):
   def __init__(self, nodeType=None):
+Script.__init__(self)
 self.nodeType = nodeType
 
   def install(self, env):

[37/50] [abbrv] ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

[rlevas]

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


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: c3f6ba7621963b1086b7d9754d49b8663c7892b5
Parents: 3acfa5c
Author: Dmytro Sen 
Authored: Thu Oct 12 13:52:31 2017 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 12 13:52:31 2017 +0300

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3f6ba76/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 3079d1b..37283fa 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -392,6 +392,11 @@
   /var/lib/ambari-server/resources
 
 
+  755
+  src/main/resources/kerberos.json
+  /var/lib/ambari-server/resources
+
+
   644
   src/main/resources/slider_resources/README.txt
   /var/lib/ambari-server/resources/apps

[42/50] [abbrv] ambari git commit: AMBARI-22207. [Intermittent] While moving master, a manual commands wizard came in between (alexantonenko)

[rlevas]

AMBARI-22207. [Intermittent] While moving master, a manual commands wizard came 
in between (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 68df85d402b047c54f9d0324e7f94b970c5282ee
Parents: be605cb
Author: Alex Antonenko 
Authored: Thu Oct 12 15:53:00 2017 +0300
Committer: Alex Antonenko 
Committed: Thu Oct 12 15:53:00 2017 +0300

--
 .../main/service/reassign/step3_controller.js | 18 ++
 .../app/mixins/wizard/assign_master_components.js |  2 +-
 .../app/templates/main/service/reassign/step3.hbs |  6 +++---
 .../wizard/assign_master_components_test.js   |  2 +-
 4 files changed, 19 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/68df85d4/ambari-web/app/controllers/main/service/reassign/step3_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/service/reassign/step3_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
index c44c4f3..4898b75 100644
--- a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
@@ -268,9 +268,16 @@ App.ReassignMasterWizardStep3Controller = 
Em.Controller.extend({
 
   propertiesToChange: {},
 
-  isSubmitDisabled: 
Em.computed.and('wizardController.isComponentWithReconfiguration', '!isLoaded'),
+  isSubmitDisabled: Em.computed.or('!isLoaded', 'submitButtonClicked'),
+
+  /**
+   * Is Submit-click processing now
+   * @type {bool}
+   */
+  submitButtonClicked: false,
 
   loadStep: function () {
+this.set('submitButtonClicked', false);
 if (this.get('wizardController.isComponentWithReconfiguration')) {
   this.set('isLoaded', false);
   App.ajax.send({
@@ -695,8 +702,11 @@ App.ReassignMasterWizardStep3Controller = 
Em.Controller.extend({
   },
 
   submit: function() {
-
App.get('router.mainAdminKerberosController').getKDCSessionState(function() {
-  App.router.send("next");
-});
+if (!this.get('submitButtonClicked')) {
+  this.set('submitButtonClicked', true);
+  
App.get('router.mainAdminKerberosController').getKDCSessionState(function() {
+App.router.send("next");
+  });
+}
   }
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/68df85d4/ambari-web/app/mixins/wizard/assign_master_components.js
--
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js 
b/ambari-web/app/mixins/wizard/assign_master_components.js
index 84a56f1..c9577f8 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -1195,7 +1195,7 @@ App.AssignMasterComponents = 
Em.Mixin.create(App.HostComponentValidationMixin, A
 }
   },
 
-  nextButtonDisabled: Em.computed.or('App.router.btnClickInProgress', 
'submitDisabled', 'validationInProgress'),
+  nextButtonDisabled: Em.computed.or('App.router.btnClickInProgress', 
'submitDisabled', 'validationInProgress', '!isLoaded'),
 
   /**
* Submit button click handler

http://git-wip-us.apache.org/repos/asf/ambari/blob/68df85d4/ambari-web/app/templates/main/service/reassign/step3.hbs
--
diff --git a/ambari-web/app/templates/main/service/reassign/step3.hbs 
b/ambari-web/app/templates/main/service/reassign/step3.hbs
index 1f6a393..a6e42af 100644
--- a/ambari-web/app/templates/main/service/reassign/step3.hbs
+++ b/ambari-web/app/templates/main/service/reassign/step3.hbs
@@ -64,8 +64,8 @@
 
 
   
- 
{{t common.back}}
-{{t common.deploy}} 
+   {{t 
common.back}}
+  {{t common.deploy}} 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/68df85d4/ambari-web/test/mixins/wizard/assign_master_components_test.js
--
diff --git a/ambari-web/test/mixins/wizard/assign_master_components_test.js 
b/ambari-web/test/mixins/wizard/assign_master_components_test.js
index 635143c..20efb8e 100644
--- a/ambari-web/test/mixins/wizard/assign_master_components_test.js
+++ b/ambari-web/test/mixins/wizard/assign_master_components_test.js
@@ -211,6 +211,6 @@ describe('App.AssignMasterComponents', function () {
   });
 
   App.TestAliases.testAsComputedOr(baseObject.create(),
-'nextButtonDisabled', ['App.router.btnClickInProgress', 'submitDisabled', 
'validationInProgress']);
+

[36/50] [abbrv] ambari git commit: AMBARI-22204 Updating Ranger Admin pre-upgrade task (mugdha)

[rlevas]

AMBARI-22204 Updating Ranger Admin pre-upgrade task (mugdha)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 3acfa5c12708ff00c896943cd44e81b0a9ec85d1
Parents: 5de82da
Author: Mugdha Varadkar 
Authored: Thu Oct 12 14:26:43 2017 +0530
Committer: Mugdha Varadkar 
Committed: Thu Oct 12 14:35:59 2017 +0530

--
 .../0.4.0/package/scripts/ranger_admin.py   | 23 +++
 .../0.4.0/package/scripts/ranger_tagsync.py | 23 +++
 .../1.0.0.3.0/package/scripts/ranger_admin.py   | 24 +++-
 .../1.0.0.3.0/package/scripts/ranger_tagsync.py | 23 +++
 4 files changed, 75 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3acfa5c1/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py
index 848b137..d0a725a 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_admin.py
@@ -20,6 +20,7 @@ limitations under the License.
 from resource_management.core.exceptions import Fail
 from resource_management.libraries.functions.check_process_status import 
check_process_status
 from resource_management.libraries.functions import stack_select
+from resource_management.libraries.functions import upgrade_summary
 from resource_management.libraries.script import Script
 from resource_management.core.resources.system import Execute, File
 from resource_management.core.exceptions import ComponentIsNotRunning
@@ -199,11 +200,25 @@ class RangerAdmin(Script):
 import params
 env.set_params(params)
 
-upgrade_stack = stack_select._get_upgrade_stack()
-if upgrade_stack is None:
-  raise Fail('Unable to determine the stack and stack version')
+orchestration = stack_select.PACKAGE_SCOPE_STANDARD
+summary = upgrade_summary.get_upgrade_summary()
 
-stack_select.select_packages(params.version)
+if summary is not None:
+  orchestration = summary.orchestration
+  if orchestration is None:
+raise Fail("The upgrade summary does not contain an orchestration 
type")
+
+  if orchestration.upper() in stack_select._PARTIAL_ORCHESTRATION_SCOPES:
+orchestration = stack_select.PACKAGE_SCOPE_PATCH
+
+stack_select_packages = stack_select.get_packages(orchestration, 
service_name = "RANGER", component_name = "RANGER_ADMIN")
+if stack_select_packages is None:
+  raise Fail("Unable to get packages for stack-select")
+
+Logger.info("RANGER_ADMIN component will be stack-selected to version {0} 
using a {1} orchestration".format(params.version, orchestration.upper()))
+
+for stack_select_package_name in stack_select_packages:
+  stack_select.select(stack_select_package_name, params.version)
 
   def get_log_folder(self):
 import params

http://git-wip-us.apache.org/repos/asf/ambari/blob/3acfa5c1/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py
index 3aae8ff..b1a1819 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/ranger_tagsync.py
@@ -19,6 +19,7 @@ limitations under the License.
 """
 from resource_management.libraries.script import Script
 from resource_management.libraries.functions import stack_select
+from resource_management.libraries.functions import upgrade_summary
 from resource_management.core.resources.system import Execute, File
 from resource_management.libraries.functions.check_process_status import 
check_process_status
 from resource_management.core.exceptions import ComponentIsNotRunning
@@ -102,11 +103,25 @@ class RangerTagsync(Script):
 import params
 env.set_params(params)
 
-upgrade_stack = stack_select._get_upgrade_stack()
-if upgrade_stack is None:
-  raise Fail('Unable to determine 

[46/50] [abbrv] ambari git commit: AMBARI-22229.Handle upload of interpreter.json to remote storage in Ambari(Prabhjyot Singh via Venkata Sairam)

[rlevas]

AMBARI-9.Handle upload of interpreter.json to remote storage in 
Ambari(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/a8ba5e61
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8ba5e61
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8ba5e61

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: a8ba5e61c50ac92b787d3b2de4cec8d29da92d74
Parents: 0f76c7f
Author: Venkata Sairam 
Authored: Fri Oct 13 15:22:33 2017 +0530
Committer: Venkata Sairam 
Committed: Fri Oct 13 15:22:33 2017 +0530

--
 .../common-services/ZEPPELIN/0.7.0/package/scripts/master.py | 3 ++-
 .../src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py | 8 
 2 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a8ba5e61/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index a8b1b32..6a84d79 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -305,7 +305,8 @@ class Master(Script):
   def get_zeppelin_conf_FS_directory(self, params):
 hdfs_interpreter_config = 
params.config['configurations']['zeppelin-config']['zeppelin.config.fs.dir']
 
-if not hdfs_interpreter_config.startswith("/"):
+# if it doesn't start from "/" or doesn't contains "://" as in hdfs://, 
file://, etc then make it a absolute path
+if not (hdfs_interpreter_config.startswith("/") or '://' in 
hdfs_interpreter_config):
   hdfs_interpreter_config = "/user/" + format("{zeppelin_user}") + "/" + 
hdfs_interpreter_config
 
 return hdfs_interpreter_config

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8ba5e61/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py 
b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
index e5d0240..400350c 100644
--- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
+++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
@@ -342,7 +342,7 @@ class TestZeppelin070(RMFTestCase):
   )
 
 self.assertResourceCalled('HdfsResource',
-  '/user/zeppelin/hdfs:///user/zeppelin/conf',
+  'hdfs:///user/zeppelin/conf',
   security_enabled=False,
   
hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
   keytab=UnknownConfigurationMock(),
@@ -368,7 +368,7 @@ class TestZeppelin070(RMFTestCase):
 
 
 self.assertResourceCalled('HdfsResource',
-  
'/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+  'hdfs:///user/zeppelin/conf/interpreter.json',
   security_enabled=False,
   
hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
   keytab=UnknownConfigurationMock(),
@@ -395,7 +395,7 @@ class TestZeppelin070(RMFTestCase):
   )
 
 self.assertResourceCalled('HdfsResource',
-  
'/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+  'hdfs:///user/zeppelin/conf/interpreter.json',
   security_enabled=False,
   
hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
   keytab=UnknownConfigurationMock(),
@@ -421,7 +421,7 @@ class TestZeppelin070(RMFTestCase):
   group='zeppelin',
   )
 
-self.assertResourceCalled('HdfsResource', 
'/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+self.assertResourceCalled('HdfsResource', 
'hdfs:///user/zeppelin/conf/interpreter.json',
 security_enabled = False,
 hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
 keytab = UnknownConfigurationMock(),

[20/50] [abbrv] ambari git commit: AMBARI-22172. Change log level for ClusterNotFoundException (magyari_sandor)

[rlevas]

AMBARI-22172. Change log level for ClusterNotFoundException (magyari_sandor)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 24c35893b0be52146bc821b6d44eece8fd49c50a
Parents: 2d23e12
Author: Sandor Magyari 
Authored: Tue Oct 10 13:19:39 2017 +0200
Committer: Sandor Magyari 
Committed: Tue Oct 10 17:10:40 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/24c35893/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 8c4888c..b0eb8ac 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
@@ -1126,7 +1126,7 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
 try {
   cluster = clusters.getCluster(request.getClusterName());
 } catch (ClusterNotFoundException e) {
-  LOG.error("Cluster not found ", e);
+  LOG.info(e.getMessage());
   throw new ParentObjectNotFoundException("Parent Cluster resource doesn't 
exist", e);
 }
 

[04/50] [abbrv] ambari git commit: Revert "AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)"

[rlevas]

Revert "AMBARI-22160. hadooplzo package installation failed on devdeploys 
(aonishuk)"

This reverts commit fc80a1837cc613160e3c60cc3290b7e517b5cd45.


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: f1c4626b9b4a6aafc48b71bd7d4e892362af1843
Parents: beef96d
Author: Jonathan Hurley 
Authored: Mon Oct 9 12:22:35 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Oct 9 12:22:35 2017 -0400

--
 .../libraries/script/script.py  |   44 +-
 .../resources/Ambari-DDL-AzureDB-CREATE.sql | 2147 --
 ambari-server/snippet/Snippet.java  |8 -
 .../stacks/2.0.6/HBASE/test_hbase_master.py |2 -
 .../src/test/python/stacks/utils/RMFTestCase.py |4 +-
 5 files changed, 15 insertions(+), 2190 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c4626b/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index cd8fce4..d5b4469 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -501,7 +501,6 @@ class Script(object):
   Script.stack_version_from_distro_select = 
pkg_provider.get_installed_package_version(
   
stack_tools.get_stack_tool_package(stack_tools.STACK_SELECTOR_NAME))
 
-
 return Script.stack_version_from_distro_select
 
 
@@ -526,20 +525,22 @@ class Script(object):
 """
 This function replaces ${stack_version} placeholder with actual version.  
If the package
 version is passed from the server, use that as an absolute truth.
-
+
 :param name name of the package
 :param repo_version actual version of the repo currently installing
 """
-if not STACK_VERSION_PLACEHOLDER in name:
-  return name
-
 stack_version_package_formatted = ""
 
+if not repo_version:
+  repo_version = self.get_stack_version_before_packages_installed()
+
 package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
 
 # repositoryFile is the truth
 # package_version should be made to the form W_X_Y_Z_
 package_version = default("repositoryFile/repoVersion", None)
+if package_version is not None:
+  package_version = package_version.replace('.', 
package_delimiter).replace('-', package_delimiter)
 
 # TODO remove legacy checks
 if package_version is None:
@@ -549,16 +550,6 @@ class Script(object):
 if package_version is None:
   package_version = default("hostLevelParams/package_version", None)
 
-if package_version is None or '-' not in package_version:
-self.load_available_packages()
-package_name = self.get_package_from_available(name, 
self.available_packages_in_repos)
-if package_name is None:
-  raise Fail("Cannot match package for regexp name {0}. Available 
packages: {1}".format(name, self.available_packages_in_repos))
-return package_name
-
-if package_version is not None:
-  package_version = package_version.replace('.', 
package_delimiter).replace('-', package_delimiter)
-
 # The cluster effective version comes down when the version is known after 
the initial
 # install.  In that case we should not be guessing which version when 
invoking INSTALL, but
 # use the supplied version to build the package_version
@@ -577,7 +568,6 @@ class Script(object):
 
 # Wildcards cause a lot of troubles with installing packages, if the 
version contains wildcards we try to specify it.
 if not package_version or '*' in package_version:
-  repo_version = self.get_stack_version_before_packages_installed()
   stack_version_package_formatted = repo_version.replace('.', 
package_delimiter).replace('-', package_delimiter) if STACK_VERSION_PLACEHOLDER 
in name else name
 
 package_name = name.replace(STACK_VERSION_PLACEHOLDER, 
stack_version_package_formatted)
@@ -770,17 +760,6 @@ class Script(object):
 """
 self.install_packages(env)
 
-  def load_available_packages(self):
-if self.available_packages_in_repos:
-  return self.available_packages_in_repos
-
-pkg_provider = get_provider("Package")
-try:
-  self.available_packages_in_repos = 

[17/50] [abbrv] ambari git commit: AMBARI-22178. Install and upgrade options are shown for current and already upgraded stack versions (ncole)

[rlevas]

AMBARI-22178. Install and upgrade options are shown for current and already 
upgraded stack versions (ncole)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 8908d3e05a546cd3dea4bf84d54f087d64ce8b88
Parents: b129536
Author: Nate Cole 
Authored: Tue Oct 10 09:44:20 2017 -0400
Committer: Nate Cole 
Committed: Tue Oct 10 10:18:06 2017 -0400

--
 .../upgrade/HostVersionOutOfSyncListener.java | 11 +++
 .../upgrade/HostVersionOutOfSyncListenerTest.java | 14 +++---
 2 files changed, 18 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8908d3e0/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
index 0be036e..4ce855d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java
@@ -48,6 +48,7 @@ import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ComponentInfo;
 import org.apache.ambari.server.state.RepositoryVersionState;
+import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.StackId;
 import org.slf4j.Logger;
@@ -115,6 +116,10 @@ public class HostVersionOutOfSyncListener {
   List hostVersionEntities =
   hostVersionDAO.get().findByClusterAndHost(cluster.getClusterName(), 
event.getHostName());
 
+  Service service = cluster.getService(event.getServiceName());
+  ServiceComponent serviceComponent = 
service.getServiceComponent(event.getComponentName());
+  RepositoryVersionEntity componentRepo = 
serviceComponent.getDesiredRepositoryVersion();
+
   for (HostVersionEntity hostVersionEntity : hostVersionEntities) {
 StackEntity hostStackEntity = 
hostVersionEntity.getRepositoryVersion().getStack();
 StackId hostStackId = new StackId(hostStackEntity);
@@ -136,6 +141,12 @@ public class HostVersionOutOfSyncListener {
   continue;
 }
 
+// !!! we shouldn't be changing other versions to OUT_OF_SYNC if the 
event
+// component repository doesn't match
+if (!hostVersionEntity.getRepositoryVersion().equals(componentRepo)) {
+  continue;
+}
+
 switch (hostVersionEntity.getState()) {
   case INSTALLED:
   case NOT_REQUIRED:

http://git-wip-us.apache.org/repos/asf/ambari/blob/8908d3e0/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java
index 076190a..24d4f55 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java
@@ -19,6 +19,7 @@
 package org.apache.ambari.server.events.listeners.upgrade;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -335,12 +336,12 @@ public class HostVersionOutOfSyncListenerTest {
 
 for (HostVersionEntity hostVersionEntity : hostVersions) {
   RepositoryVersionEntity repoVersion = 
hostVersionEntity.getRepositoryVersion();
-  if (repoVersion.getVersion().equals(INSTALLED_VERSION) || 
repoVersion.getVersion().equals(INSTALLED_VERSION_2)) {
-if (changedHosts.contains(hostVersionEntity.getHostName())) {
-  assertEquals(hostVersionEntity.getState(), 
RepositoryVersionState.OUT_OF_SYNC);
-} else {
-  assertEquals(hostVersionEntity.getState(), 
RepositoryVersionState.INSTALLED);
-}
+
+  if 

[15/50] [abbrv] ambari git commit: Revert "AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)"

[rlevas]

Revert "AMBARI-22160. hadooplzo package installation failed on devdeploys 
(aonishuk)"

This reverts commit e037a8d7194ac97da9f746e52eb53cf15ba2415f.


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: cec9f73008bb1ec101450e2915fa06c81fe64e56
Parents: e19db40
Author: Andrew Onishuk 
Authored: Tue Oct 10 16:08:14 2017 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 10 16:08:14 2017 +0300

--
 .../libraries/script/script.py  | 45 ++--
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py  | 10 ++---
 .../2.1.0.2.0/package/scripts/install_params.py |  6 +++
 .../2.1.0.2.0/package/scripts/params_linux.py   |  2 +
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py  | 10 ++---
 .../3.0.0.3.0/package/scripts/install_params.py |  6 +++
 .../3.0.0.3.0/package/scripts/params_linux.py   |  2 +
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py|  6 +--
 .../4.0.0.2.0/package/scripts/params_linux.py   |  3 ++
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py|  5 +--
 .../4.2.0.3.0/package/scripts/params_linux.py   |  3 ++
 .../stacks/2.0.6/HBASE/test_hbase_master.py |  2 -
 .../src/test/python/stacks/utils/RMFTestCase.py |  4 +-
 13 files changed, 48 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cec9f730/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index bf8c0dc..d5b4469 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -501,7 +501,6 @@ class Script(object):
   Script.stack_version_from_distro_select = 
pkg_provider.get_installed_package_version(
   
stack_tools.get_stack_tool_package(stack_tools.STACK_SELECTOR_NAME))
 
-
 return Script.stack_version_from_distro_select
 
 
@@ -526,20 +525,22 @@ class Script(object):
 """
 This function replaces ${stack_version} placeholder with actual version.  
If the package
 version is passed from the server, use that as an absolute truth.
-
+
 :param name name of the package
 :param repo_version actual version of the repo currently installing
 """
-if not STACK_VERSION_PLACEHOLDER in name:
-  return name
-
 stack_version_package_formatted = ""
 
+if not repo_version:
+  repo_version = self.get_stack_version_before_packages_installed()
+
 package_delimiter = '-' if OSCheck.is_ubuntu_family() else '_'
 
 # repositoryFile is the truth
 # package_version should be made to the form W_X_Y_Z_
 package_version = default("repositoryFile/repoVersion", None)
+if package_version is not None:
+  package_version = package_version.replace('.', 
package_delimiter).replace('-', package_delimiter)
 
 # TODO remove legacy checks
 if package_version is None:
@@ -549,17 +550,6 @@ class Script(object):
 if package_version is None:
   package_version = default("hostLevelParams/package_version", None)
 
-package_version = None
-if (package_version is None or '-' not in package_version) and 
default('/repositoryFile', None):
-  self.load_available_packages()
-  package_name = self.get_package_from_available(name, 
self.available_packages_in_repos)
-  if package_name is None:
-raise Fail("Cannot match package for regexp name {0}. Available 
packages: {1}".format(name, self.available_packages_in_repos))
-  return package_name
-
-if package_version is not None:
-  package_version = package_version.replace('.', 
package_delimiter).replace('-', package_delimiter)
-
 # The cluster effective version comes down when the version is known after 
the initial
 # install.  In that case we should not be guessing which version when 
invoking INSTALL, but
 # use the supplied version to build the package_version
@@ -578,7 +568,6 @@ class Script(object):
 
 # Wildcards cause a lot of troubles with installing packages, if the 
version contains wildcards we try to specify it.
 if not package_version or '*' in package_version:
-  repo_version = self.get_stack_version_before_packages_installed()
   stack_version_package_formatted = repo_version.replace('.', 
package_delimiter).replace('-', package_delimiter) if STACK_VERSION_PLACEHOLDER 

[19/50] [abbrv] ambari git commit: AMBARI-22186 Navigation style changes. (atkach)

[rlevas]

AMBARI-22186 Navigation style changes. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 2d23e123fd9b514b8c21d973cb0237e8c3dd6b42
Parents: 5768294
Author: Andrii Tkach 
Authored: Tue Oct 10 16:44:35 2017 +0300
Committer: Andrii Tkach 
Committed: Tue Oct 10 18:00:24 2017 +0300

--
 ambari-web/app/styles/common.less   |  1 +
 .../app/styles/theme/bootstrap-ambari.css   | 64 ++--
 ambari-web/app/styles/top-nav.less  | 22 +++
 ambari-web/app/templates/application.hbs| 39 
 ambari-web/app/templates/main/service/item.hbs  |  2 +-
 5 files changed, 96 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2d23e123/ambari-web/app/styles/common.less
--
diff --git a/ambari-web/app/styles/common.less 
b/ambari-web/app/styles/common.less
index ddd4f3a..7753a59 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -71,6 +71,7 @@
 @top-nav-menu-dropdown-border-color: #c3c3c3;
 @top-nav-menu-dropdown-bg-color: #fff;
 @top-nav-menu-dropdown-text-color: #333;
+@top-nav-menu-views-menu-color: #1491c1;
 
 @-webkit-keyframes orangePulse {
   from { background-color: @restart-indicator-color; }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2d23e123/ambari-web/app/styles/theme/bootstrap-ambari.css
--
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css 
b/ambari-web/app/styles/theme/bootstrap-ambari.css
index a223949..70579e7 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -464,7 +464,7 @@ h2.table-title {
 .nav.nav-tabs li a {
   border-width: 0;
   border-radius: 0;
-  border-bottom: 2px solid transparent;
+  border-bottom: 3px solid transparent;
   color: #6B6C6C;
   text-transform: uppercase;
 }
@@ -488,7 +488,7 @@ h2.table-title {
 .nav-tabs-left li,
 .nav-tabs-right li {
   float: none;
-  margin-bottom: 2px;
+  margin-bottom: 3px;
 }
 .nav-tabs-left li a,
 .nav-tabs-right li a {
@@ -498,25 +498,25 @@ h2.table-title {
   margin-right: -1px;
 }
 .nav-tabs-left li a {
-  border: 2px solid transparent !important;
+  border: 3px solid transparent !important;
 }
 .nav-tabs-left li.active a,
 .nav-tabs-left li.active a:hover,
 .nav-tabs-left li.active a:active,
 .nav-tabs-left li.active a:focus {
-  border-right: 2px solid #3FAE2A !important;
+  border-right: 3px solid #3FAE2A !important;
 }
 .nav-tabs-right li {
   margin-left: -1px;
 }
 .nav-tabs-right li a {
-  border: 2px solid transparent !important;
+  border: 3px solid transparent !important;
 }
 .nav-tabs-right li.active a,
 .nav-tabs-right li.active a:hover,
 .nav-tabs-right li.active a:active,
 .nav-tabs-right li.active a:focus {
-  border-left: 2px solid #3FAE2A !important;
+  border-left: 3px solid #3FAE2A !important;
 }
 .wizard {
   border: 2px solid #ebecf1;
@@ -797,8 +797,7 @@ input.radio:checked + label:after {
   cursor: pointer;
   margin-top: 3px;
 }
-.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group:hover span.ambari-header,
-.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group:hover span.toggle-icon {
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group:hover span.ambari-header {
   color: #fff;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group span.ambari-header {
@@ -890,7 +889,7 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a 
.navigation-icon,
 .navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a 
.navigation-icon {
   line-height: 18px;
-  font-size: 14px;
+  font-size: 16px;
   color: #b8bec4;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a 
.toggle-icon,
@@ -904,12 +903,14 @@ input.radio:checked + label:after {
   color: #b8bec4;
   padding: 3px 5px 3px 10px;
 }
-.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
-.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a,
 .navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
 .navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
   padding: 10px 5px 10px 20px;
 }
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a {

[34/50] [abbrv] ambari git commit: AMBARI-22191. Account for merge buffers while calculating druid processing buffer size. (nishantmonu51)

[rlevas]

AMBARI-22191. Account for merge buffers while calculating druid processing 
buffer size. (nishantmonu51)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 85fb356ccd13669359810e767da14d014018bac9
Parents: c100197
Author: Nishant 
Authored: Thu Oct 12 02:58:58 2017 +0530
Committer: Nishant 
Committed: Thu Oct 12 02:58:58 2017 +0530

--
 .../resources/stacks/HDP/2.6/services/stack_advisor.py  |  2 +-
 .../test/python/stacks/2.6/common/test_stack_advisor.py | 12 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/85fb356c/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
index 38af525..94f28db 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
@@ -159,7 +159,7 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
   putComponentProperty('druid.processing.numMergeBuffers', 
numMergeBuffers)
   totalAvailableMemInMb = self.getMinMemory(component_hosts) / 1024
   maxAvailableBufferSizeInMb = 
totalAvailableMemInMb/(processingThreads + numMergeBuffers)
-  putComponentProperty('druid.processing.buffer.sizeBytes', 
self.getDruidProcessingBufferSizeInMb(totalAvailableMemInMb) * 1024 * 1024)
+  putComponentProperty('druid.processing.buffer.sizeBytes', 
self.getDruidProcessingBufferSizeInMb(maxAvailableBufferSizeInMb) * 1024 * 1024)
 
 
   # returns the recommended druid processing buffer size in Mb.

http://git-wip-us.apache.org/repos/asf/ambari/blob/85fb356c/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py
index 1c937b7..ade08c1 100644
--- a/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.6/common/test_stack_advisor.py
@@ -985,7 +985,7 @@ class TestHDP26StackAdvisor(TestCase):
   "href": "/api/v1/hosts/c6402.ambari.apache.org",
   "Hosts": {
 "cpu_count": 1,
-"total_mem": 1922680,
+"total_mem": 622680,
 "disk_info": [
   {"mountpoint": "/"},
   {"mountpoint": "/dev/shm"},
@@ -1091,12 +1091,12 @@ class TestHDP26StackAdvisor(TestCase):
 'properties': {'druid.processing.numThreads': '2',
'druid.server.http.numThreads': '40',
'druid.processing.numMergeBuffers': '2',
-   'druid.processing.buffer.sizeBytes': 
'536870912'}},
+   'druid.processing.buffer.sizeBytes': 
'134217728'}},
 'druid-broker': {
   'properties': {'druid.processing.numThreads': '1',
  'druid.server.http.numThreads': '40',
  'druid.processing.numMergeBuffers': 
'2',
- 'druid.processing.buffer.sizeBytes': 
'268435456'}},
+ 'druid.processing.buffer.sizeBytes': 
'67108864'}},
 'druid-common': {'properties': 
{'druid.extensions.loadList': '[]',
 
'druid.metadata.storage.connector.port': '1527',
 
'druid.metadata.storage.connector.connectURI': 
'jdbc:derby://c6401.ambari.apache.org:1527/druid;create=true',
@@ -1108,7 +1108,7 @@ class TestHDP26StackAdvisor(TestCase):
   
'druid.middlemanager.jvm.heap.memory': {
 'maximum': 
'49152'},
   
'druid.historical.jvm.heap.memory': {'maximum': '3755'},
-  
'druid.broker.jvm.heap.memory': {'maximum': '1877'
+   

[02/50] [abbrv] ambari git commit: Revert "AMBARI-22160. hadooplzo package installation failed on devdeploys (aonishuk)"

[rlevas]

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c4626b/ambari-server/snippet/Snippet.java
--
diff --git a/ambari-server/snippet/Snippet.java 
b/ambari-server/snippet/Snippet.java
deleted file mode 100644
index f13d533..000
--- a/ambari-server/snippet/Snippet.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package snippet;
-
-public class Snippet {
-  public static void main(String[] args) {
-/home/user/ambari/ambari-views/bin/.project
-  }
-}
-

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c4626b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py 
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
index c32044c..2224d31 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_hbase_master.py
@@ -95,9 +95,7 @@ class TestHBaseMaster(RMFTestCase):
  try_install=True,
  os_type=('Redhat', '6.4', 'Final'),
  checked_call_mocks = [(0, "OK.", "")],
- available_packages_in_repos = ['hbase_2_3_0_1_1234'],
  )
-  
 
   # only assert that the correct package is trying to be installed
   self.assertResourceCalled('Package', 'hbase_2_3_0_1_1234',

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1c4626b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
--
diff --git a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py 
b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
index ae33a2a..bff8642 100644
--- a/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
+++ b/ambari-server/src/test/python/stacks/utils/RMFTestCase.py
@@ -80,8 +80,7 @@ class RMFTestCase(TestCase):
 mocks_dict={},
 try_install=False,
 command_args=[],
-log_out_files=False,
-available_packages_in_repos = []):
+log_out_files=False):
 
 norm_path = os.path.normpath(path)
 
@@ -126,7 +125,6 @@ class RMFTestCase(TestCase):
 Script.instance = None
 script_class_inst = RMFTestCase._get_attr(script_module, classname)()
 script_class_inst.log_out_files = log_out_files
-script_class_inst.available_packages_in_repos = 
available_packages_in_repos
 method = RMFTestCase._get_attr(script_class_inst, command)
 except IOError, err:
   raise RuntimeError("Cannot load class %s from %s: %s" % (classname, 
norm_path, err.message))

[06/50] [abbrv] ambari git commit: AMBARI-22155. Intermittent failure of FlumeTimelineMetricsSinkTest

[rlevas]

AMBARI-22155. Intermittent failure of FlumeTimelineMetricsSinkTest


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: b0c24a5153949e4c0cbf70d217276416515c1211
Parents: 75465a8
Author: Attila Doroszlai 
Authored: Mon Oct 9 18:56:36 2017 +0200
Committer: Attila Doroszlai 
Committed: Mon Oct 9 18:57:08 2017 +0200

--
 .../flume/FlumeTimelineMetricsSinkTest.java | 27 
 1 file changed, 17 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b0c24a51/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java
--
diff --git 
a/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java
 
b/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java
index bd4ae6a..99da43f 100644
--- 
a/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java
+++ 
b/ambari-metrics/ambari-metrics-flume-sink/src/test/java/org/apache/hadoop/metrics2/sink/flume/FlumeTimelineMetricsSinkTest.java
@@ -18,17 +18,21 @@
 
 package org.apache.hadoop.metrics2.sink.flume;
 
+import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.anyString;
 import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 import static org.powermock.api.easymock.PowerMock.mockStatic;
 import static org.powermock.api.easymock.PowerMock.replay;
-import static org.powermock.api.easymock.PowerMock.replayAll;
 import static org.powermock.api.easymock.PowerMock.resetAll;
 import static org.powermock.api.easymock.PowerMock.verifyAll;
 
 import java.net.InetAddress;
 import java.util.Collections;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.flume.Context;
 import org.apache.flume.instrumentation.util.JMXPollUtil;
@@ -43,7 +47,7 @@ import 
org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(JMXPollUtil.class)
+@PrepareForTest({JMXPollUtil.class, Executors.class, 
FlumeTimelineMetricsSink.class})
 public class FlumeTimelineMetricsSinkTest {
   @Test
   public void testNonNumericMetricMetricExclusion() throws 
InterruptedException {
@@ -76,7 +80,7 @@ public class FlumeTimelineMetricsSinkTest {
 
flumeTimelineMetricsSink.setMetricsCaches(Collections.singletonMap("SINK",timelineMetricsCache));
 EasyMock.expect(timelineMetricsCache.getTimelineMetric("key1"))
 .andReturn(new TimelineMetric()).once();
-
timelineMetricsCache.putTimelineMetric(EasyMock.anyObject(TimelineMetric.class));
+timelineMetricsCache.putTimelineMetric(anyObject(TimelineMetric.class));
 EasyMock.expectLastCall().once();
 return timelineMetricsCache;
   }
@@ -86,15 +90,18 @@ public class FlumeTimelineMetricsSinkTest {
 FlumeTimelineMetricsSink flumeTimelineMetricsSink = new 
FlumeTimelineMetricsSink();
 TimelineMetricsCache timelineMetricsCache = 
getTimelineMetricsCache(flumeTimelineMetricsSink);
 flumeTimelineMetricsSink.setPollFrequency(1);
-mockStatic(JMXPollUtil.class);
-EasyMock.expect(JMXPollUtil.getAllMBeans()).andReturn(
-Collections.singletonMap("component1", 
Collections.singletonMap("key1", "42"))).once();
-flumeTimelineMetricsSink.start();
-flumeTimelineMetricsSink.stop();
-replay(JMXPollUtil.class, timelineMetricsCache);
+mockStatic(Executors.class);
+ScheduledExecutorService executor = 
createNiceMock(ScheduledExecutorService.class);
+expect(Executors.newSingleThreadScheduledExecutor()).andReturn(executor);
+FlumeTimelineMetricsSink.TimelineMetricsCollector collector = anyObject();
+TimeUnit unit = anyObject();
+expect(executor.scheduleWithFixedDelay(collector, eq(0), eq(1), 
unit)).andReturn(null);
+executor.shutdown();
+replay(timelineMetricsCache, Executors.class, executor);
+
 flumeTimelineMetricsSink.start();
-Thread.sleep(5);
 flumeTimelineMetricsSink.stop();
+
 verifyAll();
   }
 

[21/50] [abbrv] ambari git commit: AMBARI-22176. Remove duplicate kerberos setting for superset (Slim Bouguerra via rlevas)

[rlevas]

AMBARI-22176. Remove duplicate kerberos setting for superset (Slim Bouguerra 
via rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: a3a8afcd62e4c32b9972b2fcdd4744f7d6728e2a
Parents: 24c3589
Author: Slim Bouguerra 
Authored: Tue Oct 10 13:14:19 2017 -0400
Committer: Robert Levas 
Committed: Tue Oct 10 13:14:19 2017 -0400

--
 .../stacks/HDP/2.6/services/DRUID/kerberos.json | 30 
 1 file changed, 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a3a8afcd/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
index 464e420..198c351 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
@@ -35,27 +35,6 @@
   }
 },
 {
-  "name": "superset",
-  "principal": {
-"value": "${druid-env/druid_user}@${realm}",
-"type": "user",
-"configuration": "druid-superset/KERBEROS_PRINCIPAL",
-"local_username": "${druid-env/druid_user}"
-  },
-  "keytab": {
-"file": "${keytab_dir}/superset.headless.keytab",
-"owner": {
-  "name": "${druid-env/druid_user}",
-  "access": "r"
-},
-"group": {
-  "name": "${cluster-env/user_group}",
-  "access": "r"
-},
-"configuration": "druid-superset/KERBEROS_KEYTAB"
-  }
-},
-{
   "name": "druid_smokeuser",
   "reference": "/smokeuser"
 }
@@ -105,15 +84,6 @@
   "reference": "/druid"
 }
   ]
-},
-{
-  "name": "DRUID_SUPERSET",
-  "identities": [
-{
-  "name": "druid_druid_superset_druid",
-  "reference": "/druid"
-}
-  ]
 }
   ],
   "configurations": [

[32/50] [abbrv] ambari git commit: AMBARI-22205 - Install Version Fails On IOP Cluster Due To Missing stack_packages Structure (jonathanhurley)

[rlevas]

AMBARI-22205 - Install Version Fails On IOP Cluster Due To Missing 
stack_packages Structure  (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 323974e19d469313c9bafa1bda3000ea62f85bc8
Parents: 6f59806
Author: Jonathan Hurley 
Authored: Wed Oct 11 10:41:38 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Oct 11 15:02:13 2017 -0400

--
 .../internal/ClusterStackVersionResourceProvider.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/323974e1/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 388551f..1a75559 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -874,10 +874,11 @@ public class ClusterStackVersionResourceProvider extends 
AbstractControllerResou
 Config clusterEnv = 
cluster.getDesiredConfigByType(ConfigHelper.CLUSTER_ENV);
 Map clusterEnvProperties = clusterEnv.getProperties();
 
-// the 3 properties we need to check and update
+// the 4 properties we need to check and update
 Set properties = 
Sets.newHashSet(ConfigHelper.CLUSTER_ENV_STACK_ROOT_PROPERTY,
 ConfigHelper.CLUSTER_ENV_STACK_TOOLS_PROPERTY,
-ConfigHelper.CLUSTER_ENV_STACK_FEATURES_PROPERTY);
+ConfigHelper.CLUSTER_ENV_STACK_FEATURES_PROPERTY,
+ConfigHelper.CLUSTER_ENV_STACK_PACKAGES_PROPERTY);
 
 // any updates are stored here and merged into the existing config type
 Map updatedProperties = new HashMap<>();

ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/trunk 3a0d168c0 -> 20faae7a3


AMBARI-6. RU: Downgrade is failed ZKFC (ncole)


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

Branch: refs/heads/trunk
Commit: 20faae7a3647943b61e46f41ce27da81e91dc519
Parents: 3a0d168
Author: Nate Cole 
Authored: Fri Oct 13 08:42:12 2017 -0400
Committer: Nate Cole 
Committed: Fri Oct 13 09:19:08 2017 -0400

--
 .../upgrades/FinalizeUpgradeAction.java | 21 ++--
 1 file changed, 10 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/20faae7a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index d6876d9..87ea1fc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -271,7 +271,7 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 errors.size())).append(System.lineSeparator());
 
 for (InfoTuple error : errors) {
-  messageBuff.append(String.format("%s: $s (current = %s, desired = %s 
", error.hostName,
+  messageBuff.append(String.format("%s: %s (current = %s, desired = 
%s)", error.hostName,
   error.componentName, error.currentVersion, error.targetVersion));
 
   messageBuff.append(System.lineSeparator());
@@ -367,23 +367,22 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 Set errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set servicesParticipating = upgradeContext.getSupportedServices();
 for (String serviceName : servicesParticipating) {
   Service service = cluster.getService(serviceName);
-  String targetVersion = upgradeContext.getTargetVersion(serviceName);
+  RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getTargetRepositoryVersion(serviceName);
+  StackId targetStackId = repositoryVersionEntity.getStackId();
+  String targetVersion = repositoryVersionEntity.getVersion();
 
   for (ServiceComponent serviceComponent : 
service.getServiceComponents().values()) {
-for (ServiceComponentHost serviceComponentHost : 
serviceComponent.getServiceComponentHosts().values()) {
-  ComponentInfo componentInfo = 
ambariMetaInfo.getComponent(targetStackId.getStackName(),
-  targetStackId.getStackVersion(), service.getName(), 
serviceComponent.getName());
+ComponentInfo componentInfo = 
ambariMetaInfo.getComponent(targetStackId.getStackName(),
+targetStackId.getStackVersion(), service.getName(), 
serviceComponent.getName());
 
-  if (!componentInfo.isVersionAdvertised()) {
-continue;
-  }
+if (!componentInfo.isVersionAdvertised()) {
+  continue;
+}
 
+for (ServiceComponentHost serviceComponentHost : 
serviceComponent.getServiceComponentHosts().values()) {
   if (!StringUtils.equals(targetVersion, 
serviceComponentHost.getVersion())) {
 errors.add(new InfoTuple(service.getName(), 
serviceComponent.getName(),
 serviceComponentHost.getHostName(), 
serviceComponentHost.getVersion(),

ambari git commit: AMBARI-22231 Stopping and starting HDFS component in Ambari will result in Namenode to stay in SAFEMODE (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/trunk 8f53bc453 -> 3a0d168c0


AMBARI-22231 Stopping and starting HDFS component in Ambari will result in 
Namenode to stay in SAFEMODE (dsen)


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

Branch: refs/heads/trunk
Commit: 3a0d168c08edf559bc91f3eb76485797f83a6e48
Parents: 8f53bc4
Author: Dmytro Sen 
Authored: Fri Oct 13 15:53:09 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 13 15:53:09 2017 +0300

--
 .../src/main/resources/stacks/HDP/3.0/role_command_order.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3a0d168c/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json 
b/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
index 576910f..223eee5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
+++ b/ambari-server/src/main/resources/stacks/HDP/3.0/role_command_order.json
@@ -87,7 +87,7 @@
 "PXF_SERVICE_CHECK-SERVICE_CHECK" : ["PXF-START", 
"HDFS_SERVICE_CHECK-SERVICE_CHECK", "HBASE_SERVICE_CHECK-SERVICE_CHECK", 
"HIVE_SERVICE_CHECK-SERVICE_CHECK"],
 
 "RANGER_ADMIN-START": ["ZOOKEEPER_SERVER-START", "INFRA_SOLR-START"],
-"RANGER_USERSYNC-START" : ["RANGER_ADMIN-START", 
"RANGER_KMS_SERVER-START"],
+"RANGER_USERSYNC-START" : ["RANGER_ADMIN-START"],
 "RANGER_KMS_SERVER-START" : ["RANGER_ADMIN-START"],
 "RANGER_KMS_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_KMS_SERVER-START"],
 "RANGER_SERVICE_CHECK-SERVICE_CHECK" : ["RANGER_USERSYNC-START", 
"RANGER_ADMIN-START"],

ambari git commit: AMBARI-22226. RU: Downgrade is failed ZKFC (ncole)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 faef3a22e -> de2145908


AMBARI-6. RU: Downgrade is failed ZKFC (ncole)


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

Branch: refs/heads/branch-2.6
Commit: de2145908647d05f83eb0869f042feb42868b1cd
Parents: faef3a2
Author: Nate Cole 
Authored: Thu Oct 12 16:26:33 2017 -0400
Committer: Nate Cole 
Committed: Fri Oct 13 08:07:35 2017 -0400

--
 .../serveraction/ServerActionExecutor.java  |  3 +--
 .../upgrades/FinalizeUpgradeAction.java | 21 ++--
 2 files changed, 11 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/de214590/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
index f80d06a..50e3cfe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
@@ -18,7 +18,6 @@
 
 package org.apache.ambari.server.serveraction;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -84,7 +83,7 @@ public class ServerActionExecutor {
* requestSharedDataMap object
*/
   private final Map> requestSharedDataMap =
-  new HashMap<>();
+  new ConcurrentHashMap<>();
 
   /**
* Database accessor to query and update the database of action commands.

http://git-wip-us.apache.org/repos/asf/ambari/blob/de214590/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 0ce5d30..4d5f3ba 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -267,7 +267,7 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 errors.size())).append(System.lineSeparator());
 
 for (InfoTuple error : errors) {
-  messageBuff.append(String.format("%s: $s (current = %s, desired = %s 
", error.hostName,
+  messageBuff.append(String.format("%s: %s (current = %s, desired = 
%s)", error.hostName,
   error.componentName, error.currentVersion, error.targetVersion));
 
   messageBuff.append(System.lineSeparator());
@@ -363,23 +363,22 @@ public class FinalizeUpgradeAction extends 
AbstractUpgradeServerAction {
 Set errors = new TreeSet<>();
 
 Cluster cluster = upgradeContext.getCluster();
-RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getRepositoryVersion();
-StackId targetStackId = repositoryVersionEntity.getStackId();
-
 Set servicesParticipating = upgradeContext.getSupportedServices();
 for (String serviceName : servicesParticipating) {
   Service service = cluster.getService(serviceName);
-  String targetVersion = upgradeContext.getTargetVersion(serviceName);
+  RepositoryVersionEntity repositoryVersionEntity = 
upgradeContext.getTargetRepositoryVersion(serviceName);
+  StackId targetStackId = repositoryVersionEntity.getStackId();
+  String targetVersion = repositoryVersionEntity.getVersion();
 
   for (ServiceComponent serviceComponent : 
service.getServiceComponents().values()) {
-for (ServiceComponentHost serviceComponentHost : 
serviceComponent.getServiceComponentHosts().values()) {
-  ComponentInfo componentInfo = 
ambariMetaInfo.getComponent(targetStackId.getStackName(),
-  targetStackId.getStackVersion(), service.getName(), 
serviceComponent.getName());
+ComponentInfo componentInfo = 
ambariMetaInfo.getComponent(targetStackId.getStackName(),
+targetStackId.getStackVersion(), service.getName(), 
serviceComponent.getName());
 
-  if (!componentInfo.isVersionAdvertised()) {
-continue;
-  }
+if (!componentInfo.isVersionAdvertised()) {
+

ambari git commit: AMBARI-22230 Hosts and Alerts tables UI tweaks. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/trunk a8ba5e61c -> 8f53bc453


AMBARI-22230 Hosts and Alerts tables UI tweaks. (atkach)


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

Branch: refs/heads/trunk
Commit: 8f53bc453c47a4f95d5e58825feb77d69e6a6a22
Parents: a8ba5e6
Author: Andrii Tkach 
Authored: Fri Oct 13 13:45:06 2017 +0300
Committer: Andrii Tkach 
Committed: Fri Oct 13 13:45:06 2017 +0300

--
 ambari-web/app/models/alerts/alert_group.js |   2 +-
 ambari-web/app/styles/application.less  |   5 +
 ambari-web/app/styles/dashboard.less|   6 +-
 .../app/styles/theme/bootstrap-ambari.css   |   3 +-
 ambari-web/app/templates/main/alerts.hbs|   3 +-
 .../main/alerts/alert_definitions_actions.hbs   |   2 +-
 ambari-web/app/templates/main/dashboard.hbs |   2 +-
 .../templates/main/dashboard/config_history.hbs |   2 +-
 ambari-web/app/templates/main/host.hbs  |   2 +-
 .../templates/main/host/bulk_operation_menu.hbs | 132 ++-
 .../views/main/host/hosts_table_menu_view.js|   4 +-
 .../app/views/main/host/stack_versions_view.js  |   2 +-
 .../test/models/alerts/alert_group_test.js  |   5 +-
 13 files changed, 93 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/models/alerts/alert_group.js
--
diff --git a/ambari-web/app/models/alerts/alert_group.js 
b/ambari-web/app/models/alerts/alert_group.js
index 49a850f..3277fc8 100644
--- a/ambari-web/app/models/alerts/alert_group.js
+++ b/ambari-web/app/models/alerts/alert_group.js
@@ -55,7 +55,7 @@ App.AlertGroup = DS.Model.extend({
* @type {string}
*/
   displayName: function () {
-var name = App.config.truncateGroupName(this.get('name'));
+var name = App.config.truncateGroupName(App.format.role(this.get('name'), 
true));
 return this.get('default') ? name + ' Default' : name;
   }.property('name', 'default'),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 7c9cc8e..099f3cf 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2802,4 +2802,9 @@ a.abort-icon:hover {
 .breadcrumbs-forward-slash {
   display: inline;
   color: #D2D3D5;
+}
+
+.container-wrap-table {
+  padding: 0 10px;
+  background-color: @diff-background-equal;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/dashboard.less
--
diff --git a/ambari-web/app/styles/dashboard.less 
b/ambari-web/app/styles/dashboard.less
index 02835bd..6deb30c 100644
--- a/ambari-web/app/styles/dashboard.less
+++ b/ambari-web/app/styles/dashboard.less
@@ -18,14 +18,12 @@
 
 @import 'common.less';
 
-#dashboard-widgets-container{
-  .tabs-left {
-float: left;
-  }
+#dashboard-widgets-container {
   .btn-toolbar {
 float: right;
 padding-top: 5px;
 margin-bottom: 20px;
+margin-top: -60px;
   }
   .dashboard-widgets-box {
 clear: both;

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/theme/bootstrap-ambari.css
--
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css 
b/ambari-web/app/styles/theme/bootstrap-ambari.css
index 70579e7..cff73ad 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -479,11 +479,12 @@ h2.table-title {
 }
 .nav.nav-tabs li a .badge.badge-important {
   display: inline;
+  vertical-align: baseline;
 }
 .nav.nav-tabs li.active a {
   color: #333;
   border-bottom: 3px solid #3FAE2A;
-  padding-bottom: 1px;
+  padding-bottom: 2px;
 }
 .nav-tabs-left li,
 .nav-tabs-right li {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/templates/main/alerts.hbs
--
diff --git a/ambari-web/app/templates/main/alerts.hbs 
b/ambari-web/app/templates/main/alerts.hbs
index 40469d3..0f85e27 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -16,7 +16,7 @@
 * limitations under the License.
 }}
 
-
+
   
 {{t menu.item.alerts}}
 
@@ -56,7 +56,6 @@
   {{view 

ambari git commit: AMBARI-22229.Handle upload of interpreter.json to remote storage in Ambari(Prabhjyot Singh via Venkata Sairam)

[vsairam]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 db67f0385 -> faef3a22e


AMBARI-9.Handle upload of interpreter.json to remote storage in 
Ambari(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/faef3a22
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/faef3a22
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/faef3a22

Branch: refs/heads/branch-2.6
Commit: faef3a22ed2801f4e931074045b37f691bd9977f
Parents: db67f03
Author: Venkata Sairam 
Authored: Fri Oct 13 15:23:33 2017 +0530
Committer: Venkata Sairam 
Committed: Fri Oct 13 15:23:33 2017 +0530

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/faef3a22/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index a8b1b32..6a84d79 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -305,7 +305,8 @@ class Master(Script):
   def get_zeppelin_conf_FS_directory(self, params):
 hdfs_interpreter_config = 
params.config['configurations']['zeppelin-config']['zeppelin.config.fs.dir']
 
-if not hdfs_interpreter_config.startswith("/"):
+# if it doesn't start from "/" or doesn't contains "://" as in hdfs://, 
file://, etc then make it a absolute path
+if not (hdfs_interpreter_config.startswith("/") or '://' in 
hdfs_interpreter_config):
   hdfs_interpreter_config = "/user/" + format("{zeppelin_user}") + "/" + 
hdfs_interpreter_config
 
 return hdfs_interpreter_config

ambari git commit: AMBARI-22229.Handle upload of interpreter.json to remote storage in Ambari(Prabhjyot Singh via Venkata Sairam)

[vsairam]

Repository: ambari
Updated Branches:
  refs/heads/trunk 0f76c7f9d -> a8ba5e61c


AMBARI-9.Handle upload of interpreter.json to remote storage in 
Ambari(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/a8ba5e61
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8ba5e61
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8ba5e61

Branch: refs/heads/trunk
Commit: a8ba5e61c50ac92b787d3b2de4cec8d29da92d74
Parents: 0f76c7f
Author: Venkata Sairam 
Authored: Fri Oct 13 15:22:33 2017 +0530
Committer: Venkata Sairam 
Committed: Fri Oct 13 15:22:33 2017 +0530

--
 .../common-services/ZEPPELIN/0.7.0/package/scripts/master.py | 3 ++-
 .../src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py | 8 
 2 files changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a8ba5e61/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index a8b1b32..6a84d79 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -305,7 +305,8 @@ class Master(Script):
   def get_zeppelin_conf_FS_directory(self, params):
 hdfs_interpreter_config = 
params.config['configurations']['zeppelin-config']['zeppelin.config.fs.dir']
 
-if not hdfs_interpreter_config.startswith("/"):
+# if it doesn't start from "/" or doesn't contains "://" as in hdfs://, 
file://, etc then make it a absolute path
+if not (hdfs_interpreter_config.startswith("/") or '://' in 
hdfs_interpreter_config):
   hdfs_interpreter_config = "/user/" + format("{zeppelin_user}") + "/" + 
hdfs_interpreter_config
 
 return hdfs_interpreter_config

http://git-wip-us.apache.org/repos/asf/ambari/blob/a8ba5e61/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py 
b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
index e5d0240..400350c 100644
--- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
+++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
@@ -342,7 +342,7 @@ class TestZeppelin070(RMFTestCase):
   )
 
 self.assertResourceCalled('HdfsResource',
-  '/user/zeppelin/hdfs:///user/zeppelin/conf',
+  'hdfs:///user/zeppelin/conf',
   security_enabled=False,
   
hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
   keytab=UnknownConfigurationMock(),
@@ -368,7 +368,7 @@ class TestZeppelin070(RMFTestCase):
 
 
 self.assertResourceCalled('HdfsResource',
-  
'/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+  'hdfs:///user/zeppelin/conf/interpreter.json',
   security_enabled=False,
   
hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
   keytab=UnknownConfigurationMock(),
@@ -395,7 +395,7 @@ class TestZeppelin070(RMFTestCase):
   )
 
 self.assertResourceCalled('HdfsResource',
-  
'/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+  'hdfs:///user/zeppelin/conf/interpreter.json',
   security_enabled=False,
   
hadoop_bin_dir='/usr/hdp/2.5.0.0-1235/hadoop/bin',
   keytab=UnknownConfigurationMock(),
@@ -421,7 +421,7 @@ class TestZeppelin070(RMFTestCase):
   group='zeppelin',
   )
 
-self.assertResourceCalled('HdfsResource', 
'/user/zeppelin/hdfs:///user/zeppelin/conf/interpreter.json',
+self.assertResourceCalled('HdfsResource', 
'hdfs:///user/zeppelin/conf/interpreter.json',
 security_enabled = False,
 hadoop_bin_dir = '/usr/hdp/2.5.0.0-1235/hadoop/bin',
 keytab = UnknownConfigurationMock(),

ambari git commit: AMBARI-22225. Cluster created using Blueprints rejects hosts even though their host_name matches host predicate. (stoader)

[stoader]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 f41d8359c -> db67f0385


AMBARI-5. Cluster created using Blueprints rejects hosts even though their 
host_name matches host predicate. (stoader)


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

Branch: refs/heads/branch-2.6
Commit: db67f03850ecbafe1b580a719963b6b0f60f30d6
Parents: f41d835
Author: Toader, Sebastian 
Authored: Thu Oct 12 21:34:32 2017 +0200
Committer: Toader, Sebastian 
Committed: Fri Oct 13 07:51:52 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/db67f038/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
index 784c923..8aed8aa 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/HostRequest.java
@@ -488,7 +488,7 @@ public class HostRequest implements Comparable 
{
 private void buildPropertyMap(Host host) {
   hostResource = new ResourceImpl(Resource.Type.Host);
 
-  hostResource.setProperty(HostResourceProvider.HOST_NAME_PROPERTY_ID,
+  hostResource.setProperty(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID,
   host.getHostName());
   
hostResource.setProperty(HostResourceProvider.HOST_PUBLIC_NAME_PROPERTY_ID,
   host.getPublicHostName());