date:20150518

ambari git commit: AMBARI-11179. Kerberos: Oozie auth rules do not look correct (rlevas)

2015-05-18 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/trunk b7ddf8287 - 2dd80b903


AMBARI-11179. Kerberos: Oozie auth rules do not look correct (rlevas)


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

Branch: refs/heads/trunk
Commit: 2dd80b90379663265e5e1001b32f18f1c6be23ee
Parents: b7ddf82
Author: Robert Levas rle...@hortonworks.com
Authored: Mon May 18 11:16:56 2015 -0400
Committer: Robert Levas rle...@hortonworks.com
Committed: Mon May 18 11:17:03 2015 -0400

--
 .../OOZIE/4.0.0.2.0/configuration/oozie-site.xml  | 5 -
 .../OOZIE/5.0.0.2.3/configuration/oozie-site.xml  | 7 +--
 2 files changed, 1 insertion(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2dd80b90/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
index d7ae0e9..329ac64 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
@@ -142,11 +142,6 @@
   property
 nameoozie.authentication.kerberos.name.rules/name
 value
-  RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
-  RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
-  RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-  RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-  DEFAULT
 /value
 descriptionThe mapping from kerberos principal names to local OS user 
names./description
   /property

http://git-wip-us.apache.org/repos/asf/ambari/blob/2dd80b90/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
 
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
index b17e4cd..648079a 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/5.0.0.2.3/configuration/oozie-site.xml
@@ -21,11 +21,6 @@
   property
 nameoozie.authentication.kerberos.name.rules/name
 value
-  RULE:[2:$1@$0]([jt]t@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-MAPREDUSER/
-  RULE:[2:$1@$0]([nd]n@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HDFSUSER/
-  RULE:[2:$1@$0](hm@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-  RULE:[2:$1@$0](rs@.*TODO-KERBEROS-DOMAIN)s/.*/TODO-HBASE-USER/
-  DEFAULT
 /value
 descriptionThe mapping from kerberos principal names to local OS user 
names./description
   /property
@@ -164,4 +159,4 @@
 /description
   /property
 
-/configuration
\ No newline at end of file
+/configuration

ambari git commit: AMBARI-11206 [WinTP2] Ambari Agent fails to start

2015-05-18 Thread fbarca

Repository: ambari
Updated Branches:
  refs/heads/trunk 28cb5fb2f - a01d92b18


AMBARI-11206 [WinTP2] Ambari Agent fails to start

Reinstated the Windows-specific read_file()


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

Branch: refs/heads/trunk
Commit: a01d92b18cb0f1a2e1f526702707ce3edf0bdf11
Parents: 28cb5fb
Author: Florian Barca fba...@hortonworks.com
Authored: Mon May 18 05:34:46 2015 -0700
Committer: Florian Barca fba...@hortonworks.com
Committed: Mon May 18 05:34:46 2015 -0700

--
 .../src/main/python/resource_management/core/source.py   | 8 
 .../src/main/python/resource_management/core/sudo.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a01d92b1/ambari-common/src/main/python/resource_management/core/source.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/source.py 
b/ambari-common/src/main/python/resource_management/core/source.py
index 7317492..1f888ac 100644
--- a/ambari-common/src/main/python/resource_management/core/source.py
+++ b/ambari-common/src/main/python/resource_management/core/source.py
@@ -33,6 +33,8 @@ import time
 import urllib2
 import urlparse
 
+from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
+from ambari_commons import OSConst
 
 class Source(object):
   def __init__(self, name):
@@ -74,10 +76,16 @@ class StaticFile(Source):
 
 return self.read_file(path)
 
+  @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
   def read_file(self, path):
 from resource_management.core import sudo
 return sudo.read_file(path)
 
+  @OsFamilyFuncImpl(os_family=OSConst.WINSRV_FAMILY)
+  def read_file(self, path):
+with open(path, rb) as fp:
+  return fp.read()
+
 
 try:
   from ambari_jinja2 import Environment as JinjaEnvironment, BaseLoader, 
TemplateNotFound, FunctionLoader, StrictUndefined

http://git-wip-us.apache.org/repos/asf/ambari/blob/a01d92b1/ambari-common/src/main/python/resource_management/core/sudo.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/sudo.py 
b/ambari-common/src/main/python/resource_management/core/sudo.py
index b5dfa47..e7bb08a 100644
--- a/ambari-common/src/main/python/resource_management/core/sudo.py
+++ b/ambari-common/src/main/python/resource_management/core/sudo.py
@@ -29,7 +29,7 @@ from resource_management.core.utils import _coerce_uid
 from resource_management.core.utils import _coerce_gid
 from ambari_commons.os_check import OSCheck
 
-if os.geteuid() == 0 or OSCheck.is_windows_family():
+if os.geteuid() == 0:
   def chown(path, owner, group):
 return os.chown(path, _coerce_uid(owner) if owner else -1, 
_coerce_gid(group) if group else -1)

ambari git commit: AMBARI-11212. Some services start fails due to Permission denied exception (aonishuk)

2015-05-18 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/trunk b950812eb - 7389c57f7


AMBARI-11212. Some services start fails due to Permission denied exception 
(aonishuk)


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

Branch: refs/heads/trunk
Commit: 7389c57f75c5b09b78a319b946aaaca69bc9f643
Parents: b950812
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Mon May 18 17:13:18 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Mon May 18 17:13:18 2015 +0300

--
 .../common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py   | 1 +
 ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py | 2 ++
 .../src/test/python/stacks/2.0.6/HDFS/test_journalnode.py| 2 ++
 ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py | 2 ++
 .../src/test/python/stacks/2.0.6/HDFS/test_nfsgateway.py | 2 ++
 .../src/test/python/stacks/2.0.6/HDFS/test_snamenode.py  | 2 ++
 ambari-server/src/test/python/stacks/2.0.6/HDFS/test_zkfc.py | 4 
 7 files changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7389c57f/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 95fe90c..418571a 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
@@ -101,6 +101,7 @@ def hdfs(name=None):
 
   # for source-code of jar goto contrib/fast-hdfs-resource
   File(format({ambari_libs_dir}/fast-hdfs-resource.jar),
+   mode=0644,
content=StaticFile(fast-hdfs-resource.jar)
   )
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/7389c57f/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py 
b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
index 9b7a91f..4eb8178 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_datanode.py
@@ -382,6 +382,7 @@ class TestDatanode(RMFTestCase):
   )
 self.assertResourceCalled('File', 
'/var/lib/ambari-agent/lib/fast-hdfs-resource.jar',
 content = StaticFile('fast-hdfs-resource.jar'),
+mode = 0644,
 )
 self.assertResourceCalled('Directory', '/var/lib/hadoop-hdfs',
   owner = 'hdfs',
@@ -436,6 +437,7 @@ class TestDatanode(RMFTestCase):
   )
 self.assertResourceCalled('File', 
'/var/lib/ambari-agent/lib/fast-hdfs-resource.jar',
 content = StaticFile('fast-hdfs-resource.jar'),
+mode = 0644,
 )
 self.assertResourceCalled('Directory', '/var/lib/hadoop-hdfs',
   owner = 'hdfs',

http://git-wip-us.apache.org/repos/asf/ambari/blob/7389c57f/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py 
b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
index d05e2dc..3fe2acb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_journalnode.py
@@ -211,6 +211,7 @@ class TestJournalnode(RMFTestCase):
   )
 self.assertResourceCalled('File', 
'/var/lib/ambari-agent/lib/fast-hdfs-resource.jar',
 content = StaticFile('fast-hdfs-resource.jar'),
+mode = 0644,
 )
 
   def assert_configure_secured(self):
@@ -252,6 +253,7 @@ class TestJournalnode(RMFTestCase):
   )
 self.assertResourceCalled('File', 
'/var/lib/ambari-agent/lib/fast-hdfs-resource.jar',
 content = StaticFile('fast-hdfs-resource.jar'),
+mode = 0644,
 )
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7389c57f/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py 
b/ambari-server/src/test/python/stacks/2.0.6/HDFS/test_namenode.py

ambari git commit: AMBARI-11206 [WinTP2] Ambari Agent fails to start

2015-05-18 Thread fbarca

Repository: ambari
Updated Branches:
  refs/heads/trunk 736696ba1 - b950812eb


AMBARI-11206 [WinTP2] Ambari Agent fails to start

Moved the module imports inside functions, to immunize the startup against 
unused modules.


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

Branch: refs/heads/trunk
Commit: b950812eb89cd0571aea16a12dc9dee8653fb883
Parents: 736696b
Author: Florian Barca fba...@hortonworks.com
Authored: Mon May 18 06:27:42 2015 -0700
Committer: Florian Barca fba...@hortonworks.com
Committed: Mon May 18 06:29:23 2015 -0700

--
 .../src/main/python/resource_management/core/utils.py  | 6 --
 .../libraries/functions/check_process_status.py| 3 ++-
 .../libraries/providers/modify_properties_file.py  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b950812e/ambari-common/src/main/python/resource_management/core/utils.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/utils.py 
b/ambari-common/src/main/python/resource_management/core/utils.py
index f9ad193..cc8b404 100644
--- a/ambari-common/src/main/python/resource_management/core/utils.py
+++ b/ambari-common/src/main/python/resource_management/core/utils.py
@@ -20,8 +20,6 @@ Ambari Agent
 
 
 
-import grp
-import pwd
 from resource_management.core.exceptions import Fail
 
 class AttributeDictionary(object):
@@ -110,6 +108,8 @@ def checked_unite(dict1, dict2):
   return result
 
 def _coerce_uid(user):
+  import pwd
+
   try:
 uid = int(user)
   except ValueError:
@@ -121,6 +121,8 @@ def _coerce_uid(user):
 
 
 def _coerce_gid(group):
+  import grp
+
   try:
 gid = int(group)
   except ValueError:

http://git-wip-us.apache.org/repos/asf/ambari/blob/b950812e/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
index a3efabd..a3e4a39 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/check_process_status.py
@@ -23,7 +23,6 @@ Ambari Agent
 from resource_management.core.exceptions import ComponentIsNotRunning
 from resource_management.core.logger import Logger
 from resource_management.core import shell
-from resource_management.core import sudo
 __all__ = [check_process_status]
 
 import os
@@ -37,6 +36,8 @@ def check_process_status(pid_file):
 
   @param pid_file: path to service pid file
   
+  from resource_management.core import sudo
+
   if not pid_file or not os.path.isfile(pid_file):
 raise ComponentIsNotRunning()
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/b950812e/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
 
b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
index a07881b..e71abb8 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
@@ -26,7 +26,7 @@ from resource_management.libraries.functions.format import 
format
 from resource_management.core.environment import Environment
 from resource_management.core.source import InlineTemplate
 from resource_management.core.logger import Logger
-from resource_management import sudo
+from resource_management.core import sudo
 
 
 class ModifyPropertiesFileProvider(Provider):

ambari git commit: AMBARI-11214. Duplicate repo_suse_rhel.j2 templates (aonishuk)

2015-05-18 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/trunk 2dd80b903 - 49ecd6b2e


AMBARI-11214. Duplicate repo_suse_rhel.j2 templates (aonishuk)


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

Branch: refs/heads/trunk
Commit: 49ecd6b2e9ad872a47324960150157e6d928e17f
Parents: 2dd80b9
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Mon May 18 19:08:50 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Mon May 18 19:08:50 2015 +0300

--
 .../TestRepositoryResource.py   | 143 ++-
 .../libraries/data/repo_suse_rhel.j2|   8 ++
 .../libraries/data/repo_ubuntu.j2   |   1 +
 .../libraries/providers/repository.py   |   7 +-
 .../custom_actions/templates/repo_suse_rhel.j2  |   8 --
 .../custom_actions/templates/repo_ubuntu.j2 |   1 -
 .../before-INSTALL/templates/repo_suse_rhel.j2  |   7 -
 .../before-INSTALL/templates/repo_ubuntu.j2 |   1 -
 8 files changed, 88 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/49ecd6b2/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
--
diff --git 
a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py 
b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
index c31cc20..0a849f3 100644
--- a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
@@ -43,7 +43,7 @@ class DummyTemplate(object):
 
 DEBIAN_DEFAUTL_TEMPLATE = {{package_type}} {{base_url}} {{components}}\n
 RHEL_SUSE_DEFAULT_TEMPLATE =[{{repo_id}}]
-name={{repo_file_name}}
+name={{repo_id}}
 {% if mirror_list %}mirrorlist={{mirror_list}}{% else %}baseurl={{base_url}}{% 
endif %}
 
 path=/
@@ -65,31 +65,32 @@ class TestRepositoryResource(TestCase):
 is_suse_family.return_value = False
 with Environment('/') as env:
   with patch.object(repository,Template, 
new=DummyTemplate.create(RHEL_SUSE_DEFAULT_TEMPLATE)):
-Repository('hadoop',
-   base_url='http://download.base_url.org/rpm/',
-   
mirror_list='https://mirrors.base_url.org/?repo=Repositoryarch=$basearch',
-   repo_file_name='Repository',
-   repo_template='dummy.j2')
-
-self.assertTrue('hadoop' in env.resources['Repository'])
-defined_arguments = env.resources['Repository']['hadoop'].arguments
-expected_arguments = {'repo_template': 'dummy.j2',
-  'base_url': 
'http://download.base_url.org/rpm/',
-  'mirror_list': 
'https://mirrors.base_url.org/?repo=Repositoryarch=$basearch',
-  'repo_file_name': 'Repository'}
-expected_template_arguments = {'base_url': 
'http://download.base_url.org/rpm/',
-  'mirror_list': 
'https://mirrors.base_url.org/?repo=Repositoryarch=$basearch',
-  'repo_file_name': 'Repository'}
-
-self.assertEqual(defined_arguments, expected_arguments)
-self.assertEqual(file_mock.call_args[0][0], 
'/etc/yum.repos.d/Repository.repo')
-
-template_item = file_mock.call_args[1]['content']
-template = str(template_item.name)
-expected_template_arguments.update({'repo_id': 'hadoop'})
-
-self.assertEqual(expected_template_arguments, 
template_item.context._dict)
-self.assertEqual('dummy.j2', template)
+with patch.object(repository, __file__, 
new='/ambari/test/repo/dummy/path/file'):
+  Repository('hadoop',
+ base_url='http://download.base_url.org/rpm/',
+ 
mirror_list='https://mirrors.base_url.org/?repo=Repositoryarch=$basearch',
+ repo_file_name='Repository',
+ repo_template='dummy.j2')
+
+  self.assertTrue('hadoop' in env.resources['Repository'])
+  defined_arguments = 
env.resources['Repository']['hadoop'].arguments
+  expected_arguments = {'repo_template': 'dummy.j2',
+'base_url': 
'http://download.base_url.org/rpm/',
+'mirror_list': 
'https://mirrors.base_url.org/?repo=Repositoryarch=$basearch',
+'repo_file_name': 'Repository'}
+  expected_template_arguments =

[6/6] ambari git commit: AMBARI-11216 Refactor service-config 'defaultValue' property into 'savedValue' and 'recommendedValue'. (ababiichuk)

2015-05-18 Thread ababiichuk

AMBARI-11216 Refactor service-config 'defaultValue' property into 'savedValue' 
and 'recommendedValue'. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 07616603c4388c0a9c1dc769659de92edb64b2cb
Parents: 49ecd6b
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Mon May 18 17:46:41 2015 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Mon May 18 19:10:40 2015 +0300

--
 .../nameNode/step3_controller.js|   2 +-
 .../resourceManager/step3_controller.js |  14 +-
 .../app/controllers/main/admin/kerberos.js  |   2 +-
 .../main/admin/kerberos/step4_controller.js |  10 +-
 .../controllers/main/service/info/configs.js|  14 +-
 ambari-web/app/controllers/wizard.js|  13 +-
 .../app/controllers/wizard/step7_controller.js  |  33 +-
 .../app/controllers/wizard/step8_controller.js  | 119 ---
 ambari-web/app/data/BIGTOP/site_properties.js   | 264 +++---
 ambari-web/app/data/HDP2.2/site_properties.js   |  66 ++--
 ambari-web/app/data/HDP2.3/site_properties.js   |  60 ++--
 ambari-web/app/data/HDP2/custom_configs.js  | 127 ---
 ambari-web/app/data/HDP2/ha_properties.js   |  34 +-
 ambari-web/app/data/HDP2/rm_ha_properties.js|  26 +-
 ambari-web/app/data/HDP2/secure_properties.js   | 176 +-
 ambari-web/app/data/HDP2/site_properties.js | 348 ++-
 ambari-web/app/data/PHD/site_properties.js  | 250 ++---
 .../mappers/configs/config_versions_mapper.js   |   4 +-
 .../configs/stack_config_properties_mapper.js   |   6 +-
 ambari-web/app/messages.js  |   1 +
 .../app/mixins/common/configs/configs_saver.js  | 118 +--
 .../mixins/common/configs/enhanced_configs.js   |  82 -
 .../app/models/configs/config_property.js   |  23 +-
 .../models/configs/objects/service_config.js|   3 +-
 .../configs/objects/service_config_property.js  |  84 -
 .../app/models/configs/stack_config_property.js |   8 +-
 .../modal_popups/dependent_configs_list.hbs |   8 +-
 ambari-web/app/utils/config.js  |  92 +++--
 .../app/utils/configs/config_property_helper.js |  66 ++--
 ambari-web/app/views.js |   1 -
 .../configs/service_configs_by_category_view.js |  19 +-
 .../widgets/checkbox_config_widget_view.js  |   7 -
 .../configs/widgets/combo_config_widget_view.js |   3 +-
 .../configs/widgets/config_widget_view.js   |  33 +-
 .../widgets/directory_config_widget_view.js |   1 +
 .../configs/widgets/list_config_widget_view.js  |   2 +-
 .../configs/widgets/plain_config_text_field.js  |   2 +-
 .../widgets/slider_config_widget_view.js|  24 +-
 .../widgets/time_interval_spinner_view.js   |  10 +-
 .../widgets/toggle_config_widget_view.js|   1 +
 ambari-web/app/views/common/controls_view.js|  16 +-
 .../views/common/modal_popups/prompt_popup.js   |  54 ---
 .../resourceManager/step3_controller_test.js|  14 +-
 .../admin/kerberos/step4_controller_test.js |   4 +-
 .../main/service/info/config_test.js| 132 ---
 .../test/controllers/wizard/step7_test.js   |  64 ++--
 .../test/controllers/wizard/step8_test.js   | 134 +--
 ambari-web/test/controllers/wizard_test.js  |   2 +-
 .../test/data/HDP2/site_properties_test.js  |   6 +-
 .../configs/config_versions_mapper_test.js  |   4 +-
 .../stack_config_properties_mapper_test.js  |   4 +-
 .../test/mock_data_setup/configs_mock_data.js   |  16 +-
 .../test/models/configs/config_property_test.js |   2 +-
 .../objects/service_config_property_test.js |   8 +-
 ambari-web/test/utils/config_test.js|  40 +--
 .../configs/config_property_helper_test.js  |  46 +--
 .../service_configs_by_category_view_test.js|   8 +-
 .../widgets/list_config_widget_view_test.js |   4 +-
 .../widgets/slider_config_widget_view_test.js   |   6 +-
 .../widgets/toggle_config_widget_view_test.js   |   2 +-
 .../test/views/common/controls_view_test.js |  10 +-
 61 files changed, 1079 insertions(+), 1653 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step3_controller.js
index 83b3ee7..193b89f 100644
---

[1/6] ambari git commit: AMBARI-11216 Refactor service-config 'defaultValue' property into 'savedValue' and 'recommendedValue'. (ababiichuk)

2015-05-18 Thread ababiichuk

Repository: ambari
Updated Branches:
  refs/heads/trunk 49ecd6b2e - 07616603c


http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
--
diff --git 
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js 
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
index 7c14dac..d743179 100644
--- 
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
+++ 
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
@@ -191,7 +191,7 @@ describe('App.ServiceConfigsByCategoryView', function () {
   filter: 'd',
   serviceConfigs: [
 Em.Object.create({
-  defaultValue: 'dv',
+  savedValue: 'dv',
   category: 'c',
   isVisible: true
 })
@@ -444,7 +444,7 @@ describe('App.ServiceConfigsByCategoryView', function () {
   category: 'c0',
   id: 'site property',
   serviceName: 's0',
-  defaultValue: null,
+  savedValue: null,
   supportsFinal: true,
   filename: 'f0',
   isUserProperty: true,
@@ -473,7 +473,7 @@ describe('App.ServiceConfigsByCategoryView', function () {
   category: 'c1',
   id: 'site property',
   serviceName: 's1',
-  defaultValue: null,
+  savedValue: null,
   supportsFinal: false,
   filename: '',
   isUserProperty: true,
@@ -513,7 +513,7 @@ describe('App.ServiceConfigsByCategoryView', function () {
 view.createProperty(item.propertyObj);
 expect(view.get('serviceConfigs').filterProperty('name', 
item.propertyObj.name)).to.have.length(1);
 expect(view.get('serviceConfigs').findProperty('name', 
item.propertyObj.name).getProperties([
-  'name', 'displayName', 'value', 'displayType', 'isSecureConfig', 
'category', 'id', 'serviceName', 'defaultValue',
+  'name', 'displayName', 'value', 'displayType', 'isSecureConfig', 
'category', 'id', 'serviceName', 'savedValue',
   'supportsFinal', 'filename', 'isUserProperty', 'isNotSaved', 
'isRequired', 'group', 'isOverridable'
 ])).to.eql(item.result);
   });

http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js
--
diff --git 
a/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js 
b/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js
index 3e301d6..63e8f25 100644
--- 
a/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js
+++ 
b/ambari-web/test/views/common/configs/widgets/list_config_widget_view_test.js
@@ -29,7 +29,7 @@ describe('App.ListConfigWidgetView', function () {
 _validateOverrides: 
App.ServiceConfigProperty.prototype._validateOverrides,
 validate: App.ServiceConfigProperty.prototype.validate,
 name: 'a.b.c',
-defaultValue: '2,1',
+savedValue: '2,1',
 value: '2,1',
 filename: 'f1',
 isFinal: false,
@@ -152,7 +152,7 @@ describe('App.ListConfigWidgetView', function () {
   view.restoreDependentConfigs.restore();
   view.get('controller.removeCurrentFromDependentList').restore();
 });
-it('should restore default value', function () {
+it('should restore saved value', function () {
   view.toggleOption({context: view.get('options')[0]});
   view.toggleOption({context: view.get('options')[1]});
   view.toggleOption({context: view.get('options')[2]});

http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
--
diff --git 
a/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
 
b/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
index fba4493..ce42aba 100644
--- 
a/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
+++ 
b/ambari-web/test/views/common/configs/widgets/slider_config_widget_view_test.js
@@ -35,7 +35,7 @@ describe('App.SliderConfigWidgetView', function () {
 name: 'a.b.c',
 description: 'A B C',
 value: '486',
-defaultValue: '486',
+savedValue: '486',
 stackConfigProperty: Em.Object.create({
   valueAttributes: Em.Object.create({
 type: 'int',
@@ -65,7 +65,7 @@ describe('App.SliderConfigWidgetView', function () {
 name: 'a.b.c2',
 description: 'A B C 2',
 value: '72.2',
-defaultValue: '72.2',
+savedValue: '72.2',
 stackConfigProperty: Em.Object.create({

[1/2] ambari git commit: AMBARI-11219. Create Default Upgrade Catalog to upgrade the schema version to the current Ambari Server Versions. (mpapirkovskyy)

2015-05-18 Thread mpapirkovskyy

Repository: ambari
Updated Branches:
  refs/heads/trunk b19cee169 - 3c4e9111e


AMBARI-11219. Create Default Upgrade Catalog to upgrade the schema version to 
the current Ambari Server Versions. (mpapirkovskyy)


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

Branch: refs/heads/trunk
Commit: 3c4e9111ef95015ab4a365b08008ee5e6ec08b72
Parents: efbc665
Author: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Authored: Mon May 18 19:19:43 2015 +0300
Committer: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Committed: Mon May 18 20:21:29 2015 +0300

--
 .../server/configuration/Configuration.java | 13 
 .../server/upgrade/AbstractUpgradeCatalog.java  | 11 
 .../server/upgrade/FinalUpgradeCatalog.java | 66 
 .../server/upgrade/SchemaUpgradeHelper.java |  9 +--
 .../ambari/server/upgrade/UpgradeCatalog.java   |  6 ++
 .../ambari/server/upgrade/UpgradeTest.java  |  5 ++
 6 files changed, 103 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4e9111/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 3ceb05b..d8f89b2 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -843,6 +843,19 @@ public class Configuration {
   }
 
   /**
+   * Gets ambari server version
+   * @return version String
+   */
+  public String getServerVersion() {
+try {
+  return FileUtils.readFileToString(new 
File(getServerVersionFilePath())).trim();
+} catch (IOException e) {
+  LOG.error(Unable to read server version file, e);
+}
+return null;
+  }
+
+  /**
* Check to see if the API should be authenticated or not
* @return false if not, true if the authentication is enabled.
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4e9111/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index ec63512..c16c664 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -76,6 +76,7 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
   @Inject
   public AbstractUpgradeCatalog(Injector injector) {
 this.injector = injector;
+injector.injectMembers(this);
 registerCatalog(this);
   }
 
@@ -100,6 +101,11 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
 @Override
 public int compare(UpgradeCatalog upgradeCatalog1,
UpgradeCatalog upgradeCatalog2) {
+  //make sure FinalUpgradeCatalog runs last
+  if (upgradeCatalog1.isFinal() ^ upgradeCatalog2.isFinal()) {
+return Boolean.compare(upgradeCatalog1.isFinal(), 
upgradeCatalog2.isFinal());
+  }
+
   return VersionUtils.compareVersions(upgradeCatalog1.getTargetVersion(),
 upgradeCatalog2.getTargetVersion(), 3);
 }
@@ -382,6 +388,11 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
 updateMetaInfoVersion(getTargetVersion());
   }
 
+  @Override
+  public boolean isFinal() {
+return false;
+  }
+
   protected abstract void executeDDLUpdates() throws AmbariException, 
SQLException;
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/3c4e9111/ambari-server/src/main/java/org/apache/ambari/server/upgrade/FinalUpgradeCatalog.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/FinalUpgradeCatalog.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/FinalUpgradeCatalog.java
new file mode 100644
index 000..334afaf
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/FinalUpgradeCatalog.java
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ *

[2/2] ambari git commit: AMBARI-11221. ORA-00942: table or view does not exist when executing Ambari-DDL-Oracle-CREATE.sql. (mpapirkovskyy)

2015-05-18 Thread mpapirkovskyy

AMBARI-11221. ORA-00942: table or view does not exist when executing 
Ambari-DDL-Oracle-CREATE.sql. (mpapirkovskyy)


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

Branch: refs/heads/trunk
Commit: efbc665c783b40ee0c2a465597cd0d601ab248a8
Parents: b19cee1
Author: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Authored: Mon May 18 20:10:55 2015 +0300
Committer: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Committed: Mon May 18 20:21:29 2015 +0300

--
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 25 
 1 file changed, 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/efbc665c/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 d092e76..fdd5ef8 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -1042,31 +1042,6 @@ CREATE TABLE clusterEvent (
 
 -- Quartz tables
 
-delete from qrtz_fired_triggers;
-delete from qrtz_simple_triggers;
-delete from qrtz_simprop_triggers;
-delete from qrtz_cron_triggers;
-delete from qrtz_blob_triggers;
-delete from qrtz_triggers;
-delete from qrtz_job_details;
-delete from qrtz_calendars;
-delete from qrtz_paused_trigger_grps;
-delete from qrtz_locks;
-delete from qrtz_scheduler_state;
-
-drop table qrtz_calendars;
-drop table qrtz_fired_triggers;
-drop table qrtz_blob_triggers;
-drop table qrtz_cron_triggers;
-drop table qrtz_simple_triggers;
-drop table qrtz_simprop_triggers;
-drop table qrtz_triggers;
-drop table qrtz_job_details;
-drop table qrtz_paused_trigger_grps;
-drop table qrtz_locks;
-drop table qrtz_scheduler_state;
-
-
 CREATE TABLE qrtz_job_details
   (
 SCHED_NAME VARCHAR2(120) NOT NULL,

ambari git commit: AMBARI-10411. Yarn ResourceManager HA config properties not processed properly by Blueprints. (rnettleton)

2015-05-18 Thread rnettleton

Repository: ambari
Updated Branches:
  refs/heads/trunk 3c4e9111e - ef40b86f5


AMBARI-10411. Yarn ResourceManager HA config properties not processed properly 
by Blueprints. (rnettleton)


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

Branch: refs/heads/trunk
Commit: ef40b86f5588a0c7f21e4c2830d000e25163267f
Parents: 3c4e911
Author: Bob Nettleton rnettle...@hortonworks.com
Authored: Mon May 18 13:54:59 2015 -0400
Committer: Bob Nettleton rnettle...@hortonworks.com
Committed: Mon May 18 13:55:40 2015 -0400

--
 .../BlueprintConfigurationProcessor.java| 131 ---
 .../ambari/server/topology/ClusterTopology.java |   7 +
 .../server/topology/ClusterTopologyImpl.java|  16 +++
 .../BlueprintConfigurationProcessorTest.java| 102 +++
 4 files changed, 239 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ef40b86f/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 d7ff543..6984881 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
@@ -226,6 +226,11 @@ public class BlueprintConfigurationProcessor {
 if (clusterTopology.isNameNodeHAEnabled()) {
   doNameNodeHAUpdate();
 }
+
+if (clusterTopology.isYarnResourceManagerHAEnabled()) {
+  doYarnResourceManagerHAUpdate();
+}
+
 CollectionMapString, MapString, String allConfigs = new 
ArrayListMapString, MapString, String();
 allConfigs.add(clusterTopology.getConfiguration().getFullProperties());
 for (HostGroupInfo groupInfo : 
clusterTopology.getHostGroupInfo().values()) {
@@ -278,14 +283,28 @@ public class BlueprintConfigurationProcessor {
 
   /**
* Creates a Collection of PropertyUpdater maps that will handle the 
configuration
-   *   update for this cluster.  If NameNode HA is enabled, then updater
-   *   instances will be added to the collection, in addition to the default 
list
-   *   of Updaters that are statically defined.
+   *   update for this cluster.
+   *
+   *   If NameNode HA is enabled, then updater instances will be added to the
+   *   collection, in addition to the default list of Updaters that are 
statically defined.
+   *
+   *   Similarly, if Yarn ResourceManager HA is enabled, then updater 
instances specific
+   *   to Yarn HA will be added to the default list of Updaters that are 
statically defined.
*
* @return Collection of PropertyUpdater maps used to handle cluster config 
update
*/
   private CollectionMapString, MapString, PropertyUpdater 
createCollectionOfUpdaters() {
-return (clusterTopology.isNameNodeHAEnabled()) ? 
addHAUpdaters(allUpdaters) : allUpdaters;
+CollectionMapString, MapString, PropertyUpdater updaters = 
allUpdaters;
+
+if (clusterTopology.isNameNodeHAEnabled()) {
+  updaters = addNameNodeHAUpdaters(updaters);
+}
+
+if (clusterTopology.isYarnResourceManagerHAEnabled()) {
+  updaters = addYarnResourceManagerHAUpdaters(updaters);
+}
+
+return updaters;
   }
 
   /**
@@ -299,7 +318,34 @@ public class BlueprintConfigurationProcessor {
*   this cluster config update
* @return A Collection of PropertyUpdater maps to handle the cluster config 
update
*/
-  private CollectionMapString, MapString, PropertyUpdater 
addHAUpdaters(CollectionMapString, MapString, PropertyUpdater updaters) {
+  private CollectionMapString, MapString, PropertyUpdater 
addNameNodeHAUpdaters(CollectionMapString, MapString, PropertyUpdater 
updaters) {
+CollectionMapString, MapString, PropertyUpdater 
highAvailabilityUpdaters =
+  new LinkedListMapString, MapString, PropertyUpdater();
+
+// always add the statically-defined list of updaters to the list to use
+// in processing cluster configuration
+highAvailabilityUpdaters.addAll(updaters);
+
+// add the updaters for the dynamic HA properties, based on the HA config 
in hdfs-site
+highAvailabilityUpdaters.add(createMapOfNameNodeHAUpdaters());
+
+return highAvailabilityUpdaters;
+  }
+
+  /**
+   * Creates a Collection of PropertyUpdater maps that include the Yarn 
ResourceManager HA

[2/6] ambari git commit: AMBARI-11216 Refactor service-config 'defaultValue' property into 'savedValue' and 'recommendedValue'. (ababiichuk)

2015-05-18 Thread ababiichuk

http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/app/utils/configs/config_property_helper.js
--
diff --git a/ambari-web/app/utils/configs/config_property_helper.js 
b/ambari-web/app/utils/configs/config_property_helper.js
index 07226c5..63b7290 100644
--- a/ambari-web/app/utils/configs/config_property_helper.js
+++ b/ambari-web/app/utils/configs/config_property_helper.js
@@ -36,14 +36,14 @@ module.exports = {
   case 'dfs.https.address':
   case 'dfs.namenode.https-address':
 var nnHost =  masterComponentHostsInDB.findProperty('component', 
'NAMENODE').hostName;
-this.setDefaultValue(configProperty, hostWithPort,nnHost);
+this.setRecommendedValue(configProperty, hostWithPort,nnHost);
 break;
   case 'fs.default.name':
   case 'fs.defaultFS':
   case 'hbase.rootdir':
   case 'instance.volumes':
 var nnHost = masterComponentHostsInDB.filterProperty('component', 
'NAMENODE').mapProperty('hostName');
-this.setDefaultValue(configProperty, hostWithPrefix,'://' + nnHost);
+this.setRecommendedValue(configProperty, hostWithPrefix,'://' + 
nnHost);
 break;
   case 'snamenode_host':
 // Secondary NameNode does not exist when NameNode HA is enabled
@@ -56,7 +56,7 @@ module.exports = {
   case 'dfs.namenode.secondary.http-address':
 var snnHost = masterComponentHostsInDB.findProperty('component', 
'SECONDARY_NAMENODE');
 if (snnHost) {
-  this.setDefaultValue(configProperty, hostWithPort,snnHost.hostName);
+  this.setRecommendedValue(configProperty, 
hostWithPort,snnHost.hostName);
 }
 break;
   case 'datanode_hosts':
@@ -73,12 +73,12 @@ module.exports = {
 break;
   case 'yarn.log.server.url':
 var hsHost = masterComponentHostsInDB.filterProperty('component', 
'HISTORYSERVER').mapProperty('hostName');
-this.setDefaultValue(configProperty, hostWithPrefix,'://' + hsHost);
+this.setRecommendedValue(configProperty, hostWithPrefix,'://' + 
hsHost);
 break;
   case 'mapreduce.jobhistory.webapp.address':
   case 'mapreduce.jobhistory.address':
 var hsHost = masterComponentHostsInDB.filterProperty('component', 
'HISTORYSERVER').mapProperty('hostName');
-this.setDefaultValue(configProperty, hostWithPort,hsHost);
+this.setRecommendedValue(configProperty, hostWithPort,hsHost);
 break;
   case 'rm_host':
 configProperty.set('value', 
masterComponentHostsInDB.findProperty('component', 'RESOURCEMANAGER').hostName);
@@ -92,8 +92,8 @@ module.exports = {
 break;
   case 'yarn.resourcemanager.hostname':
 var rmHost = masterComponentHostsInDB.findProperty('component', 
'RESOURCEMANAGER').hostName;
-configProperty.set('defaultValue',rmHost);
-configProperty.set('value',configProperty.get('defaultValue'));
+configProperty.set('recommendedValue',rmHost);
+configProperty.set('value',configProperty.get('recommendedValue'));
 break;
   case 'yarn.resourcemanager.resource-tracker.address':
   case 'yarn.resourcemanager.webapp.https.address':
@@ -102,14 +102,14 @@ module.exports = {
   case 'yarn.resourcemanager.address':
   case 'yarn.resourcemanager.admin.address':
 var rmHost = masterComponentHostsInDB.findProperty('component', 
'RESOURCEMANAGER').hostName;
-this.setDefaultValue(configProperty, hostWithPort,rmHost);
+this.setRecommendedValue(configProperty, hostWithPort,rmHost);
 break;
   case 'yarn.timeline-service.webapp.address':
   case 'yarn.timeline-service.webapp.https.address':
   case 'yarn.timeline-service.address':
 var atsHost =  masterComponentHostsInDB.findProperty('component', 
'APP_TIMELINE_SERVER');
 if (atsHost  atsHost.hostName) {
-  this.setDefaultValue(configProperty, hostWithPort,atsHost.hostName);
+  this.setRecommendedValue(configProperty, 
hostWithPort,atsHost.hostName);
 }
 break;
   case 'nm_hosts':
@@ -121,11 +121,11 @@ module.exports = {
   case 'mapred.job.tracker':
   case 'mapred.job.tracker.http.address':
 var jtHost = masterComponentHostsInDB.findProperty('component', 
'JOBTRACKER').hostName;
-this.setDefaultValue(configProperty, hostWithPort,jtHost);
+this.setRecommendedValue(configProperty, hostWithPort,jtHost);
 break;
   case 'mapreduce.history.server.http.address':
 var jtHost = masterComponentHostsInDB.findProperty('component', 
'HISTORYSERVER').hostName;
-this.setDefaultValue(configProperty, hostWithPort,jtHost);
+this.setRecommendedValue(configProperty, hostWithPort,jtHost);
 break;
   case 'tasktracker_hosts':
 configProperty.set('value', 
slaveComponentHostsInDB.findProperty('componentName',

[4/6] ambari git commit: AMBARI-11216 Refactor service-config 'defaultValue' property into 'savedValue' and 'recommendedValue'. (ababiichuk)

2015-05-18 Thread ababiichuk

http://git-wip-us.apache.org/repos/asf/ambari/blob/07616603/ambari-web/app/data/HDP2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2/site_properties.js 
b/ambari-web/app/data/HDP2/site_properties.js
index e818799..6a51391 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -82,7 +82,7 @@ var hdp2properties = [
 name: dfs.datanode.data.dir.mount.file,
 displayName: File that stores mount point for each data dir,
 description: File path that contains the last known mount point for 
each data dir. This file is used to avoid creating a DFS data dir on the root 
drive (and filling it up) if a path was previously mounted on a drive.,
-defaultValue: /etc/hadoop/conf/dfs_data_dir_mount.hist,
+recommendedValue: /etc/hadoop/conf/dfs_data_dir_mount.hist,
 displayType: directory,
 isVisible: true,
 category: DATANODE,
@@ -125,7 +125,7 @@ var hdp2properties = [
 id: site property,
 name: dfs.namenode.accesstime.precision,
 displayName: Access time precision,
-defaultValue: 0,
+recommendedValue: 0,
 displayType: long,
 category: NFS_GATEWAY,
 serviceName: HDFS,
@@ -136,7 +136,7 @@ var hdp2properties = [
 id: site property,
 name: nfs.exports.allowed.hosts,
 displayName: Allowed hosts,
-defaultValue: * rw,
+recommendedValue: * rw,
 displayType: string,
 category: NFS_GATEWAY,
 serviceName: HDFS,
@@ -523,7 +523,7 @@ var hdp2properties = [
 name: hive.server2.thrift.port,
 displayName: Hive Server Port,
 description: TCP port number to listen on, default 1.,
-defaultValue: 1,
+recommendedValue: 1,
 displayType: int,
 isReconfigurable: true,
 isOverridable: false,
@@ -536,7 +536,7 @@ var hdp2properties = [
 id: site property,
 name: hive.server2.support.dynamic.service.discovery,
 displayName: hive.server2.support.dynamic.service.discovery,
-defaultValue: true,
+recommendedValue: true,
 displayType: checkbox,
 category: Advanced hive-site,
 serviceName: HIVE,
@@ -546,7 +546,7 @@ var hdp2properties = [
 id: site property,
 name: hive.security.authorization.enabled,
 displayName: hive.security.authorization.enabled,
-defaultValue: false,
+recommendedValue: false,
 displayType: checkbox,
 category: Advanced hive-site,
 serviceName: HIVE,
@@ -1692,7 +1692,7 @@ var hdp2properties = [
 id: site property,
 name: *.falcon.graph.preserve.history,
 displayName: *.falcon.graph.preserve.history,
-defaultValue: false,
+recommendedValue: false,
 displayType: checkbox,
 category: FalconStartupSite,
 serviceName: FALCON,
@@ -1733,7 +1733,7 @@ var hdp2properties = [
 name: content,
 displayName: content,
 value: ,
-defaultValue: ,
+recommendedValue: ,
 description: pig properties,
 displayType: content,
 isRequired: false,
@@ -1749,7 +1749,7 @@ var hdp2properties = [
 name: content,
 displayName: content,
 value: ,
-defaultValue: ,
+recommendedValue: ,
 displayType: content,
 isRequired: false,
 showLabel: false,
@@ -1763,7 +1763,7 @@ var hdp2properties = [
 name: content,
 displayName: content,
 value: ,
-defaultValue: ,
+recommendedValue: ,
 displayType: content,
 isRequired: false,
 showLabel: false,
@@ -1776,7 +1776,7 @@ var hdp2properties = [
 name: knox_gateway_host,
 displayName: Knox Gateway host,
 value: ,
-defaultValue: ,
+recommendedValue: ,
 description: The hosts that have been assigned to run Knox Gateway,
 displayType: masterHosts,
 isOverridable: false,
@@ -1792,7 +1792,7 @@ var hdp2properties = [
 name: knox_master_secret,
 displayName: Knox Master Secret,
 value: ,
-defaultValue: ,
+recommendedValue: ,
 displayType: password,
 isReconfigurable: false,
 isOverridable: false,
@@ -1820,7 +1820,7 @@ var hdp2properties = [
 name: kafka_broker_hosts,
 displayName: Kafka Broker host,
 value: ,
-defaultValue: ,
+recommendedValue: ,
 description: The host that has been assigned to run Kafka Broker,
 displayType: masterHosts,
 isOverridable: false,
@@ -1836,7 +1836,7 @@ var hdp2properties = [
 name: log.dirs,
 displayName: log.dirs,
 value: ,
-defaultValue: ,
+recommendedValue: ,
 defaultDirectory: /kafka-logs,
 displayType: directories,
 serviceName: KAFKA,
@@ -1849,7 +1849,7 @@ var hdp2properties = [
 name: port,
 displayName: port,
 value: ,
-defaultValue: ,
+recommendedValue: ,
 displayType: int,
 serviceName: KAFKA,
 filename: kafka-broker.xml,
@@ -1861,7 +1861,7 @@ var hdp2properties = [
 name: listeners,
 displayName: listeners,
 value: ,
-defaultValue: ,
+recommendedValue: ,

ambari git commit: AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of user group with spaces (aonishuk)

2015-05-18 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.maint f5d0397f2 - f1d1be8de


AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of 
user group with spaces (aonishuk)


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

Branch: refs/heads/branch-2.0.maint
Commit: f1d1be8ded1f374a54d2801179ae3a534781a0b9
Parents: f5d0397
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Mon May 18 21:31:59 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Mon May 18 21:31:59 2015 +0300

--
 ambari-common/src/main/python/resource_management/core/source.py | 2 +-
 .../python/resource_management/libraries/providers/xml_config.py | 2 +-
 .../common-services/HDFS/2.1.0.2.0/configuration/core-site.xml   | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f1d1be8d/ambari-common/src/main/python/resource_management/core/source.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/source.py 
b/ambari-common/src/main/python/resource_management/core/source.py
index 3e3276f..8693c65 100644
--- a/ambari-common/src/main/python/resource_management/core/source.py
+++ b/ambari-common/src/main/python/resource_management/core/source.py
@@ -130,7 +130,7 @@ else:
   self.context.update(variables)
   
   rendered = self.template.render(self.context)
-  return rendered + \n if not rendered.endswith('\n') else rendered
+  return rendered
 
   class InlineTemplate(Template):
 def __init__(self, name, extra_imports=[], **kwargs):

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1d1be8d/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
 
b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
index da7a907..494d3e7 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
@@ -41,7 +41,7 @@ class XmlConfigProvider(Provider):
 {% for key, value in configurations_dict|dictsort %}
 property
   name{{ key|e }}/name
-  value{{ 
resource_management.core.source.InlineTemplate(value).get_content().strip() |e 
}}/value
+  value{{ 
resource_management.core.source.InlineTemplate(value).get_content() |e 
}}/value
   {%- if not configuration_attrs is none -%}
   {%- for attrib_name, attrib_occurances in  configuration_attrs.items() 
-%}
   {%- for property_name, attrib_value in  attrib_occurances.items() -%}

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1d1be8d/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
index c0cd6b3..ccbc5cf 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
@@ -135,9 +135,7 @@
 
   property
 namehadoop.security.auth_to_local/name
-value
-DEFAULT
-/value
+valueDEFAULT/value
 descriptionThe mapping from kerberos principal names to local OS 
mapreduce.job.user.names.
   So the default rule is just DEFAULT which takes all principals in your 
default domain to their first component.
   omal...@apache.org and omalley/ad...@apache.org to omalley, if your 
default domain is APACHE.ORG.

ambari git commit: AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of user group with spaces (aonishuk)

2015-05-18 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/trunk ef40b86f5 - 220a5a271


AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of 
user group with spaces (aonishuk)


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

Branch: refs/heads/trunk
Commit: 220a5a27196ca0d0d8e98d95c47a76f377b24282
Parents: ef40b86
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Mon May 18 21:34:11 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Mon May 18 21:34:11 2015 +0300

--
 .../providers/modify_properties_file.py |   4 +-
 .../libraries/providers/properties_file.py  |   2 +-
 .../libraries/providers/xml_config.py   |   2 +-
 .../HDFS/2.1.0.2.0/configuration/core-site.xml  |   4 +-
 .../services/HBASE/configuration/hbase-site.xml |   4 +-
 .../services/HDFS/configuration/core-site.xml   |   2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |   2 +-
 .../HDFS/configuration/hdfs-site.xml.orig   |  58 ++
 ambari-web/app/data/HDP2.2/site_properties.js   |  40 +
 .../app/data/HDP2.2/site_properties.js.orig | 830 +++
 10 files changed, 937 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/220a5a27/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
 
b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
index e71abb8..661cb68 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
@@ -52,14 +52,14 @@ class ModifyPropertiesFileProvider(Provider):
   in_var_value = line.split(delimiter)[1].strip()
   
   if in_var_name in properties:
-value = 
InlineTemplate(unicode(properties[in_var_name])).get_content().strip()
+value = 
InlineTemplate(unicode(properties[in_var_name])).get_content()
 new_content_lines[line_num] = 
u{0}{1}{2}.format(unicode(in_var_name), delimiter, value)
 unsaved_values.remove(in_var_name)
 else:
   Logger.info(format(Creating new properties file as {filename} doesn't 
exist))

 for property_name in unsaved_values:
-  value = 
InlineTemplate(unicode(properties[property_name])).get_content().strip()
+  value = InlineTemplate(unicode(properties[property_name])).get_content()
   line = u{0}{1}{2}.format(unicode(property_name), delimiter, value)
   new_content_lines.append(line)
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/220a5a27/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
 
b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
index 1d21649..53459dd 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
@@ -42,7 +42,7 @@ class PropertiesFileProvider(Provider):
 
 config_content = InlineTemplate('''# Generated by Apache Ambari. 
{{time.asctime(time.localtime())}}
 {% for key, value in properties_dict|dictsort %}
-{{key}}{{key_value_delimiter}}{{ 
resource_management.core.source.InlineTemplate(str(value)).get_content().strip()
 }}{% endfor %}
+{{key}}{{key_value_delimiter}}{{ 
resource_management.core.source.InlineTemplate(str(value)).get_content() }}{% 
endfor %}
 ''', extra_imports=[time, resource_management, resource_management.core, 
resource_management.core.source], properties_dict=self.resource.properties, 
key_value_delimiter=self.resource.key_value_delimiter)
 
 Logger.info(format(Generating properties file: {filepath}))

http://git-wip-us.apache.org/repos/asf/ambari/blob/220a5a27/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
 
b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
index 6f6c2a1..0fed503 100644
---

ambari git commit: AMBARI-11218. Hive alerts need to use either legacy or new conf locations (ncole)

2015-05-18 Thread ncole

Repository: ambari
Updated Branches:
  refs/heads/trunk 220a5a271 - 2015be59a


AMBARI-11218. Hive alerts need to use either legacy or new conf locations 
(ncole)


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

Branch: refs/heads/trunk
Commit: 2015be59acced0845a614e68bba3ed97a2552af7
Parents: 220a5a2
Author: Nate Cole nc...@hortonworks.com
Authored: Mon May 18 11:44:36 2015 -0400
Committer: Nate Cole nc...@hortonworks.com
Committed: Mon May 18 15:27:21 2015 -0400

--
 .../common-services/HIVE/0.12.0.2.0/alerts.json  |  9 -
 .../package/alerts/alert_hive_metastore.py   | 19 +--
 .../package/alerts/alert_webhcat_server.py   | 17 +++--
 3 files changed, 40 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2015be59/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json
index 2bdc532..55e3f78 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json
@@ -88,6 +88,13 @@
   path: HIVE/0.12.0.2.0/package/alerts/alert_webhcat_server.py,
   parameters: [
 {
+  name: default.smoke.user,
+  display_name: Default Smoke User,
+  value: ambari-qa,
+  type: STRING,
+  description: The user that will run the Hive commands if not 
specified in cluster-env/smokeuser
+},
+{
   name: connection.timeout,
   display_name: Connection Timeout,
   value: 5.0,
@@ -101,4 +108,4 @@
   }
 ]
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/2015be59/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
index a7ed54f..b6bc69d 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_metastore.py
@@ -18,6 +18,7 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 
 
+import os
 import socket
 import time
 
@@ -49,6 +50,13 @@ SMOKEUSER_PRINCIPAL_DEFAULT = 'ambari...@example.com'
 SMOKEUSER_SCRIPT_PARAM_KEY = 'default.smoke.user'
 SMOKEUSER_DEFAULT = 'ambari-qa'
 
+HIVE_CONF_DIR = '/usr/hdp/current/hive-metastore/conf/conf.server'
+HIVE_CONF_DIR_LEGACY = '/etc/hive/conf.server'
+
+HIVE_BIN_DIR = '/usr/hdp/current/hive-metastore/bin'
+HIVE_BIN_DIR_LEGACY = '/usr/lib/hive/bin'
+
+
 def get_tokens():
   
   Returns a tuple of tokens in the format {{site/property}} that will be used
@@ -130,7 +138,14 @@ def execute(configurations={}, parameters={}, 
host_name=None):
   if host_name in uri:
 metastore_uri = uri
 
-cmd = format(export HIVE_CONF_DIR='/etc/hive/conf.server/' ; 
+conf_dir = HIVE_CONF_DIR_LEGACY
+bin_dir = HIVE_BIN_DIR_LEGACY
+
+if os.path.exists(HIVE_CONF_DIR):
+  conf_dir = HIVE_CONF_DIR
+  bin_dir = HIVE_BIN_DIR
+
+cmd = format(export HIVE_CONF_DIR='{conf_dir}' ; 
  hive --hiveconf hive.metastore.uris={metastore_uri}\
  --hiveconf hive.metastore.client.connect.retry.delay=1s\
  --hiveconf hive.metastore.failure.retries=1\
@@ -142,7 +157,7 @@ def execute(configurations={}, parameters={}, 
host_name=None):
 
 try:
   Execute(cmd, user=smokeuser,
-path=[/bin/, /usr/bin/, /usr/lib/hive/bin/, /usr/sbin/],
+path=[/bin/, /usr/bin/, /usr/sbin/, bin_dir],
 timeout=30 )
 
   total_time = time.time() - start_time

http://git-wip-us.apache.org/repos/asf/ambari/blob/2015be59/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_webhcat_server.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_webhcat_server.py

svn commit: r1680102 - /ambari/site/team-list.html

2015-05-18 Thread alejandro

Author: alejandro
Date: Mon May 18 21:11:41 2015
New Revision: 1680102

URL: http://svn.apache.org/r1680102
Log:
Updated team list, changed Jonathan Hurley to PMC (alejandro)

Modified:
ambari/site/team-list.html

Modified: ambari/site/team-list.html
URL: 
http://svn.apache.org/viewvc/ambari/site/team-list.html?rev=1680102r1=1680101r2=1680102view=diff
==
--- ambari/site/team-list.html (original)
+++ ambari/site/team-list.html Mon May 18 21:11:41 2015
@@ -625,7 +625,7 @@
 
 div id=bodyColumn  class=span10 
   
-div class=sectionh2The Teama name=The_Team/a/h2a 
name=The_Team/apA successful project requires many people to play many 
roles. Some members write code or documentation, while others are valuable as 
testers, submitting patches and suggestions./ppThe team is comprised of 
Members and Contributors. Members have direct access to the source of a project 
and actively evolve the code-base. Contributors improve the project through 
submission of patches and suggestions to the Members. The number of 
Contributors to the project is unbounded. Get involved today. All contributions 
to the project are greatly appreciated./pdiv class=sectionh3Membersa 
name=Members/a/h3a name=Members/apThe following is a list of 
developers with commit privileges that have directly contributed to the project 
in one way or another./ptable border=0 class=table table-stripedtr 
class=athId/ththName/ththEmail/ththOrganization/ththRo
 les/ththTime Zone/ththActual Time (GMT)/th/trtr class=btda 
name=ababiichuk/aababiichuk/tdtdAndrii Babiichuk/tdtda 
class=externalLink 
href=mailto:ababiic...@apache.org;ababiic...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan
 id=developer-0+2/span/td/trtr class=atda 
name=abaranchuk/aabaranchuk/tdtdArtem Baranchuk/tdtda 
class=externalLink 
href=mailto:abaranc...@apache.org;abaranc...@apache.org/a/tdtdHortonworks/tdtdCommitter/tdtd+2/tdtdspan
 id=developer-1+2/span/td/trtr class=btda 
name=alejandro/aalejandro/tdtdAlejandro Fernandez/tdtda 
class=externalLink 
href=mailto:alejan...@apache.org;alejan...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd-8/tdtdspan
 id=developer-2-8/span/td/trtr class=atda 
name=aonishuk/aaonishuk/tdtdAndrew Onischuk/tdtda 
class=externalLink href=mailto:aonis...@apache.org
 
aonis...@apache.org/a/tdtdHortonworks/tdtdCommitter/tdtd+2/tdtdspan
 id=developer-3+2/span/td/trtr class=btda 
name=atkach/aatkach/tdtdAndrii Tkach/tdtda class=externalLink 
href=mailto:atk...@apache.org;atk...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan
 id=developer-4+2/span/td/trtr class=atda 
name=akovalenko/aakovalenko/tdtdAleksandr Kovalenko/tdtda 
class=externalLink 
href=mailto:akovale...@apache.org;akovale...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan
 id=developer-5+2/span/td/trtr class=btda 
name=alexantonenko/aalexantonenko/tdtdAlex Antonenko/tdtda 
class=externalLink 
href=mailto:alexantone...@apache.org;alexantone...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan
 id=developer-6+2/span/td/trtr class=atda 
name=berndf/aberndf/tdtdBernd Fondermann/tdtda
  class=externalLink 
href=mailto:ber...@apache.org;ber...@apache.org/a/tdtd-/tdtdPMC/tdtd+1/tdtdspan
 id=developer-7+1/span/td/trtr class=btda 
name=billie/abillie/tdtdBillie Rinaldi/tdtda class=externalLink 
href=mailto:bil...@apache.org;bil...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd-8/tdtdspan
 id=developer-8-8/span/td/trtr class=atda 
name=croberts/acroberts/tdtdChad Roberts/tdtda 
class=externalLink 
href=mailto:crobe...@apache.org;crobe...@apache.org/a/tdtdRed 
Hat/tdtdPMC/tdtd-/tdtdspan id=developer-9-/span/td/trtr 
class=btda name=ddas/addas/tdtdDevaraj Das/tdtda 
class=externalLink 
href=mailto:d...@hortonworks.com;d...@hortonworks.com/a/tdtdHortonworks/tdtdPMC/tdtd-8/tdtdspan
 id=developer-10-8/span/td/trtr class=atda 
name=ddorai/addorai/tdtdDilli Arumugam/tdtda class=externa
 lLink 
href=mailto:ddo...@hortonworks.com;ddo...@hortonworks.com/a/tdtdHortonworks/tdtdCommitter/tdtd-8/tdtdspan
 id=developer-11-8/span/td/trtr class=btda 
name=dmitriusan/admitriusan/tdtdDmitry Lysnichenko/tdtda 
class=externalLink 
href=mailto:dmitriu...@apache.org;dmitriu...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan
 id=developer-12+2/span/td/trtr class=atda 
name=dsen/adsen/tdtdDmitry Sen/tdtda class=externalLink 
href=mailto:d...@apache.org;d...@apache.org/a/tdtdHortonworks/tdtdPMC/tdtd+2/tdtdspan
 id=developer-13+2/span/td/trtr class=btda 
name=eyang/aeyang/tdtdEric Yang/tdtda class=externalLink 
href=mailto:ey...@apache.org;ey...@apache.org/a/tdtdIBM/tdtdPMC/tdtd-8/tdtdspan
 id=developer-14-8/span/td/trtr class=atda 
name=eboyd/aeboyd/tdtdErin A. Boyd/tdtda class=exter
 nalLink href=mailto:eb...@apache.org;eb...@apache.org/a/tdtdRed 
Hat/tdtdCommitter/tdtd-8/tdtdspan 
id=developer-15-8/span/td/trtr class=btda 
name=fbarca/afbarca/tdtdFlorian Barca/tdtda

ambari git commit: Updated team list, changed Jonathan Hurley to PMC (alejandro)

2015-05-18 Thread alejandro

Repository: ambari
Updated Branches:
  refs/heads/trunk 747e5ba23 - 871667c36


Updated team list, changed Jonathan Hurley to PMC (alejandro)


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

Branch: refs/heads/trunk
Commit: 871667c36043bcfabf8e4b9d97248738ab0f0e3d
Parents: 747e5ba
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Mon May 18 14:22:50 2015 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Mon May 18 14:22:50 2015 -0700

--
 docs/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/871667c3/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index b1caf96..7d11406 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -376,7 +376,7 @@
 emailjonathanhur...@apache.org/email
 timezone-8/timezone
 roles
-roleCommitter/role
+rolePMC/role
 /roles
 organization
 Hortonworks

ambari git commit: AMBARI-11226. Fix cluster blueprint export mapping of components to host groups

2015-05-18 Thread jspeidel

Repository: ambari
Updated Branches:
  refs/heads/trunk 14bb30125 - 6971baebb


AMBARI-11226. Fix cluster blueprint export mapping of components to host groups


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

Branch: refs/heads/trunk
Commit: 6971baebb976d1b316e75a74a88c39350c79b956
Parents: 14bb301
Author: John Speidel jspei...@hortonworks.com
Authored: Mon May 18 16:27:30 2015 -0400
Committer: John Speidel jspei...@hortonworks.com
Committed: Mon May 18 18:00:49 2015 -0400

--
 .../internal/ExportBlueprintRequest.java|   8 +-
 .../internal/ExportBlueprintRequestTest.java| 166 +++
 2 files changed, 167 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6971baeb/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java
index 9318db9..1e71094 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java
@@ -122,16 +122,10 @@ public class ExportBlueprintRequest implements 
TopologyRequest {
 String bpName = exported-blueprint;
 
 CollectionHostGroup hostGroups = new ArrayListHostGroup();
-int count = 1;
 for (ExportedHostGroup exportedHostGroup : exportedHostGroups) {
-
-  //todo: for now can just get from ExportedHostGroup
-  //String cardinality = 
String.valueOf(hostGroupInfo.get(exportedHostGroup.getName()).getHostNames().size());
-  hostGroups.add(new HostGroupImpl(host_group_ + count++, bpName, stack, 
exportedHostGroup.getComponents(),
+  hostGroups.add(new HostGroupImpl(exportedHostGroup.getName(), bpName, 
stack, exportedHostGroup.getComponents(),
   exportedHostGroup.getConfiguration(), 
String.valueOf(exportedHostGroup.getCardinality(;
 }
-
-
 blueprint = new BlueprintImpl(bpName, hostGroups, stack, configuration);
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6971baeb/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequestTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequestTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequestTest.java
new file mode 100644
index 000..1c3310d
--- /dev/null
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequestTest.java
@@ -0,0 +1,166 @@
+/**
+ * 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 distribut
+ * ed 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.controller.internal;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.ambari.server.api.util.TreeNode;
+import org.apache.ambari.server.api.util.TreeNodeImpl;
+import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.controller.StackConfigurationResponse;
+import org.apache.ambari.server.controller.StackLevelConfigurationRequest;
+import org.apache.ambari.server.controller.StackServiceRequest;
+import org.apache.ambari.server.controller.StackServiceResponse;
+import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.topology.Blueprint;
+import org.apache.ambari.server.topology.HostGroup;
+import

ambari git commit: AMBARI-11184. AMS: Incorrect value obtained for a datapoint in the metric data series queried from AMS. (swagle)

2015-05-18 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/trunk 2015be59a - 8b0c964a8


AMBARI-11184. AMS: Incorrect value obtained for a datapoint in the metric data 
series queried from AMS. (swagle)


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

Branch: refs/heads/trunk
Commit: 8b0c964a89ffd4d352d0deac0756923242a252e9
Parents: 2015be5
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Mon May 18 13:07:06 2015 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Mon May 18 13:07:06 2015 -0700

--
 .../metrics/timeline/PhoenixHBaseAccessor.java  |   8 +-
 .../timeline/TimelineMetricConfiguration.java   |   3 +
 .../aggregators/AbstractTimelineAggregator.java |   6 +-
 .../TimelineMetricClusterAggregatorMinute.java  | 131 +--
 .../aggregators/TimelineMetricReadHelper.java   |   4 +-
 .../timeline/AbstractMiniHBaseClusterTest.java  |  80 ++-
 .../metrics/timeline/ITClusterAggregator.java   | 130 ++
 .../0.1.0/configuration/ams-site.xml|   2 +-
 8 files changed, 290 insertions(+), 74 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8b0c964a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
index b890171..bf1ae66 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
@@ -313,8 +313,7 @@ public class PhoenixHBaseAccessor {
 }
   }
 
-  public void insertMetricRecords(TimelineMetrics metrics)
-throws SQLException, IOException {
+  public void insertMetricRecords(TimelineMetrics metrics) throws 
SQLException, IOException {
 
 ListTimelineMetric timelineMetrics = metrics.getMetrics();
 if (timelineMetrics == null || timelineMetrics.isEmpty()) {
@@ -351,9 +350,8 @@ public class PhoenixHBaseAccessor {
 metricRecordStmt.setDouble(8, aggregates[0]);
 metricRecordStmt.setDouble(9, aggregates[1]);
 metricRecordStmt.setDouble(10, aggregates[2]);
-metricRecordStmt.setLong(11, (long)aggregates[3]);
-String json =
-  TimelineUtils.dumpTimelineRecordtoJSON(metric.getMetricValues());
+metricRecordStmt.setLong(11, (long) aggregates[3]);
+String json = 
TimelineUtils.dumpTimelineRecordtoJSON(metric.getMetricValues());
 metricRecordStmt.setString(12, json);
 
 try {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8b0c964a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
index 0595c20..0461261 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
@@ -157,6 +157,9 @@ public class TimelineMetricConfiguration {
   public static final String CLUSTER_AGGREGATOR_APP_IDS =
 timeline.metrics.service.cluster.aggregator.appIds;
 
+  public static final String SERVER_SIDE_TIMESIFT_ADJUSTMENT =
+timeline.metrics.service.cluster.aggregator.timeshift.adjustment;
+
   public static final String HOST_APP_ID = HOST;
 
   private Configuration hbaseConf;

ambari git commit: AMBARI-11220 - Tez Upgrade Pack For HDP-2.2 to HDP-2.3 (part2) (jonathanhurley)

2015-05-18 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/trunk 67ca6364d - 514a4d8d1


AMBARI-11220 - Tez Upgrade Pack For HDP-2.2 to HDP-2.3 (part2) (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: 514a4d8d15b2ea5c534cd016433f474c427c1d35
Parents: 67ca636
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Mon May 18 12:51:53 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Mon May 18 16:35:11 2015 -0400

--
 .../src/test/python/stacks/2.0.6/YARN/test_nodemanager.py| 4 
 .../src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py| 4 
 .../src/test/python/stacks/2.1/YARN/test_apptimelineserver.py| 2 --
 3 files changed, 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/514a4d8d/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
index 404957e..005b533 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_nodemanager.py
@@ -79,8 +79,6 @@ class TestNodeManager(RMFTestCase):
 )
 self.assertResourceCalled('Execute', 'export 
HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec  
/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop 
nodemanager',
   user='yarn')
-self.assertResourceCalled('File', 
'/var/run/hadoop-yarn/yarn/yarn-yarn-nodemanager.pid',
-  action=['delete'])
 self.assertNoMoreResources()
 
   def test_configure_secured(self):
@@ -130,8 +128,6 @@ class TestNodeManager(RMFTestCase):
 )
 self.assertResourceCalled('Execute', 'export 
HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec  
/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop 
nodemanager',
   user='yarn')
-self.assertResourceCalled('File', 
'/var/run/hadoop-yarn/yarn/yarn-yarn-nodemanager.pid',
-  action=['delete'])
 self.assertNoMoreResources()
 
   def assert_configure_default(self):

http://git-wip-us.apache.org/repos/asf/ambari/blob/514a4d8d/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py 
b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
index 4800dc8..a2ee27f 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/YARN/test_resourcemanager.py
@@ -118,8 +118,6 @@ class TestResourceManager(RMFTestCase):
 
 self.assertResourceCalled('Execute', 'export 
HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec  
/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop 
resourcemanager',
   user='yarn')
-self.assertResourceCalled('File', 
'/var/run/hadoop-yarn/yarn/yarn-yarn-resourcemanager.pid',
-  action=['delete'])
 self.assertNoMoreResources()
 
   def test_configure_secured(self):
@@ -168,8 +166,6 @@ class TestResourceManager(RMFTestCase):
 
 self.assertResourceCalled('Execute', 'export 
HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec  
/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop 
resourcemanager',
   user='yarn')
-self.assertResourceCalled('File', 
'/var/run/hadoop-yarn/yarn/yarn-yarn-resourcemanager.pid',
-  action=['delete'])
 self.assertNoMoreResources()
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/514a4d8d/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py 
b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py
index 5d6d104..9e8b405 100644
--- a/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py
+++ b/ambari-server/src/test/python/stacks/2.1/YARN/test_apptimelineserver.py
@@ -82,8 +82,6 @@ class TestAppTimelineServer(RMFTestCase):
 self.assertResourceCalled('Execute', 'export 
HADOOP_LIBEXEC_DIR=/usr/lib/hadoop/libexec  
/usr/lib/hadoop-yarn/sbin/yarn-daemon.sh --config /etc/hadoop/conf stop 
timelineserver',

ambari git commit: AMBARI-11222. Remove hive_dbroot (unused property) from the HDP stack definitions. (rnettleton)

2015-05-18 Thread rnettleton

Repository: ambari
Updated Branches:
  refs/heads/trunk 871667c36 - 14bb30125


AMBARI-11222. Remove hive_dbroot (unused property) from the HDP stack 
definitions. (rnettleton)


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

Branch: refs/heads/trunk
Commit: 14bb3012597d6463ec375c6a86b7039b43ee4278
Parents: 871667c
Author: Bob Nettleton rnettle...@hortonworks.com
Authored: Mon May 18 17:50:40 2015 -0400
Committer: Bob Nettleton rnettle...@hortonworks.com
Committed: Mon May 18 17:51:18 2015 -0400

--
 .../common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml | 5 -
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py| 1 -
 .../main/resources/custom_actions/scripts/validate_configs.py  | 6 +++---
 .../stacks/HDP/1.3.0/services/HIVE/configuration/global.xml| 5 -
 .../stacks/HDP/2.0.7/services/HIVE/package/scripts/params.py   | 1 -
 5 files changed, 3 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/14bb3012/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index 92373ad..923a9ba 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -50,11 +50,6 @@
 descriptionDatabase name./description
   /property
   property
-namehive_dbroot/name
-value/usr/lib/hive/lib//value
-descriptionHive DB Directory./description
-  /property
-  property
 namehive_log_dir/name
 value/var/log/hive/value
 descriptionDirectory for Hive Log files./description

http://git-wip-us.apache.org/repos/asf/ambari/blob/14bb3012/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index fb90b57..7254f3c 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -211,7 +211,6 @@ hive_metastore_keytab_path =  
config['configurations']['hive-site']['hive.metast
 hive_server2_keytab = 
config['configurations']['hive-site']['hive.server2.authentication.kerberos.keytab']
 
 #hive_env
-hive_dbroot = config['configurations']['hive-env']['hive_dbroot']
 hive_log_dir = config['configurations']['hive-env']['hive_log_dir']
 hive_pid_dir = status_params.hive_pid_dir
 hive_pid = status_params.hive_pid

http://git-wip-us.apache.org/repos/asf/ambari/blob/14bb3012/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py
--
diff --git 
a/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py 
b/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py
index 4529539..4ef0f00 100644
--- 
a/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py
+++ 
b/ambari-server/src/main/resources/custom_actions/scripts/validate_configs.py
@@ -120,13 +120,13 @@ PROPERTIES_TO_CHECK = {
   },
   #HIVE
   HIVE_METASTORE: {
-hive-env: [hive_dbroot, hive_log_dir, hive_pid_dir]
+hive-env: [hive_log_dir, hive_pid_dir]
   },
   HIVE_SERVER: {
-hive-env: [hive_dbroot, hive_log_dir, hive_pid_dir]
+hive-env: [hive_log_dir, hive_pid_dir]
   },
   MYSQL_SERVER: {
-hive-env: [hive_dbroot, hive_log_dir, hive_pid_dir]
+hive-env: [hive_log_dir, hive_pid_dir]
   },
   HIVE_CLIENT: {
 hive-env: [hive_log_dir, hive_pid_dir]

http://git-wip-us.apache.org/repos/asf/ambari/blob/14bb3012/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/configuration/global.xml
--
diff --git 
a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/configuration/global.xml
 
b/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/configuration/global.xml
index d9adc80..e5fd427 100644
--- 
a/ambari-server/src/test/resources/stacks/HDP/1.3.0/services/HIVE/configuration/global.xml

ambari git commit: Revert AMBARI-11019 AMS config warning message is confusing. (atkach)

2015-05-18 Thread yusaku

Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0 0af759d99 - 85357a424


Revert AMBARI-11019 AMS config warning message is confusing. (atkach)

This reverts commit 0af759d99bc9941faeffa16b8d85a3a4c4ebd0cd.


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

Branch: refs/heads/branch-2.0.0
Commit: 85357a424b4ff5870d36f70eb465d790ce8e2918
Parents: 0af759d
Author: Yusaku Sako yus...@hortonworks.com
Authored: Mon May 18 14:34:15 2015 -0700
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Mon May 18 14:34:15 2015 -0700

--
 .../stacks/HDP/2.0.6/services/stack_advisor.py  | 44 +++-
 ambari-web/app/messages.js  |  1 -
 ambari-web/app/mixins/common/serverValidator.js | 11 ++---
 .../configs/config_recommendation_popup.hbs | 16 +++
 4 files changed, 24 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/85357a42/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index ce90bc9..5e42b50 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -272,36 +272,8 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 if siteProperties is not None:
   resultItems = method(siteProperties, 
recommendedDefaults[siteName][properties], configurations, services, hosts)
   items.extend(resultItems)
-clusterWideItems = self.validateClusterConfigurations(configurations, 
services, hosts)
-items.extend(clusterWideItems)
 return items
 
-  def validateClusterConfigurations(self, configurations, services, hosts):
-validationItems = []
-hostComponents = {}
-failureMessage = 
-
-for service in services[services]:
-  for component in service[components]:
-if component[StackServiceComponents][hostnames] is not None:
-  for hostName in component[StackServiceComponents][hostnames]:
-if hostName not in hostComponents.keys():
-  hostComponents[hostName] = []
-
hostComponents[hostName].append(component[StackServiceComponents][component_name])
-
-for host in hosts[items]:
-  # Not enough physical memory
-  requiredMemory = 
getMemorySizeRequired(hostComponents[host[Hosts][host_name]], 
configurations)
-  if host[Hosts][total_mem] * 1024  requiredMemory:  # in bytes
-failureMessage += Not enough physical RAM on the host {0}.  \
-  At least {1} MB is recommended based on components 
assigned.\n \
-  .format(host[Hosts][host_name], requiredMemory/1048576)  # MB
-if failureMessage:
-  notEnoughMemoryItem = self.getWarnItem(failureMessage)
-  validationItems.extend([{config-name: , item: 
notEnoughMemoryItem}])
-
-return self.toConfigurationValidationProblems(validationItems, )
-
   def getServiceConfigurationValidators(self):
 return {
   HDFS: {hadoop-env: self.validateHDFSConfigurationsEnv},
@@ -377,12 +349,16 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 masterHostItem = None
 
 if masterItem is None:
+  hostComponents = {}
   hostMasterComponents = {}
 
   for service in services[services]:
 for component in service[components]:
   if component[StackServiceComponents][hostnames] is not None:
 for hostName in component[StackServiceComponents][hostnames]:
+  if hostName not in hostComponents.keys():
+hostComponents[hostName] = []
+  
hostComponents[hostName].append(component[StackServiceComponents][component_name])
   if self.isMasterComponent(component):
 if hostName not in hostMasterComponents.keys():
   hostMasterComponents[hostName] = []
@@ -405,6 +381,18 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 masterHostMessage.format(
   collectorHostName, str(, 
.join(hostMasterComponents[collectorHostName]
 
+# No enough physical memory
+# TODO Add AMBARI_METRICS Collector Xmx property to ams-env
+requiredMemory = 
getMemorySizeRequired(hostComponents[collectorHostName], configurations)
+if host[Hosts][total_mem] * 1024  requiredMemory:  # in bytes
+  message = No enough total RAM on the host {0},  \
+

ambari git commit: AMBARI-11187. Y-axis label is cut off or not shown at all in the dashboard / widget graphs.(XIWANG)

2015-05-18 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 6971baebb - 2932476fb


AMBARI-11187. Y-axis label is cut off or not shown at all in the dashboard / 
widget graphs.(XIWANG)


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

Branch: refs/heads/trunk
Commit: 2932476fb031e0b2b0749a96c66d7e0835b21382
Parents: 6971bae
Author: Xi Wang xiw...@apache.org
Authored: Mon May 18 14:48:38 2015 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Mon May 18 15:13:24 2015 -0700

--
 ambari-web/app/views/common/chart/linear_time.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2932476f/ambari-web/app/views/common/chart/linear_time.js
--
diff --git a/ambari-web/app/views/common/chart/linear_time.js 
b/ambari-web/app/views/common/chart/linear_time.js
index 2f0c33a..ab824ca 100644
--- a/ambari-web/app/views/common/chart/linear_time.js
+++ b/ambari-web/app/views/common/chart/linear_time.js
@@ -366,7 +366,7 @@ App.ChartLinearTimeView = Ember.View.extend({
 this.draw(seriesData);
 this.set('hasData', true);
   //move yAxis value lower to make them fully visible
-$(# + this.id + -container).find('.y_axis text').attr('y',8);
+$(# + this.get('id') + -container).find('.y_axis 
text').attr('y',8);
   }
 }
 else {
@@ -561,6 +561,7 @@ App.ChartLinearTimeView = Ember.View.extend({
 
 new Rickshaw.Graph.Axis.Y({
   tickFormat: this.yAxisFormatter,
+  pixelsPerTick: (isPopup ? 75 : 40),
   element: yaxisElement,
   orientation: (isPopup ? 'left' : 'right'),
   graph: _graph

ambari git commit: Revert AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of user group with spaces (aonishuk)

2015-05-18 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/trunk 514a4d8d1 - cf0877cea


Revert AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL 
value of user group with spaces (aonishuk)

This reverts commit 220a5a27196ca0d0d8e98d95c47a76f377b24282.


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

Branch: refs/heads/trunk
Commit: cf0877cea1cbc5de42c89a342924f5081db8e3f7
Parents: 514a4d8
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Mon May 18 16:53:52 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Mon May 18 16:53:52 2015 -0400

--
 .../providers/modify_properties_file.py |   4 +-
 .../libraries/providers/properties_file.py  |   2 +-
 .../libraries/providers/xml_config.py   |   2 +-
 .../HDFS/2.1.0.2.0/configuration/core-site.xml  |   4 +-
 .../services/HBASE/configuration/hbase-site.xml |   4 +-
 .../services/HDFS/configuration/core-site.xml   |   2 +-
 .../services/HDFS/configuration/hdfs-site.xml   |   2 +-
 .../HDFS/configuration/hdfs-site.xml.orig   |  58 --
 ambari-web/app/data/HDP2.2/site_properties.js   |  40 -
 .../app/data/HDP2.2/site_properties.js.orig | 830 ---
 10 files changed, 11 insertions(+), 937 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cf0877ce/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
 
b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
index 661cb68..e71abb8 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
@@ -52,14 +52,14 @@ class ModifyPropertiesFileProvider(Provider):
   in_var_value = line.split(delimiter)[1].strip()
   
   if in_var_name in properties:
-value = 
InlineTemplate(unicode(properties[in_var_name])).get_content()
+value = 
InlineTemplate(unicode(properties[in_var_name])).get_content().strip()
 new_content_lines[line_num] = 
u{0}{1}{2}.format(unicode(in_var_name), delimiter, value)
 unsaved_values.remove(in_var_name)
 else:
   Logger.info(format(Creating new properties file as {filename} doesn't 
exist))

 for property_name in unsaved_values:
-  value = InlineTemplate(unicode(properties[property_name])).get_content()
+  value = 
InlineTemplate(unicode(properties[property_name])).get_content().strip()
   line = u{0}{1}{2}.format(unicode(property_name), delimiter, value)
   new_content_lines.append(line)
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/cf0877ce/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
 
b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
index 53459dd..1d21649 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
@@ -42,7 +42,7 @@ class PropertiesFileProvider(Provider):
 
 config_content = InlineTemplate('''# Generated by Apache Ambari. 
{{time.asctime(time.localtime())}}
 {% for key, value in properties_dict|dictsort %}
-{{key}}{{key_value_delimiter}}{{ 
resource_management.core.source.InlineTemplate(str(value)).get_content() }}{% 
endfor %}
+{{key}}{{key_value_delimiter}}{{ 
resource_management.core.source.InlineTemplate(str(value)).get_content().strip()
 }}{% endfor %}
 ''', extra_imports=[time, resource_management, resource_management.core, 
resource_management.core.source], properties_dict=self.resource.properties, 
key_value_delimiter=self.resource.key_value_delimiter)
 
 Logger.info(format(Generating properties file: {filepath}))

http://git-wip-us.apache.org/repos/asf/ambari/blob/cf0877ce/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py

ambari git commit: AMBARI-11224 - Views: attempt to save cluster-related view fails w/o default value (tbeerbower)

2015-05-18 Thread tbeerbower

Repository: ambari
Updated Branches:
  refs/heads/trunk cf0877cea - 747e5ba23


AMBARI-11224 - Views: attempt to save cluster-related view fails w/o default 
value (tbeerbower)


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

Branch: refs/heads/trunk
Commit: 747e5ba2398e16022ddf2d6af3bb7a2f67f9183a
Parents: cf0877c
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Mon May 18 17:20:09 2015 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Mon May 18 17:20:19 2015 -0400

--
 .../server/orm/entities/ViewInstanceEntity.java |  6 +++-
 .../orm/entities/ViewInstanceEntityTest.java| 30 
 2 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/747e5ba2/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java
index 6855b56..dc3876c 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewInstanceEntity.java
@@ -778,7 +778,11 @@ public class ViewInstanceEntity implements 
ViewInstanceDefinition {
   SetString requiredParameterNames = new HashSetString();
   for (ViewParameterEntity parameter : viewEntity.getParameters()) {
 if (parameter.isRequired()) {
-  requiredParameterNames.add(parameter.getName());
+  // Don't enforce 'required' validation for cluster config parameters 
since
+  // the value will be obtained through cluster association, not user 
input
+  if (parameter.getClusterConfig()== null) {
+requiredParameterNames.add(parameter.getName());
+  }
 }
   }
   MapString, String propertyMap = getPropertyMap();

http://git-wip-us.apache.org/repos/asf/ambari/blob/747e5ba2/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/ViewInstanceEntityTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/ViewInstanceEntityTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/ViewInstanceEntityTest.java
index 036fa03..6110a66 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/ViewInstanceEntityTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/ViewInstanceEntityTest.java
@@ -129,6 +129,21 @@ public class ViewInstanceEntityTest {
   /instance\n +
   /view;
 
+  private static String XML_CONFIG_INSTANCE = view\n +
+  nameMY_VIEW/name\n +
+  labelMy View!/label\n +
+  version1.0.0/version\n +
+  parameter\n +
+  namep1/name\n +
+  cluster-confighadoop-env/hdfs_user/cluster-config\n +
+  requiredtrue/required\n +
+  /parameter\n +
+  instance\n +
+  nameINSTANCE1/name\n +
+  labelMy Instance 1!/label\n +
+  /instance\n +
+  /view;
+
   @Test
   public void testGetViewEntity() throws Exception {
 InstanceConfig instanceConfig = 
InstanceConfigTest.getInstanceConfigs().get(0);
@@ -414,6 +429,21 @@ public class ViewInstanceEntityTest {
   }
 
   @Test
+  public void testValidateWithClusterConfig() throws Exception {
+
+Properties properties = new Properties();
+properties.put(p1, v1);
+
+Configuration ambariConfig = new Configuration(properties);
+
+ViewConfig config = ViewConfigTest.getConfig(XML_CONFIG_INSTANCE);
+ViewEntity viewEntity = ViewRegistryTest.getViewEntity(config, 
ambariConfig, getClass().getClassLoader(), );
+ViewInstanceEntity viewInstanceEntity = 
ViewRegistryTest.getViewInstanceEntity(viewEntity, 
config.getInstances().get(0));
+
+viewInstanceEntity.validate(viewEntity, 
Validator.ValidationContext.PRE_CREATE);
+  }
+
+  @Test
   public void testValidateWithValidator() throws Exception {
 
 Properties properties = new Properties();

ambari git commit: Revert AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of user group with spaces (aonishuk)

2015-05-18 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.maint f1d1be8de - 0b00e25b0


Revert AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL 
value of user group with spaces (aonishuk)

This reverts commit f1d1be8ded1f374a54d2801179ae3a534781a0b9.


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

Branch: refs/heads/branch-2.0.maint
Commit: 0b00e25b0d4f7a045c52c047ae15c1bf4e67f4e5
Parents: f1d1be8
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Mon May 18 17:23:42 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Mon May 18 17:23:42 2015 -0400

--
 ambari-common/src/main/python/resource_management/core/source.py | 2 +-
 .../python/resource_management/libraries/providers/xml_config.py | 2 +-
 .../common-services/HDFS/2.1.0.2.0/configuration/core-site.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b00e25b/ambari-common/src/main/python/resource_management/core/source.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/source.py 
b/ambari-common/src/main/python/resource_management/core/source.py
index 8693c65..3e3276f 100644
--- a/ambari-common/src/main/python/resource_management/core/source.py
+++ b/ambari-common/src/main/python/resource_management/core/source.py
@@ -130,7 +130,7 @@ else:
   self.context.update(variables)
   
   rendered = self.template.render(self.context)
-  return rendered
+  return rendered + \n if not rendered.endswith('\n') else rendered
 
   class InlineTemplate(Template):
 def __init__(self, name, extra_imports=[], **kwargs):

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b00e25b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
 
b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
index 494d3e7..da7a907 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py
@@ -41,7 +41,7 @@ class XmlConfigProvider(Provider):
 {% for key, value in configurations_dict|dictsort %}
 property
   name{{ key|e }}/name
-  value{{ 
resource_management.core.source.InlineTemplate(value).get_content() |e 
}}/value
+  value{{ 
resource_management.core.source.InlineTemplate(value).get_content().strip() |e 
}}/value
   {%- if not configuration_attrs is none -%}
   {%- for attrib_name, attrib_occurances in  configuration_attrs.items() 
-%}
   {%- for property_name, attrib_value in  attrib_occurances.items() -%}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b00e25b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
index ccbc5cf..c0cd6b3 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
@@ -135,7 +135,9 @@
 
   property
 namehadoop.security.auth_to_local/name
-valueDEFAULT/value
+value
+DEFAULT
+/value
 descriptionThe mapping from kerberos principal names to local OS 
mapreduce.job.user.names.
   So the default rule is just DEFAULT which takes all principals in your 
default domain to their first component.
   omal...@apache.org and omalley/ad...@apache.org to omalley, if your 
default domain is APACHE.ORG.

ambari git commit: AMBARI-11220 - Tez Upgrade Pack For HDP-2.2 to HDP-2.3 (jonathanhurley)

2015-05-18 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/trunk 8b0c964a8 - 67ca6364d


AMBARI-11220 - Tez Upgrade Pack For HDP-2.2 to HDP-2.3 (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: 67ca6364d5917eba79fd2ead5ba0df6ba876f631
Parents: 8b0c964
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Mon May 18 12:51:53 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Mon May 18 16:30:32 2015 -0400

--
 .../libraries/functions/conf_select.py  | 54 ++---
 .../0.4.0.2.1/package/scripts/params_linux.py   |  7 +--
 .../0.4.0.2.1/package/scripts/service_check.py  | 61 ++--
 .../YARN/2.1.0.2.0/package/scripts/service.py   | 33 +--
 .../2.0.6/hooks/after-INSTALL/scripts/params.py |  2 +-
 .../2.0.6/hooks/before-ANY/scripts/params.py|  2 +-
 .../2.0.6/hooks/before-START/scripts/params.py  |  2 +-
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 12 
 8 files changed, 105 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/67ca6364/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
index 7c5c005..31b1625 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/conf_select.py
@@ -64,6 +64,13 @@ SERVER_ROLE_DIRECTORY_MAP = {
   'ZOOKEEPER_SERVER' : 'zookeeper-server'
 }
 
+# mapping of service check to hdp-select component
+SERVICE_CHECK_DIRECTORY_MAP = {
+  HDFS_SERVICE_CHECK : hadoop-client,
+  TEZ_SERVICE_CHECK : hadoop-client,
+  PIG_SERVICE_CHECK : hadoop-client
+}
+
 TEMPLATE = conf-select {0} --package {1} --stack-version {2} --conf-version 0
 HADOOP_DIR_TEMPLATE = /usr/hdp/{0}/{1}/{2}
 HADOOP_DIR_DEFAULTS = {
@@ -129,14 +136,21 @@ def select(stack_name, package, version, try_create=True):
 
   shell.call(TEMPLATE.format(set-conf-dir, package, version), 
logoutput=False, quiet=False)
 
-def get_hadoop_conf_dir():
+def get_hadoop_conf_dir(force_latest_on_upgrade=False):
   
   Gets the shared hadoop conf directory using:
   1.  Start with /etc/hadoop/conf
   2.  When the stack is greater than HDP-2.2, use 
/usr/hdp/current/hadoop-client/conf
   3.  Only when doing a RU and HDP-2.3 or higher, use the value as computed
   by conf-select.  This is in the form /usr/hdp/VERSION/hadoop/conf to 
make sure
-  the configs are written in the correct place
+  the configs are written in the correct place. However, if the component 
itself has
+  not yet been upgraded, it should use the hadoop configs from the prior 
version.
+  This will perform an hdp-select status to determine which version to use.
+  :param force_latest_on_upgrade:  if True, then force the returned path to 
always
+  be that of the upgrade target version, even if hdp-select has not been 
called. This
+  is primarily used by hooks like before-ANY to ensure that hadoop environment
+  configurations are written to the correct location since they are written out
+  before the hdp-select/conf-select would have been called.
   
   hadoop_conf_dir = /etc/hadoop/conf
 
@@ -145,11 +159,22 @@ def get_hadoop_conf_dir():
 
 stack_info = _get_upgrade_stack()
 
+# if upgrading to = HDP 2.3
 if stack_info is not None and Script.is_hdp_stack_greater_or_equal(2.3):
   stack_name = stack_info[0]
   stack_version = stack_info[1]
 
+  # ensure the new HDP stack is conf-selected
   select(stack_name, hadoop, stack_version)
+
+  # determine if hdp-select has been run and if not, then use the current
+  # hdp version until this component is upgraded
+  if not force_latest_on_upgrade:
+current_hdp_version = get_role_component_current_hdp_version()
+if current_hdp_version is not None and stack_version != 
current_hdp_version:
+  stack_version = current_hdp_version
+
+  # only change the hadoop_conf_dir path, don't conf-select this older 
version
   hadoop_conf_dir = /usr/hdp/{0}/hadoop/conf.format(stack_version)
 
   return hadoop_conf_dir
@@ -194,14 +219,25 @@ def get_role_component_current_hdp_version():
   Gets the current HDP version of the component that this role command is for.
   :return:  the current HDP version of the specified component or None
   
-  command_role =

ambari git commit: AMBARI-11197. Ranger credential helper script requires JAVA_HOME to be defined. (yusaku)

2015-05-18 Thread yusaku

Repository: ambari
Updated Branches:
  refs/heads/trunk e698e38d7 - afe427a0f


AMBARI-11197. Ranger credential helper script requires JAVA_HOME to be defined. 
(yusaku)


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

Branch: refs/heads/trunk
Commit: afe427a0f5365e5d9343ddda90085cd9997a0a48
Parents: e698e38
Author: Yusaku Sako yus...@hortonworks.com
Authored: Mon May 18 21:45:23 2015 -0700
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Mon May 18 21:45:23 2015 -0700

--
 .../libraries/functions/setup_ranger_plugin_xml.py| 10 +-
 .../RANGER/0.4.0/package/scripts/setup_ranger_xml.py  | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/afe427a0/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
index 494b22f..e9ec4f5 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
@@ -121,7 +121,7 @@ def setup_ranger_plugin(component_select_name, service_name,
 
 setup_ranger_plugin_keystore(service_name, audit_db_is_enabled, 
hdp_version, credential_file,
   xa_audit_db_password, ssl_truststore_password, 
ssl_keystore_password,
-  component_user, component_group)
+  component_user, component_group, java_home)
 
   else:
 File(format('{component_conf_dir}/ranger-security.xml'),
@@ -141,20 +141,20 @@ def setup_ranger_plugin_jar_symblink(hdp_version, 
service_name, component_list):
   sudo=True)
 
 def setup_ranger_plugin_keystore(service_name, audit_db_is_enabled, 
hdp_version, credential_file, xa_audit_db_password,
-ssl_truststore_password, 
ssl_keystore_password, component_user, component_group):
+ssl_truststore_password, 
ssl_keystore_password, component_user, component_group, java_home):
 
   cred_lib_path = 
format('/usr/hdp/{hdp_version}/ranger-{service_name}-plugin/install/lib/*')
   cred_setup_prefix = format('python 
/usr/hdp/{hdp_version}/ranger-{service_name}-plugin/ranger_credential_helper.py 
-l {cred_lib_path}')
 
   if audit_db_is_enabled:
 cred_setup = format('{cred_setup_prefix} -f {credential_file} -k 
auditDBCred -v {xa_audit_db_password} -c 1')
-Execute(cred_setup, logoutput=True)
+Execute(cred_setup, environment={'JAVA_HOME': java_home}, logoutput=True)
 
   cred_setup = format('{cred_setup_prefix} -f {credential_file} -k 
sslKeyStore -v {ssl_keystore_password} -c 1')
-  Execute(cred_setup, logoutput=True)
+  Execute(cred_setup, environment={'JAVA_HOME': java_home}, logoutput=True)
 
   cred_setup = format('{cred_setup_prefix} -f {credential_file} -k 
sslTrustStore -v {ssl_truststore_password} -c 1')
-  Execute(cred_setup, logoutput=True)
+  Execute(cred_setup, environment={'JAVA_HOME': java_home}, logoutput=True)
 
   File(credential_file,
 owner = component_user,

http://git-wip-us.apache.org/repos/asf/ambari/blob/afe427a0/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index 0230b60..2575676 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -128,13 +128,13 @@ def do_keystore_setup():
 jceks_path = params.ranger_credential_provider_path
 cred_setup = format('{cred_setup_prefix} -f {jceks_path} -k 
{ranger_jpa_jdbc_credential_alias} -v {ranger_ambari_db_password} -c 1')
 
-Execute(cred_setup, logoutput=True)
+Execute(cred_setup, environment={'RANGER_ADMIN_HOME':params.ranger_home, 
'JAVA_HOME': params.java_home}, logoutput=True)
 
   if not is_empty(params.ranger_credential_provider_path) and 
(params.ranger_audit_source_type).lower() == 'db' and not 
is_empty(params.ranger_ambari_audit_db_password):
 jceks_path =

ambari git commit: AMBARI-11174. Modify rolling upgrade process to support both ranger admin HA and ranger-kms components. (Selvamohan Neethiraj via yusaku)

2015-05-18 Thread yusaku

Repository: ambari
Updated Branches:
  refs/heads/trunk 2932476fb - 7fba25315


AMBARI-11174. Modify rolling upgrade process to support both ranger admin HA 
and ranger-kms components. (Selvamohan Neethiraj via yusaku)


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

Branch: refs/heads/trunk
Commit: 7fba253156e6899ebc46bb9fdcb2cbfe2a079e47
Parents: 2932476
Author: Yusaku Sako yus...@hortonworks.com
Authored: Mon May 18 15:57:17 2015 -0700
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Mon May 18 15:57:17 2015 -0700

--
 .../0.4.0/package/scripts/ranger_admin.py   | 34 ++--
 .../0.4.0/package/scripts/service_check.py  | 15 ++---
 .../0.5.0.2.3/package/scripts/kms_server.py |  5 +++
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 21 +++-
 4 files changed, 68 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7fba2531/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 f56f860..40717f8 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
@@ -25,9 +25,12 @@ from resource_management.core.logger import Logger
 from resource_management.core import shell
 from ranger_service import ranger_service
 import upgrade
+import os, errno
 
 class RangerAdmin(Script):
 
+  upgrade_marker_file = '/tmp/rangeradmin_ru.inprogress'
+
   def get_stack_to_component(self):
 return {HDP: ranger-admin}
 
@@ -51,11 +54,17 @@ class RangerAdmin(Script):
 env.set_params(params)
 Execute(format('{params.ranger_stop}'), user=params.unix_user)
 
+
   def pre_rolling_restart(self, env):
 import params
 env.set_params(params)
+self.set_ru_rangeradmin_in_progress()
 upgrade.prestart(env, ranger-admin)
 
+  def post_rolling_restart(self,env):
+ if os.path.isfile(RangerAdmin.upgrade_marker_file):
+os.remove(RangerAdmin.upgrade_marker_file) 
+
   def start(self, env, rolling_restart=False):
 import params
 env.set_params(params)
@@ -68,8 +77,11 @@ class RangerAdmin(Script):
 code, output = shell.call(cmd, timeout=20)
 
 if code != 0:
-  Logger.debug('Ranger admin process not running')
-  raise ComponentIsNotRunning()
+  if self.is_ru_rangeradmin_in_progress():
+ Logger.info('Ranger admin process not running - skipping as rolling 
upgrade is in progress')
+  else:
+ Logger.debug('Ranger admin process not running')
+ raise ComponentIsNotRunning()
 pass
 
   def configure(self, env):
@@ -82,6 +94,24 @@ class RangerAdmin(Script):
 
 ranger('ranger_admin')
 
+  def set_ru_rangeradmin_in_progress(self):
+config_dir = os.path.dirname(RangerAdmin.upgrade_marker_file)
+try:
+   msg = Starting RU
+   if (not os.path.exists(config_dir)):
+  os.makedirs(config_dir)
+   ofp = open(RangerAdmin.upgrade_marker_file, 'w')
+   ofp.write(msg)
+   ofp.close()
+except OSError as exc:
+   if exc.errno == errno.EEXIST and os.path.isdir(config_dir): 
+  pass
+   else:
+  raise
+
+  def is_ru_rangeradmin_in_progress(self):
+return os.path.isfile(RangerAdmin.upgrade_marker_file)
 
 if __name__ == __main__:
   RangerAdmin().execute()
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/7fba2531/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py
index 69f955f..70884f6 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/service_check.py
@@ -18,9 +18,13 @@ limitations under the License.
 
 
 from resource_management import *
+import os
 
 
 class RangerServiceCheck(Script):
+
+  upgrade_marker_file = '/tmp/rangeradmin_ru.inprogress'
+
   def service_check(self, env):
 import params
 
@@ -34,9 +38,11 @@ class RangerServiceCheck(Script):

ambari git commit: AMBARI-11231. Expression builder: Width of Input text field changes on hover.(xiwang)

2015-05-18 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 7fba25315 - e698e38d7


AMBARI-11231. Expression builder: Width of Input text field changes on 
hover.(xiwang)


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

Branch: refs/heads/trunk
Commit: e698e38d73f2b12b1c9f2c07d9f02710d70de1ec
Parents: 7fba253
Author: Xi Wang xiw...@apache.org
Authored: Mon May 18 17:15:53 2015 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Mon May 18 17:21:11 2015 -0700

--
 ambari-web/app/styles/enhanced_service_dashboard.less | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e698e38d/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less 
b/ambari-web/app/styles/enhanced_service_dashboard.less
index 1cc27b8..53abf21 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -360,14 +360,18 @@
 background: white;
 display: inline-block;
 margin: 10px 0 10px 10px;
-padding: 5px;
+padding: 5px 16px 5px 12px;
 border: 1px solid @border-color;
+position: relative;
 a {
-  margin-left: 5px;
+  position: absolute;
+  right: 3px;
+  top: 0px;
   text-decoration: none;
   display: none;
   .icon-remove {
 color: #A69B9B;
+font-size: 12px;
   }
 }
   }

ambari git commit: AMBARI-11179. Kerberos: Oozie auth rules do not look correct (rlevas)

ambari git commit: AMBARI-11206 [WinTP2] Ambari Agent fails to start

ambari git commit: AMBARI-11212. Some services start fails due to Permission denied exception (aonishuk)

ambari git commit: AMBARI-11206 [WinTP2] Ambari Agent fails to start

ambari git commit: AMBARI-11214. Duplicate repo_suse_rhel.j2 templates (aonishuk)

[6/6] ambari git commit: AMBARI-11216 Refactor service-config 'defaultValue' property into 'savedValue' and 'recommendedValue'. (ababiichuk)

[1/6] ambari git commit: AMBARI-11216 Refactor service-config 'defaultValue' property into 'savedValue' and 'recommendedValue'. (ababiichuk)

[1/2] ambari git commit: AMBARI-11219. Create Default Upgrade Catalog to upgrade the schema version to the current Ambari Server Versions. (mpapirkovskyy)

[2/2] ambari git commit: AMBARI-11221. ORA-00942: table or view does not exist when executing Ambari-DDL-Oracle-CREATE.sql. (mpapirkovskyy)

ambari git commit: AMBARI-10411. Yarn ResourceManager HA config properties not processed properly by Blueprints. (rnettleton)

[2/6] ambari git commit: AMBARI-11216 Refactor service-config 'defaultValue' property into 'savedValue' and 'recommendedValue'. (ababiichuk)

[4/6] ambari git commit: AMBARI-11216 Refactor service-config 'defaultValue' property into 'savedValue' and 'recommendedValue'. (ababiichuk)

ambari git commit: AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of user group with spaces (aonishuk)

ambari git commit: AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of user group with spaces (aonishuk)

ambari git commit: AMBARI-11218. Hive alerts need to use either legacy or new conf locations (ncole)

svn commit: r1680102 - /ambari/site/team-list.html

ambari git commit: Updated team list, changed Jonathan Hurley to PMC (alejandro)

ambari git commit: AMBARI-11226. Fix cluster blueprint export mapping of components to host groups

ambari git commit: AMBARI-11184. AMS: Incorrect value obtained for a datapoint in the metric data series queried from AMS. (swagle)

ambari git commit: AMBARI-11220 - Tez Upgrade Pack For HDP-2.2 to HDP-2.3 (part2) (jonathanhurley)

ambari git commit: AMBARI-11222. Remove hive_dbroot (unused property) from the HDP stack definitions. (rnettleton)

ambari git commit: Revert AMBARI-11019 AMS config warning message is confusing. (atkach)

ambari git commit: AMBARI-11187. Y-axis label is cut off or not shown at all in the dashboard / widget graphs.(XIWANG)

ambari git commit: Revert AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of user group with spaces (aonishuk)

ambari git commit: AMBARI-11224 - Views: attempt to save cluster-related view fails w/o default value (tbeerbower)

ambari git commit: Revert AMBARI-4626. Capacity Scheduler section in Ambari does not allow ACL value of user group with spaces (aonishuk)

ambari git commit: AMBARI-11220 - Tez Upgrade Pack For HDP-2.2 to HDP-2.3 (jonathanhurley)

ambari git commit: AMBARI-11197. Ranger credential helper script requires JAVA_HOME to be defined. (yusaku)

ambari git commit: AMBARI-11174. Modify rolling upgrade process to support both ranger admin HA and ranger-kms components. (Selvamohan Neethiraj via yusaku)

ambari git commit: AMBARI-11231. Expression builder: Width of Input text field changes on hover.(xiwang)

30 matches

Site Navigation

Mail list logo

Footer information