Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3196E112BF for ; Fri, 28 Mar 2014 17:26:27 +0000 (UTC) Received: (qmail 53946 invoked by uid 500); 28 Mar 2014 17:26:26 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 53913 invoked by uid 500); 28 Mar 2014 17:26:25 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 53770 invoked by uid 99); 28 Mar 2014 17:26:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Mar 2014 17:26:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B7EC78B1FFF; Fri, 28 Mar 2014 17:26:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vbrodetskyi@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-5264. Ganglia Server goes to "installed" state after double "Ganglia rrdcached base directory" config changing.(vbrodetskyi) Date: Fri, 28 Mar 2014 17:26:18 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/branch-1.5.0 f13f4b7b1 -> 6975ee4e7 AMBARI-5264. Ganglia Server goes to "installed" state after double "Ganglia rrdcached base directory" config changing.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6975ee4e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6975ee4e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6975ee4e Branch: refs/heads/branch-1.5.0 Commit: 6975ee4e7d98a409a080486a4ee85840617662e1 Parents: f13f4b7 Author: Vitaly Brodetskyi Authored: Fri Mar 28 19:25:57 2014 +0200 Committer: Vitaly Brodetskyi Committed: Fri Mar 28 19:25:57 2014 +0200 ---------------------------------------------------------------------- .../GANGLIA/package/scripts/ganglia_server.py | 24 ++++++++++++++------ .../GANGLIA/package/scripts/ganglia_server.py | 24 ++++++++++++++------ .../stacks/1.3.2/GANGLIA/test_ganglia_server.py | 22 +++++++++++++++++- .../stacks/2.0.6/GANGLIA/test_ganglia_server.py | 22 +++++++++++++++++- 4 files changed, 76 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6975ee4e/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py index b27bf61..030a627 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py @@ -164,19 +164,29 @@ def server_files(): mode=0755 ) rrd_file_owner = params.gmetad_user - if params.rrdcached_default_base_dir != params.rrdcached_base_dir: + + if not os.path.exists(params.rrdcached_base_dir) or (os.path.islink(params.rrdcached_default_base_dir) + and params.rrdcached_default_base_dir == params.rrdcached_base_dir): + if os.path.islink(params.rrdcached_default_base_dir): + Link(params.rrdcached_default_base_dir, + action = "delete" + ) + else: + Directory(params.rrdcached_default_base_dir, + action = "delete" + ) + Directory(params.rrdcached_base_dir, owner=rrd_file_owner, group=rrd_file_owner, mode=0755, recursive=True ) - Directory(params.rrdcached_default_base_dir, - action = "delete" - ) - Link(params.rrdcached_default_base_dir, - to=params.rrdcached_base_dir - ) + + if params.rrdcached_default_base_dir != params.rrdcached_base_dir: + Link(params.rrdcached_default_base_dir, + to=params.rrdcached_base_dir + ) elif rrd_file_owner != 'nobody': Directory(params.rrdcached_default_base_dir, owner=rrd_file_owner, http://git-wip-us.apache.org/repos/asf/ambari/blob/6975ee4e/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 a1c1b41..2cf8e7b 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 @@ -200,19 +200,29 @@ def server_files(): mode=0755 ) rrd_file_owner = params.gmetad_user - if params.rrdcached_default_base_dir != params.rrdcached_base_dir: + + if not os.path.exists(params.rrdcached_base_dir) or (os.path.islink(params.rrdcached_default_base_dir) + and params.rrdcached_default_base_dir == params.rrdcached_base_dir): + if os.path.islink(params.rrdcached_default_base_dir): + Link(params.rrdcached_default_base_dir, + action = "delete" + ) + else: + Directory(params.rrdcached_default_base_dir, + action = "delete" + ) + Directory(params.rrdcached_base_dir, owner=rrd_file_owner, group=rrd_file_owner, mode=0755, recursive=True ) - Directory(params.rrdcached_default_base_dir, - action = "delete" - ) - Link(params.rrdcached_default_base_dir, - to=params.rrdcached_base_dir - ) + + if params.rrdcached_default_base_dir != params.rrdcached_base_dir: + Link(params.rrdcached_default_base_dir, + to=params.rrdcached_base_dir + ) elif rrd_file_owner != 'nobody': Directory(params.rrdcached_default_base_dir, owner=rrd_file_owner, http://git-wip-us.apache.org/repos/asf/ambari/blob/6975ee4e/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py index 9e7630c..db48ceb 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py +++ b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py @@ -19,8 +19,10 @@ limitations under the License. ''' from stacks.utils.RMFTestCase import * +from mock.mock import MagicMock, call, patch - +@patch("os.path.exists", new = MagicMock(return_value=False)) +@patch("os.path.islink", new = MagicMock(return_value=False)) class TestGangliaServer(RMFTestCase): def test_configure_default(self): @@ -236,6 +238,15 @@ class TestGangliaServer(RMFTestCase): content = StaticFile('rrd.py'), mode = 0755,) + self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', + action = ['delete'], + ) + self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', + owner = 'nobody', + group = 'nobody', + recursive = True, + mode = 0755, + ) self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf', owner = 'root', group = 'hadoop',) @@ -415,6 +426,15 @@ class TestGangliaServer(RMFTestCase): content = StaticFile('rrd.py'), mode = 0755, ) + self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', + action = ['delete'], + ) + self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', + owner = 'nobody', + group = 'nobody', + recursive = True, + mode = 0755, + ) self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf', owner = 'root', group = 'hadoop', http://git-wip-us.apache.org/repos/asf/ambari/blob/6975ee4e/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 82cedd8..02694bc 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 @@ -19,8 +19,10 @@ limitations under the License. ''' from stacks.utils.RMFTestCase import * +from mock.mock import MagicMock, call, patch - +@patch("os.path.exists", new = MagicMock(return_value=False)) +@patch("os.path.islink", new = MagicMock(return_value=False)) class TestGangliaServer(RMFTestCase): def test_configure_default(self): @@ -223,6 +225,15 @@ class TestGangliaServer(RMFTestCase): content = StaticFile('rrd.py'), mode = 0755,) + self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', + action = ['delete'], + ) + self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', + owner = 'nobody', + group = 'nobody', + recursive = True, + mode = 0755, + ) self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf', owner = 'root', group = 'hadoop',) @@ -390,6 +401,15 @@ class TestGangliaServer(RMFTestCase): content = StaticFile('rrd.py'), mode = 0755, ) + self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', + action = ['delete'], + ) + self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', + owner = 'nobody', + group = 'nobody', + recursive = True, + mode = 0755, + ) self.assertResourceCalled('File', '/etc/ganglia/gmetad.conf', owner = 'root', group = 'hadoop',