AMBARI-5984. Ganglia directory customization failing on trunk on perf cluster (aonishuk)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/files/gmetadLib.sh

@@ -189,7 +189,7 @@ setuid_username "${GMETAD_USER}"
 #-------------------------------------------------------------------------------
 # Where gmetad stores its round-robin databases
 # default: "/var/lib/ganglia/rrds"
-# rrd_rootdir "/some/other/place"
+rrd_rootdir "${RRD_ROOTDIR}"
 #
 #-------------------------------------------------------------------------------
 # In earlier versions of gmetad, hostnames were handled in a case

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/ganglia_server.py

@@ -103,34 +103,12 @@ def server_files():
   )
   rrd_file_owner = params.gmetad_user
 
-  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
-    )
-
-    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,
-              group=rrd_file_owner,
-              recursive=True
-    )
+  Directory(params.rrdcached_base_dir,
+            owner=rrd_file_owner,
+            group=rrd_file_owner,
+            mode=0755,
+            recursive=True
+  )
 
 
 if __name__ == "__main__":

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/scripts/params.py

@@ -31,7 +31,6 @@ gmetad_user = config['configurations']['global']["gmetad_user"]
 gmond_user = config['configurations']['global']["gmond_user"]
 
 webserver_group = "apache"
-rrdcached_default_base_dir = "/var/lib/ganglia/rrds"
 rrdcached_base_dir = config['configurations']['global']["rrdcached_base_dir"]
 rrdcached_timeout = default("/configurations/global/rrdcached_timeout", 3600)
 rrdcached_delay = default("/configurations/global/rrdcached_delay", 1800)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/gangliaEnv.sh.j2

@@ -37,6 +37,7 @@
 # */
 
 # Unix users and groups for the binaries we start up.
+RRD_ROOTDIR={{rrdcached_base_dir}}
 GMETAD_USER={{gmetad_user}};
 GMOND_USER={{gmond_user}};
 WEBSERVER_GROUP={{webserver_group}};

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/package/templates/rrd.py.j2

@@ -148,7 +148,7 @@ clusterParts = stripList(clusterParts)
 if "p" in queryString:
   rrdPath = queryString["p"]
 else:
-  rrdPath = "/var/lib/ganglia/rrds/"
+  rrdPath = "{{rrdcached_base_dir}}"
 
 start = None
 if "s" in queryString:
@@ -184,7 +184,7 @@ def _walk(*args, **kwargs):
 
 
 for cluster in clusterParts:
-  for path, dirs, files in _walk(rrdPath + cluster):
+  for path, dirs, files in _walk(os.path.join(rrdPath,cluster)):
     pathParts = path.split("/")
     #Process only path which contains files. If no host parameter passed - process all hosts folders and summary info
     #If host parameter passed - process only this host folder

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/files/gmetadLib.sh

@@ -189,7 +189,7 @@ setuid_username "${GMETAD_USER}"
 #-------------------------------------------------------------------------------
 # Where gmetad stores its round-robin databases
 # default: "/var/lib/ganglia/rrds"
-# rrd_rootdir "/some/other/place"
+rrd_rootdir "${RRD_ROOTDIR}"
 #
 #-------------------------------------------------------------------------------
 # In earlier versions of gmetad, hostnames were handled in a case

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/ganglia_server.py

@@ -103,34 +103,12 @@ def server_files():
   )
   rrd_file_owner = params.gmetad_user
 
-  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
-    )
-
-    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,
-              group=rrd_file_owner,
-              recursive=True
-    )
+  Directory(params.rrdcached_base_dir,
+            owner=rrd_file_owner,
+            group=rrd_file_owner,
+            mode=0755,
+            recursive=True
+  )
 
 
 if __name__ == "__main__":

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py

@@ -37,7 +37,6 @@ gmond_allowed_apps = ["Application1", "Application2", "Application3"]
 gmond_apps = set(gmond_apps) & set(gmond_allowed_apps)
 
 webserver_group = "apache"
-rrdcached_default_base_dir = "/var/lib/ganglia/rrds"
 rrdcached_base_dir = config['configurations']['global']["rrdcached_base_dir"]
 rrdcached_timeout = default("/configurations/global/rrdcached_timeout", 3600)
 rrdcached_delay = default("/configurations/global/rrdcached_delay", 1800)

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/gangliaEnv.sh.j2

@@ -38,6 +38,7 @@
 # */
 
 # Unix users and groups for the binaries we start up.
+RRD_ROOTDIR={{rrdcached_base_dir}}
 GMETAD_USER={{gmetad_user}};
 GMOND_USER={{gmond_user}};
 WEBSERVER_GROUP={{webserver_group}};

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/templates/rrd.py.j2

@@ -148,7 +148,7 @@ clusterParts = stripList(clusterParts)
 if "p" in queryString:
   rrdPath = queryString["p"]
 else:
-  rrdPath = "/var/lib/ganglia/rrds/"
+  rrdPath = "{{rrdcached_base_dir}}"
 
 start = None
 if "s" in queryString:
@@ -184,7 +184,7 @@ def _walk(*args, **kwargs):
 
 
 for cluster in clusterParts:
-  for path, dirs, files in _walk(rrdPath + cluster):
+  for path, dirs, files in _walk(os.path.join(rrdPath,cluster)):
     pathParts = path.split("/")
     #Process only path which contains files. If no host parameter passed - process all hosts folders and summary info
     #If host parameter passed - process only this host folder