git commit: AMBARI-4523. Host registering failure from primary/agent os checking on centos6 (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk a5e372543 - d9c2641d7
AMBARI-4523. Host registering failure from primary/agent os checking on centos6
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d9c2641d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d9c2641d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d9c2641d
Branch: refs/heads/trunk
Commit: d9c2641d7aefa87b5f31e20a9ea1018eed823586
Parents: a5e3725
Author: Andrew Onischuk aonis...@hortonworks.com
Authored: Mon Mar 24 04:21:40 2014 -0700
Committer: Andrew Onischuk aonis...@hortonworks.com
Committed: Mon Mar 24 04:21:40 2014 -0700
--
ambari-agent/pom.xml| 11 +-
.../src/main/python/ambari_agent/Facter.py | 41 +-
.../src/main/python/ambari_agent/HostCleanup.py | 6 +-
.../src/main/python/ambari_agent/HostInfo.py| 13 +-
.../python/resource_management/core/system.py | 40 +-
.../test/python/ambari_agent/TestHostInfo.py| 2 +
.../main/python/common_functions/__init__.py| 25
.../main/python/common_functions/os_check.py| 141 +++
ambari-server/pom.xml | 21 ++-
ambari-server/src/main/python/ambari-server.py | 14 +-
ambari-server/src/main/python/bootstrap.py | 2 +-
ambari-server/src/main/python/os_type_check.sh | 81 ---
ambari-server/src/test/python/TestBootstrap.py | 4 +-
13 files changed, 218 insertions(+), 183 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9c2641d/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 352789a..20650fb 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -41,6 +41,7 @@
puppet.tarhttp://downloads.puppetlabs.com/puppet/puppet-2.7.9.tar.gz/puppet.tar
agent.install.dir/usr/lib/python2.6/site-packages/ambari_agent/agent.install.dir
resmgmt.install.dir/usr/lib/python2.6/site-packages/resource_management/resmgmt.install.dir
+
common_functions.install.dir/usr/lib/python2.6/site-packages/common_functions/common_functions.install.dir
jinja.install.dir/usr/lib/python2.6/site-packages/jinja2/jinja.install.dir
ruby.tarhttp://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/centos6/ruby-1.8.7-p370.tar.gz/ruby.tar
lib.dir/usr/lib/ambari-agent/lib/lib.dir
@@ -131,7 +132,7 @@
argumentunitTests.py/argument
/arguments
environmentVariables
-
PYTHONPATH${project.basedir}/../ambari-common/src/main/python/jinja2:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/../ambari-common/src/main/python:${project.basedir}/src/main/python/ambari_agent:${project.basedir}/src/main/python/resource_management:${project.basedir}/src/test/python/ambari_agent:${project.basedir}/src/test/python/resource_management:${project.basedir}/src/main/python:${project.basedir}/../ambari-agent/src/main/puppet/modules/hdp-hadoop/files:$PYTHONPATH/PYTHONPATH
+
PYTHONPATH${project.basedir}/../ambari-common/src/main/python/jinja2:${project.basedir}/../ambari-common/src/main/python/common_functions:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/../ambari-common/src/main/python:${project.basedir}/src/main/python/ambari_agent:${project.basedir}/src/main/python/resource_management:${project.basedir}/src/test/python/ambari_agent:${project.basedir}/src/test/python/resource_management:${project.basedir}/src/main/python:${project.basedir}/../ambari-agent/src/main/puppet/modules/hdp-hadoop/files:$PYTHONPATH/PYTHONPATH
/environmentVariables
skip${skipTests}/skip
/configuration
@@ -236,6 +237,14 @@
/sources
/mapping
mapping
+ directory${common_functions.install.dir}/directory
+ sources
+source
+
location${project.basedir}/../ambari-common/src/main/python/common_functions/location
+/source
+ /sources
+/mapping
+mapping
directory${lib.dir}/directory
filemode755/filemode
usernameroot/username
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9c2641d/ambari-agent/src/main/python/ambari_agent/Facter.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/Facter.py
b/ambari-agent/src/main/python/ambari_agent/Facter.py
index 181f370..552f0e0 100644
--- a/ambari-agent/src/main/python/ambari_agent/Facter.py
+++ b/ambari-agent/src/main/python/ambari_agent/Facter.py
@@ -30,7 +30,7 @@ import
git commit: AMBARI-5184. Create repo files for Ubuntu based on the urls that are passed from the stack defn. (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 378b9606c - 1f8f6de2c
AMBARI-5184. Create repo files for Ubuntu based on the urls that are passed
from the stack defn. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f8f6de2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f8f6de2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f8f6de2
Branch: refs/heads/trunk
Commit: 1f8f6de2c964dd23eb9cc26e166fce17814e2ed7
Parents: 378b960
Author: Andrew Onischuk aonis...@hortonworks.com
Authored: Mon Mar 24 08:23:09 2014 -0700
Committer: Andrew Onischuk aonis...@hortonworks.com
Committed: Mon Mar 24 08:23:09 2014 -0700
--
.../python/resource_management/core/system.py | 10 +-
.../libraries/providers/__init__.py | 4 +-
.../libraries/providers/repository.py | 45 -
.../libraries/resources/repository.py | 1 +
.../TestRepositoryResource.py | 100 +--
5 files changed, 149 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f8f6de2/ambari-agent/src/main/python/resource_management/core/system.py
--
diff --git a/ambari-agent/src/main/python/resource_management/core/system.py
b/ambari-agent/src/main/python/resource_management/core/system.py
index db6c37e..cb4c766 100644
--- a/ambari-agent/src/main/python/resource_management/core/system.py
+++ b/ambari-agent/src/main/python/resource_management/core/system.py
@@ -69,7 +69,15 @@ class System(object):
In case cannot detect -- Fail
return OSCheck().get_os_version()
-
+
+ @lazy_property
+ def os_release_name(self):
+
+For Ubuntu 12.04:
+precise
+
+return OSCheck().get_os_release_name()
+
@lazy_property
def os_type(self):
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f8f6de2/ambari-agent/src/main/python/resource_management/libraries/providers/__init__.py
--
diff --git
a/ambari-agent/src/main/python/resource_management/libraries/providers/__init__.py
b/ambari-agent/src/main/python/resource_management/libraries/providers/__init__.py
index 37d867f..6d8a8f7 100644
---
a/ambari-agent/src/main/python/resource_management/libraries/providers/__init__.py
+++
b/ambari-agent/src/main/python/resource_management/libraries/providers/__init__.py
@@ -22,10 +22,13 @@ Ambari Agent
PROVIDERS = dict(
redhat=dict(
+
Repository=resource_management.libraries.providers.repository.RhelSuseRepositoryProvider,
),
suse=dict(
+
Repository=resource_management.libraries.providers.repository.RhelSuseRepositoryProvider,
),
debian=dict(
+
Repository=resource_management.libraries.providers.repository.DebianRepositoryProvider,
),
default=dict(
ExecuteHadoop=resource_management.libraries.providers.execute_hadoop.ExecuteHadoopProvider,
@@ -33,7 +36,6 @@ PROVIDERS = dict(
XmlConfig=resource_management.libraries.providers.xml_config.XmlConfigProvider,
PropertiesFile=resource_management.libraries.providers.properties_file.PropertiesFileProvider,
MonitorWebserver=resource_management.libraries.providers.monitor_webserver.MonitorWebserverProvider,
-
Repository=resource_management.libraries.providers.repository.RepositoryProvider,
HdfsDirectory=resource_management.libraries.providers.hdfs_directory.HdfsDirectoryProvider,
CopyFromLocal=resource_management.libraries.providers.copy_from_local.CopyFromLocalProvider
),
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f8f6de2/ambari-agent/src/main/python/resource_management/libraries/providers/repository.py
--
diff --git
a/ambari-agent/src/main/python/resource_management/libraries/providers/repository.py
b/ambari-agent/src/main/python/resource_management/libraries/providers/repository.py
index 4784852..1c5598b 100644
---
a/ambari-agent/src/main/python/resource_management/libraries/providers/repository.py
+++
b/ambari-agent/src/main/python/resource_management/libraries/providers/repository.py
@@ -20,9 +20,13 @@ Ambari Agent
+import os
+import filecmp
+import tempfile
+from common_functions import OSCheck
from resource_management import *
-class RepositoryProvider(Provider):
+class RhelSuseRepositoryProvider(Provider):
def action_create(self):
with Environment.get_instance_copy() as env:
repo_file_name = self.resource.repo_file_name
@@ -49,4 +53,41 @@ gpgcheck=0, repo_id=self.resource.repo_id,
repo_file_name=self.resource.repo_
repos_dirs = {
'redhat': '/etc/yum.repos.d',
'suse': '/etc/zypp/repos.d'
-}
\ No
[2/2] git commit: AMBARI-5186. On EC2, AMI for RHEL 5.7 does not start postgres on setup (aonishuk)
AMBARI-5186. On EC2, AMI for RHEL 5.7 does not start postgres on setup (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/73b6b830 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73b6b830 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73b6b830 Branch: refs/heads/branch-1.5.0 Commit: 73b6b830fea04244f3f745e110ad689192a5ed9b Parents: ea38fa3 Author: Andrew Onischuk aonis...@hortonworks.com Authored: Mon Mar 24 08:43:42 2014 -0700 Committer: Andrew Onischuk aonis...@hortonworks.com Committed: Mon Mar 24 08:43:42 2014 -0700 -- ambari-server/src/main/python/ambari-server.py | 25 .../src/test/python/TestAmbariServer.py | 4 2 files changed, 19 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/73b6b830/ambari-server/src/main/python/ambari-server.py -- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index 5cec271..97f405e 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -53,6 +53,7 @@ OS = OS.lower().strip() OS_UBUNTU = 'ubuntu' OS_FEDORA = 'fedora' OS_OPENSUSE = 'opensuse' +OS_SUSE = 'suse' # action commands SETUP_ACTION = setup @@ -1052,17 +1053,21 @@ def check_postgre_up(): stdin=subprocess.PIPE, stderr=subprocess.PIPE ) - time.sleep(20) - result = process.poll() - print_info_msg(Result of postgres start cmd: + str(result)) - if result is None: -process.kill() -pg_status = get_postgre_status() -if pg_status == PG_STATUS_RUNNING: - print_info_msg(Postgres process is running. Returning...) - return 0 + if OS == OS_SUSE: +time.sleep(20) +result = process.poll() +print_info_msg(Result of postgres start cmd: + str(result)) +if result is None: + process.kill() + pg_status = get_postgre_status() +else: + retcode = result else: -retcode = result +out, err = process.communicate() +retcode = process.returncode + if pg_status == PG_STATUS_RUNNING: +print_info_msg(Postgres process is running. Returning...) +return 0 except (Exception), e: pg_status = get_postgre_status() if pg_status == PG_STATUS_RUNNING: http://git-wip-us.apache.org/repos/asf/ambari/blob/73b6b830/ambari-server/src/test/python/TestAmbariServer.py -- diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py index 54e4077..46c3e4c 100644 --- a/ambari-server/src/test/python/TestAmbariServer.py +++ b/ambari-server/src/test/python/TestAmbariServer.py @@ -29,6 +29,7 @@ import stat import datetime import operator import json +import platform from pwd import getpwnam from ambari_server.resourceFilesKeeper import ResourceFilesKeeper, KeeperException @@ -2019,11 +2020,14 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV popen_mock, sleep_mock): p = MagicMock() p.poll.return_value = 0 +p.communicate.return_value = (None, None) +p.returncode = 0 popen_mock.return_value = p run_os_command_mock.return_value = (0, None, None) rcode = ambari_server.check_postgre_up() self.assertEqual(0, rcode) +ambari_server.OS = 'suse' p.poll.return_value = 4 get_postgre_status_mock.return_value = None rcode = ambari_server.check_postgre_up()
[1/2] git commit: AMBARI-5186. On EC2, AMI for RHEL 5.7 does not start postgres on setup (aonishuk)
Repository: ambari Updated Branches: refs/heads/branch-1.5.0 ea38fa30b - 73b6b830f refs/heads/trunk 1f8f6de2c - fcccee374 AMBARI-5186. On EC2, AMI for RHEL 5.7 does not start postgres on setup (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fcccee37 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fcccee37 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fcccee37 Branch: refs/heads/trunk Commit: fcccee374cb806a135722aa99356d3a888a137f5 Parents: 1f8f6de Author: Andrew Onischuk aonis...@hortonworks.com Authored: Mon Mar 24 08:41:03 2014 -0700 Committer: Andrew Onischuk aonis...@hortonworks.com Committed: Mon Mar 24 08:41:03 2014 -0700 -- ambari-server/src/main/python/ambari-server.py | 25 .../src/test/python/TestAmbariServer.py | 4 2 files changed, 19 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/fcccee37/ambari-server/src/main/python/ambari-server.py -- diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py index 79eead7..6c9fcd3 100755 --- a/ambari-server/src/main/python/ambari-server.py +++ b/ambari-server/src/main/python/ambari-server.py @@ -54,6 +54,7 @@ OS = OSCheck().get_os_family() OS_UBUNTU = 'ubuntu' OS_FEDORA = 'fedora' OS_OPENSUSE = 'opensuse' +OS_SUSE = 'suse' # action commands SETUP_ACTION = setup @@ -1053,17 +1054,21 @@ def check_postgre_up(): stdin=subprocess.PIPE, stderr=subprocess.PIPE ) - time.sleep(20) - result = process.poll() - print_info_msg(Result of postgres start cmd: + str(result)) - if result is None: -process.kill() -pg_status = get_postgre_status() -if pg_status == PG_STATUS_RUNNING: - print_info_msg(Postgres process is running. Returning...) - return 0 + if OS == OS_SUSE: +time.sleep(20) +result = process.poll() +print_info_msg(Result of postgres start cmd: + str(result)) +if result is None: + process.kill() + pg_status = get_postgre_status() +else: + retcode = result else: -retcode = result +out, err = process.communicate() +retcode = process.returncode + if pg_status == PG_STATUS_RUNNING: +print_info_msg(Postgres process is running. Returning...) +return 0 except (Exception), e: pg_status = get_postgre_status() if pg_status == PG_STATUS_RUNNING: http://git-wip-us.apache.org/repos/asf/ambari/blob/fcccee37/ambari-server/src/test/python/TestAmbariServer.py -- diff --git a/ambari-server/src/test/python/TestAmbariServer.py b/ambari-server/src/test/python/TestAmbariServer.py index 54e4077..46c3e4c 100644 --- a/ambari-server/src/test/python/TestAmbariServer.py +++ b/ambari-server/src/test/python/TestAmbariServer.py @@ -29,6 +29,7 @@ import stat import datetime import operator import json +import platform from pwd import getpwnam from ambari_server.resourceFilesKeeper import ResourceFilesKeeper, KeeperException @@ -2019,11 +2020,14 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV popen_mock, sleep_mock): p = MagicMock() p.poll.return_value = 0 +p.communicate.return_value = (None, None) +p.returncode = 0 popen_mock.return_value = p run_os_command_mock.return_value = (0, None, None) rcode = ambari_server.check_postgre_up() self.assertEqual(0, rcode) +ambari_server.OS = 'suse' p.poll.return_value = 4 get_postgre_status_mock.return_value = None rcode = ambari_server.check_postgre_up()
[2/2] git commit: AMBARI-5187. Ganglia rrdcached base directory has not applied in fact (dlysnichenko)
AMBARI-5187. Ganglia rrdcached base directory has not applied in fact
(dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/20ca5e57
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/20ca5e57
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/20ca5e57
Branch: refs/heads/trunk
Commit: 20ca5e57088e9228add876e752b0367edaff080a
Parents: d94b1d0
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Mon Mar 24 17:47:47 2014 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Mon Mar 24 17:49:21 2014 +0200
--
.../services/GANGLIA/package/scripts/ganglia_server.py | 1 +
.../test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py | 9 -
2 files changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/20ca5e57/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
index a027f30..258946b 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py
@@ -37,6 +37,7 @@ class GangliaServer(Script):
def start(self, env):
import params
env.set_params(params)
+server_files()
ganglia_server_service.server(start)
def stop(self, env):
http://git-wip-us.apache.org/repos/asf/ambari/blob/20ca5e57/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
index 95c9fea..ffc15e2 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py
@@ -199,6 +199,13 @@ class TestGangliaServer(RMFTestCase):
command=start,
config_file=default.json
)
+self.assertResourceCalled('Directory', '/srv/www/cgi-bin',
+ recursive = True,
+ )
+self.assertResourceCalled('File', '/srv/www/cgi-bin/rrd.py',
+ content = StaticFile('rrd.py'),
+ mode = 0755,
+ )
self.assertResourceCalled('Execute', 'service hdp-gmetad start
/tmp/gmetad.log 21 ; /bin/ps auwx | /bin/grep [g]metad /tmp/gmetad.log
21',
path =
['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],
)
@@ -389,4 +396,4 @@ class TestGangliaServer(RMFTestCase):
self.assertResourceCalled('Execute', 'chkconfig gmetad off',
path =
['/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'],)
-self.assertNoMoreResources()
\ No newline at end of file
+self.assertNoMoreResources()
git commit: AMBARI-5185 Unable to delete host even when all host components are in INIT state. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk fcccee374 - d94b1d05c
AMBARI-5185 Unable to delete host even when all host components are in INIT
state. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d94b1d05
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d94b1d05
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d94b1d05
Branch: refs/heads/trunk
Commit: d94b1d05c316ae66709e6b6189a6d84815f6a505
Parents: fcccee3
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Mon Mar 24 17:36:31 2014 +0200
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Mon Mar 24 17:47:15 2014 +0200
--
ambari-web/app/controllers/main/host/details.js | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d94b1d05/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js
b/ambari-web/app/controllers/main/host/details.js
index f4b2068..95ac8e2 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -1050,6 +1050,7 @@ App.MainHostDetailsController = Em.Controller.extend({
var stoppedStates = [App.HostComponentStatus.stopped,
App.HostComponentStatus.install_failed,
App.HostComponentStatus.upgrade_failed,
+ App.HostComponentStatus.init,
App.HostComponentStatus.unknown];
var masterComponents = [];
var runningComponents = [];
git commit: AMBARI-5188. Component version numbers do not seem accurate (dlysnichenko)
Repository: ambari Updated Branches: refs/heads/trunk 20ca5e570 - 509e02bc0 AMBARI-5188. Component version numbers do not seem accurate (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/509e02bc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/509e02bc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/509e02bc Branch: refs/heads/trunk Commit: 509e02bc07ce2891bfcb473de71ebc1107a0720e Parents: 20ca5e5 Author: Lisnichenko Dmitro dlysniche...@hortonworks.com Authored: Mon Mar 24 18:20:24 2014 +0200 Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com Committed: Mon Mar 24 18:20:24 2014 +0200 -- .../src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.1/services/HBASE/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.1/services/PIG/metainfo.xml| 2 +- .../src/main/resources/stacks/HDP/2.1/services/SQOOP/metainfo.xml | 2 +- .../src/main/resources/stacks/HDP/2.1/services/STORM/metainfo.xml | 2 +- .../main/resources/stacks/HDP/2.1/services/WEBHCAT/metainfo.xml| 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/509e02bc/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml index c3bc137..5d1a1c4 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/metainfo.xml @@ -21,7 +21,7 @@ service nameFALCON/name commentData management and processing platform/comment - version0.4.0.2.1.1/version + version0.4.0.2.1/version components component nameFALCON_CLIENT/name http://git-wip-us.apache.org/repos/asf/ambari/blob/509e02bc/ambari-server/src/main/resources/stacks/HDP/2.1/services/HBASE/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HBASE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HBASE/metainfo.xml index 6f54a15..ef03b43 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HBASE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HBASE/metainfo.xml @@ -23,7 +23,7 @@ commentNon-relational distributed database and centralized service for configuration management amp; synchronization /comment - version0.96.0.2.1/version + version0.98.0.2.1/version /service /services /metainfo http://git-wip-us.apache.org/repos/asf/ambari/blob/509e02bc/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml index e43fd55..1a60125 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/HIVE/metainfo.xml @@ -21,7 +21,7 @@ service nameHIVE/name commentData warehouse system for ad-hoc queries amp; analysis of large datasets and table amp; storage management service/comment - version0.12.0.2.1/version + version0.13.0.2.1/version configuration-dependencies config-typehive-site/config-type http://git-wip-us.apache.org/repos/asf/ambari/blob/509e02bc/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml index 3419663..e8c31f9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/metainfo.xml @@ -22,7 +22,7 @@ nameOOZIE/name commentSystem for workflow coordination and execution of Apache Hadoop jobs. This also includes the installation of the optional Oozie Web Console which relies on and will install the lt;a target=_blank href=http://www.sencha.com/products/extjs/license/gt;ExtJSlt;/agt; Library. /comment
git commit: AMBARI-5095. Added latest repository url lookup (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk 509e02bc0 - 14f369426
AMBARI-5095. Added latest repository url lookup (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14f36942
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14f36942
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14f36942
Branch: refs/heads/trunk
Commit: 14f369426e1e1a7e537a595eec5f59a25760f970
Parents: 509e02b
Author: Nate Cole nc...@hortonworks.com
Authored: Fri Mar 14 16:31:19 2014 -0400
Committer: Nate Cole nc...@hortonworks.com
Committed: Mon Mar 24 12:55:31 2014 -0400
--
.../server/api/services/AmbariMetaInfo.java | 37 +-
.../server/controller/RepositoryResponse.java | 12 +-
.../internal/RepositoryResourceProvider.java| 6 +
.../ambari/server/state/RepositoryInfo.java | 20 +++-
.../server/state/stack/LatestRepoCallable.java | 112 +++
.../server/state/stack/RepositoryXml.java | 26 -
.../src/main/resources/properties.json | 1 +
.../server/api/services/AmbariMetaInfoTest.java | 21 +++-
.../RepositoryResourceProviderTest.java | 4 +-
.../resources/stacks/HDP/2.1.1/repos/hdp.json | 10 ++
.../stacks/HDP/2.1.1/repos/repoinfo.xml | 13 ++-
11 files changed, 238 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/14f36942/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 8e1e787..f62bfd0 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -31,6 +31,9 @@ import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
import javax.xml.bind.JAXBException;
@@ -50,6 +53,7 @@ import org.apache.ambari.server.state.RepositoryInfo;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.state.Stack;
import org.apache.ambari.server.state.StackInfo;
+import org.apache.ambari.server.state.stack.LatestRepoCallable;
import org.apache.ambari.server.state.stack.MetricDefinition;
import org.apache.ambari.server.state.stack.RepositoryXml;
import org.apache.ambari.server.state.stack.RepositoryXml.Os;
@@ -108,6 +112,7 @@ public class AmbariMetaInfo {
private static final ListString ALL_SUPPORTED_OS = Arrays.asList(
centos5, redhat5, centos6, redhat6, oraclelinux5,
oraclelinux6, suse11, sles11, ubuntu12);
+
private final ActionDefinitionManager adManager = new
ActionDefinitionManager();
private String serverVersion = undefined;
private ListStackInfo stacksResult = new ArrayListStackInfo();
@@ -677,6 +682,15 @@ public class AmbariMetaInfo {
stackRoot = + stackRootAbsPath);
}
+ExecutorService es = Executors.newSingleThreadExecutor(new ThreadFactory()
{
+ @Override
+ public Thread newThread(Runnable r) {
+return new Thread(r, Stack Version Loading Thread);
+ }
+});
+
+ListLatestRepoCallable lookupList = new ArrayListLatestRepoCallable();
+
for (StackInfo stack : stacks) {
LOG.debug(Adding new stack to known stacks
+ , stackName = + stack.getName()
@@ -698,8 +712,8 @@ public class AmbariMetaInfo {
+ , stackVersion= + stack.getVersion()
+ , repoFolder= + repositoryFolder.getPath());
-ListRepositoryInfo repositoryInfoList = getRepository
- (repositoryFolder, stack.getVersion());
+ListRepositoryInfo repositoryInfoList =
getRepository(repositoryFolder,
+stack, lookupList);
stack.getRepositories().addAll(repositoryInfoList);
} else {
@@ -719,6 +733,10 @@ public class AmbariMetaInfo {
resolveHooksFolder(stack);
stack.setStackHooksFolder(stackHooksToUse);
}
+
+es.invokeAll(lookupList);
+
+es.shutdown();
}
@@ -726,9 +744,10 @@ public class AmbariMetaInfo {
return serverVersion;
}
- private ListRepositoryInfo getRepository(File repositoryFile, String
stackVersion)
+ private ListRepositoryInfo getRepository(File repositoryFile, StackInfo
stack,
+ ListLatestRepoCallable lookupList)
throws JAXBException {
-
+
RepositoryXml rxml = StackExtensionHelper.unmarshal(RepositoryXml.class,
repositoryFile);
git commit: AMBARI-5193. Mirroring: hide dataset actions, when Falcon is stopped. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 14f369426 - 2de0789f4
AMBARI-5193. Mirroring: hide dataset actions, when Falcon is stopped.
(akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2de0789f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2de0789f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2de0789f
Branch: refs/heads/trunk
Commit: 2de0789f4ce1c830599f7652ef0cbc191c25fea2
Parents: 14f3694
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Mon Mar 24 20:06:31 2014 +0200
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Mon Mar 24 20:06:31 2014 +0200
--
.../main/mirroring/edit_dataset_controller.js | 18 ++
.../app/controllers/main/mirroring_controller.js | 1 +
ambari-web/app/templates/main/mirroring/jobs.hbs | 2 +-
ambari-web/app/views/main/mirroring/jobs_view.js | 4
4 files changed, 8 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2de0789f/ambari-web/app/controllers/main/mirroring/edit_dataset_controller.js
--
diff --git
a/ambari-web/app/controllers/main/mirroring/edit_dataset_controller.js
b/ambari-web/app/controllers/main/mirroring/edit_dataset_controller.js
index 031261f..fa91791 100644
--- a/ambari-web/app/controllers/main/mirroring/edit_dataset_controller.js
+++ b/ambari-web/app/controllers/main/mirroring/edit_dataset_controller.js
@@ -226,15 +226,6 @@ App.MainMirroringEditDataSetController =
Ember.Controller.extend({
var scheduleStartDateFormatted = this.toTZFormat(startDate);
var scheduleEndDateFormatted = this.toTZFormat(endDate);
-var newDataset = {
- id: datasetName,
- name: datasetName,
- source_cluster_name: sourceCluster,
- target_cluster_name: targetCluster,
- source_dir: sourceDir,
- target_dir: targetDir,
- dataset_jobs: []
-};
// Compose XML data, that will be sended to server
var dataToSend = '?xml version=1.0?feed description= name=' +
prefixedDatasetName + ' xmlns=uri:falcon:feed:0.1frequency' +
repeatOptionSelected + '(' + datasetFrequency + ')' +
'/frequencyclusterscluster name=' + sourceCluster + '
type=sourcevalidity start=' + scheduleStartDateFormatted + ' end=' +
scheduleEndDateFormatted +
@@ -249,8 +240,7 @@ App.MainMirroringEditDataSetController =
Ember.Controller.extend({
name: prefixedDatasetName,
type: 'feed',
entity: dataToSend,
- falconServer: App.get('falconServerURL'),
- datasetObj: newDataset
+ falconServer: App.get('falconServerURL')
},
success: 'onSaveSuccess',
error: 'onSaveError'
@@ -262,8 +252,7 @@ App.MainMirroringEditDataSetController =
Ember.Controller.extend({
sender: this,
data: {
dataset: dataToSend,
- falconServer: App.get('falconServerURL'),
- datasetObj: newDataset
+ falconServer: App.get('falconServerURL')
},
success: 'onSaveSuccess',
error: 'onSaveError'
@@ -274,9 +263,6 @@ App.MainMirroringEditDataSetController =
Ember.Controller.extend({
onSaveSuccess: function () {
this.set('popup.isSaving', false);
this.get('popup').hide();
-var datasetObj = arguments[2].datasetObj;
-App.store.load(App.Dataset, datasetObj);
-App.router.send('gotoShowJobs');
App.router.get('mainMirroringController').loadData();
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/2de0789f/ambari-web/app/controllers/main/mirroring_controller.js
--
diff --git a/ambari-web/app/controllers/main/mirroring_controller.js
b/ambari-web/app/controllers/main/mirroring_controller.js
index 7e32825..189e0f5 100644
--- a/ambari-web/app/controllers/main/mirroring_controller.js
+++ b/ambari-web/app/controllers/main/mirroring_controller.js
@@ -200,6 +200,7 @@ App.MainMirroringController = Em.ArrayController.extend({
var selectedDataset = this.get('selectedDataset');
if (!selectedDataset) {
this.set('selectedDataset', sortedDatasets[0]);
+App.router.send('gotoShowJobs');
}
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/2de0789f/ambari-web/app/templates/main/mirroring/jobs.hbs
--
diff --git a/ambari-web/app/templates/main/mirroring/jobs.hbs
b/ambari-web/app/templates/main/mirroring/jobs.hbs
index ed008db..f94acf6 100644
--- a/ambari-web/app/templates/main/mirroring/jobs.hbs
+++ b/ambari-web/app/templates/main/mirroring/jobs.hbs
@@ -15,7 +15,7 @@
* See the License for the specific language
git commit: AMBARI-5195. Unable to start history server and job tracker after upgrade. (swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-1.5.0 81fe3 - 520c13317
AMBARI-5195. Unable to start history server and job tracker after upgrade.
(swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/520c1331
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/520c1331
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/520c1331
Branch: refs/heads/branch-1.5.0
Commit: 520c13317787821c0db1737e92ee327b09a31030
Parents: 81f
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Mon Mar 24 11:27:24 2014 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Mon Mar 24 11:27:24 2014 -0700
--
.../stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/520c1331/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
index ac1e5ff..3073400 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
@@ -56,7 +56,7 @@ exclude_file_path =
config['configurations']['mapred-site']['mapred.hosts.exclud
mapred_hosts_file_path =
config['configurations']['mapred-site']['mapred.hosts']
#hdfs directories
-mapreduce_jobhistory_intermediate_done_dir =
config['configurations']['mapred-site']['mapreduce.jobhistory.intermediate-done-dir']
+mapreduce_jobhistory_intermediate_done_dir =
default('/configurations/mapred-site/mapreduce.jobhistory.intermediate-done-dir',
'/mr-history/tmp')
mapreduce_jobhistory_done_dir =
config['configurations']['mapred-site']['mapred.job.tracker.history.completed.location']
#for create_hdfs_directory
hostname = config[hostname]
git commit: AMBARI-5195. Unable to start history server and job tracker after upgrade. (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 2de0789f4 - dfc023bb2
AMBARI-5195. Unable to start history server and job tracker after upgrade.
(swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dfc023bb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dfc023bb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dfc023bb
Branch: refs/heads/trunk
Commit: dfc023bb2792c5344dd33a0c38370ecaa20d9a96
Parents: 2de0789
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Mon Mar 24 11:29:10 2014 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Mon Mar 24 11:29:10 2014 -0700
--
.../stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfc023bb/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
index ac1e5ff..3073400 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/package/scripts/params.py
@@ -56,7 +56,7 @@ exclude_file_path =
config['configurations']['mapred-site']['mapred.hosts.exclud
mapred_hosts_file_path =
config['configurations']['mapred-site']['mapred.hosts']
#hdfs directories
-mapreduce_jobhistory_intermediate_done_dir =
config['configurations']['mapred-site']['mapreduce.jobhistory.intermediate-done-dir']
+mapreduce_jobhistory_intermediate_done_dir =
default('/configurations/mapred-site/mapreduce.jobhistory.intermediate-done-dir',
'/mr-history/tmp')
mapreduce_jobhistory_done_dir =
config['configurations']['mapred-site']['mapred.job.tracker.history.completed.location']
#for create_hdfs_directory
hostname = config[hostname]
git commit: AMBARI-5196. Disable 2.1 stack in 1.5.0 release. (mahadev)
Repository: ambari Updated Branches: refs/heads/branch-1.5.0 520c13317 - b2dfa1a9c AMBARI-5196. Disable 2.1 stack in 1.5.0 release. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b2dfa1a9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b2dfa1a9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b2dfa1a9 Branch: refs/heads/branch-1.5.0 Commit: b2dfa1a9cb461e08a670c9e5448a8bd23a90c9a2 Parents: 520c133 Author: Mahadev Konar maha...@apache.org Authored: Mon Mar 24 14:56:38 2014 -0700 Committer: Mahadev Konar maha...@apache.org Committed: Mon Mar 24 14:56:38 2014 -0700 -- ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b2dfa1a9/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml index 3c7f87d..b7d8766 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/metainfo.xml @@ -17,7 +17,7 @@ -- metainfo versions - activetrue/active + activefalse/active /versions extends2.0.6/extends /metainfo
[1/2] git commit: AMBARI-5178. After upgrade hdfs-site and other configs don't contain properties intoduced in 1.5.0 (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.5.0 b2dfa1a9c - 24202913a
AMBARI-5178. After upgrade hdfs-site and other configs don't contain properties
intoduced in 1.5.0 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bde70992
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bde70992
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bde70992
Branch: refs/heads/branch-1.5.0
Commit: bde70992eec4931218ff98b71c2be2b7a918c334
Parents: b2dfa1a
Author: Andrew Onischuk aonis...@hortonworks.com
Authored: Fri Mar 21 14:58:23 2014 -0700
Committer: Mahadev Konar maha...@apache.org
Committed: Mon Mar 24 15:42:54 2014 -0700
--
.pydevproject | 7 +++
ambari-agent/.pydevproject | 13 +
.../HDP/2.0.6/services/HBASE/package/scripts/params.py | 1 +
.../HDP/2.0.6/services/YARN/package/scripts/params.py | 3 ++-
4 files changed, 23 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bde70992/.pydevproject
--
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 000..a9cca03
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,7 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+?eclipse-pydev version=1.0?
+
+pydev_project
+pydev_property
name=org.python.pydev.PYTHON_PROJECT_INTERPRETERDefault/pydev_property
+pydev_property name=org.python.pydev.PYTHON_PROJECT_VERSIONpython
2.7/pydev_property
+/pydev_project
http://git-wip-us.apache.org/repos/asf/ambari/blob/bde70992/ambari-agent/.pydevproject
--
diff --git a/ambari-agent/.pydevproject b/ambari-agent/.pydevproject
new file mode 100644
index 000..2358a03
--- /dev/null
+++ b/ambari-agent/.pydevproject
@@ -0,0 +1,13 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+?eclipse-pydev version=1.0?
+
+pydev_project
+pydev_property
name=org.python.pydev.PYTHON_PROJECT_INTERPRETERDefault/pydev_property
+pydev_property name=org.python.pydev.PYTHON_PROJECT_VERSIONpython
2.7/pydev_property
+pydev_pathproperty name=org.python.pydev.PROJECT_SOURCE_PATH
+path/ambari-agent/src/main/python/path
+/pydev_pathproperty
+pydev_pathproperty name=org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH
+path/root/ambari/ambari-common/src/test/python/path
+/pydev_pathproperty
+/pydev_project
http://git-wip-us.apache.org/repos/asf/ambari/blob/bde70992/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
index f999683..37d9278 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py
@@ -53,6 +53,7 @@ regionserver_xmn_size =
calc_xmn_from_xms(regionserver_heapsize, 0.2, 512)
pid_dir = status_params.pid_dir
tmp_dir = config['configurations']['hbase-site']['hbase.tmp.dir']
+# TODO UPGRADE default, update site during upgrade
_local_dir_conf = default('/configurations/hbase-site/hbase.local.dir',
${hbase.tmp.dir}/local)
local_dir = substitute_vars(_local_dir_conf,
config['configurations']['hbase-site'])
http://git-wip-us.apache.org/repos/asf/ambari/blob/bde70992/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
index a523a4f..f32223f 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/package/scripts/params.py
@@ -41,7 +41,8 @@ kinit_path_local =
functions.get_kinit_path([default(kinit_path_local,None),
rm_host = config['clusterHostInfo']['rm_host'][0]
rm_port =
config['configurations']['yarn-site']['yarn.resourcemanager.webapp.address'].split(':')[-1]
rm_https_port = 8090
-rm_nodes_exclude_path =
config['configurations']['yarn-site']['yarn.resourcemanager.nodes.exclude-path']
+# TODO UPGRADE default, update site during upgrade
+rm_nodes_exclude_path =
default(/configurations/yarn-site/yarn.resourcemanager.nodes.exclude-path,/etc/hadoop/conf/yarn.exclude)
java64_home =
[2/2] git commit: AMBARI-5178. After upgrade hdfs-site and other configs don't contain properties intoduced in 1.5.0 (aonishuk)
AMBARI-5178. After upgrade hdfs-site and other configs don't contain properties intoduced in 1.5.0 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24202913 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24202913 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24202913 Branch: refs/heads/branch-1.5.0 Commit: 24202913a5533c32ea44359a61864707f5861aa2 Parents: bde7099 Author: Andrew Onischuk aonis...@hortonworks.com Authored: Fri Mar 21 15:00:42 2014 -0700 Committer: Mahadev Konar maha...@apache.org Committed: Mon Mar 24 15:43:10 2014 -0700 -- .pydevproject | 7 --- ambari-agent/.pydevproject | 13 - 2 files changed, 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/24202913/.pydevproject -- diff --git a/.pydevproject b/.pydevproject deleted file mode 100644 index a9cca03..000 --- a/.pydevproject +++ /dev/null @@ -1,7 +0,0 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? -?eclipse-pydev version=1.0? - -pydev_project -pydev_property name=org.python.pydev.PYTHON_PROJECT_INTERPRETERDefault/pydev_property -pydev_property name=org.python.pydev.PYTHON_PROJECT_VERSIONpython 2.7/pydev_property -/pydev_project http://git-wip-us.apache.org/repos/asf/ambari/blob/24202913/ambari-agent/.pydevproject -- diff --git a/ambari-agent/.pydevproject b/ambari-agent/.pydevproject deleted file mode 100644 index 2358a03..000 --- a/ambari-agent/.pydevproject +++ /dev/null @@ -1,13 +0,0 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? -?eclipse-pydev version=1.0? - -pydev_project -pydev_property name=org.python.pydev.PYTHON_PROJECT_INTERPRETERDefault/pydev_property -pydev_property name=org.python.pydev.PYTHON_PROJECT_VERSIONpython 2.7/pydev_property -pydev_pathproperty name=org.python.pydev.PROJECT_SOURCE_PATH -path/ambari-agent/src/main/python/path -/pydev_pathproperty -pydev_pathproperty name=org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH -path/root/ambari/ambari-common/src/test/python/path -/pydev_pathproperty -/pydev_project
git commit: AMBARI-5159. Storm config page not available(ui.childopts property missing post-installation). (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk dfc023bb2 - 343d41ef5
AMBARI-5159. Storm config page not available(ui.childopts property missing
post-installation). (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/343d41ef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/343d41ef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/343d41ef
Branch: refs/heads/trunk
Commit: 343d41ef5bbb90506ecfc92f6c558f81a021b8e8
Parents: dfc023b
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Mon Mar 24 15:49:05 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Mon Mar 24 15:49:05 2014 -0700
--
.../app/controllers/main/service/info/configs.js | 14 +++---
ambari-web/app/utils/config.js| 9 +++--
.../defaults_providers/storm_defaults_provider.js | 4
3 files changed, 18 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/343d41ef/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index beac1b7..6282887 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -380,7 +380,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
this.checkForRestart(serviceConfig, restartData);
if (serviceName || serviceConfig.serviceName === 'MISC') {
//STEP 11: render configs and wrap each in ServiceConfigProperty object
- this.loadComponentConfigs(allConfigs, serviceConfig, restartData);
+ this.loadComponentConfigs(allConfigs, serviceConfig, restartData,
advancedConfigs);
this.get('stepConfigs').pushObject(serviceConfig);
}
this.set('selectedService', this.get('stepConfigs').objectAt(0));
@@ -524,8 +524,9 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
* @param configs
* @param componentConfig
* @param restartData
+ * @param advancedConfigs
*/
- loadComponentConfigs: function (configs, componentConfig, restartData) {
+ loadComponentConfigs: function (configs, componentConfig, restartData,
advancedConfigs) {
var localDB = this.getInfoForDefaults();
var recommendedDefaults = {};
@@ -537,7 +538,14 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend({
var d = defaultsProvider.getDefaults(localDB);
defaults.push(d);
for (var name in d) {
- recommendedDefaults[name] = d[name];
+ var defaultValueFromStack =
advancedConfigs.findProperty('name',name);
+ if (!!d[name]) {
+recommendedDefaults[name] = d[name];
+ } else {
+ // If property default value is not declared on client, fetch it
from stack definition
+ // If it's not declared with any valid value in both server stack
and client, then js reference error is expected to be thrown
+recommendedDefaults[name] = defaultValueFromStack.value
+ }
}
});
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/343d41ef/ambari-web/app/utils/config.js
--
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 8f74043..90ab28f 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -616,11 +616,16 @@ App.config = Em.Object.create({
service.defaultsProviders.forEach(function (defaultsProvider) {
var defaults = defaultsProvider.getDefaults(localDB);
for (var name in defaults) {
-recommendedDefaults[name] = defaults[name];
var config = configsByService.findProperty('name', name);
-if (config) {
+if (!config) {
+ continue;
+}
+if (!!defaults[name]) {
+ recommendedDefaults[name] = defaults[name];
config.set('value', defaults[name]);
config.set('defaultValue', defaults[name]);
+} else {
+ recommendedDefaults[name] = config.get('defaultValue');
}
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/343d41ef/ambari-web/app/utils/configs/defaults_providers/storm_defaults_provider.js
--
diff --git
a/ambari-web/app/utils/configs/defaults_providers/storm_defaults_provider.js
b/ambari-web/app/utils/configs/defaults_providers/storm_defaults_provider.js
index e49e282..2acf89a 100644
---
