You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/01/16 13:51:11 UTC

git commit: AMBARI-4311. Ganglia server install fails when specifying custom rrdcached base directory (Eugene Checkanskiy via aonishuk)

Updated Branches:
  refs/heads/trunk 7a9385506 -> 5f48900bd


AMBARI-4311. Ganglia server install fails when specifying custom rrdcached base directory (Eugene Checkanskiy via aonishuk)


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

Branch: refs/heads/trunk
Commit: 5f48900bdeee5169acee9ec4bd16752256442360
Parents: 7a93855
Author: Eugene Chekanskiy <ec...@hortonworks.com>
Authored: Thu Jan 16 14:49:02 2014 +0200
Committer: Eugene Chekanskiy <ec...@hortonworks.com>
Committed: Thu Jan 16 14:49:02 2014 +0200

----------------------------------------------------------------------
 .../services/GANGLIA/package/scripts/ganglia_server.py      | 9 +++++++--
 .../services/GANGLIA/package/scripts/ganglia_server.py      | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5f48900b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py
index 293b5c3..e391562 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.4/services/GANGLIA/package/scripts/ganglia_server.py
@@ -160,7 +160,11 @@ def server_files():
     Directory(params.rrdcached_base_dir,
               owner=rrd_file_owner,
               group=rrd_file_owner,
-              mode=0755
+              mode=0755,
+              recursive=True
+    )
+    Directory(params.rrdcached_default_base_dir,
+              action = "delete"
     )
     Link(params.rrdcached_default_base_dir,
          to=params.rrdcached_base_dir
@@ -168,7 +172,8 @@ def server_files():
   elif rrd_file_owner != 'nobody':
     Directory(params.rrdcached_default_base_dir,
               owner=rrd_file_owner,
-              group=rrd_file_owner
+              group=rrd_file_owner,
+              recursive=True
     )
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/5f48900b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py
index 9f4f705..ab730de 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.8/services/GANGLIA/package/scripts/ganglia_server.py
@@ -176,7 +176,11 @@ def server_files():
     Directory(params.rrdcached_base_dir,
               owner=rrd_file_owner,
               group=rrd_file_owner,
-              mode=0755
+              mode=0755,
+              recursive=True
+    )
+    Directory(params.rrdcached_default_base_dir,
+              action = "delete"
     )
     Link(params.rrdcached_default_base_dir,
          to=params.rrdcached_base_dir
@@ -184,7 +188,8 @@ def server_files():
   elif rrd_file_owner != 'nobody':
     Directory(params.rrdcached_default_base_dir,
               owner=rrd_file_owner,
-              group=rrd_file_owner
+              group=rrd_file_owner,
+              recursive=True
     )