diff --git a/lib/galaxy/jobs/metrics/instrumenters/cgroup.py b/lib/galaxy/jobs/metrics/instrumenters/cgroup.py index 351713e3fba..a78812cba16 100644 --- a/lib/galaxy/jobs/metrics/instrumenters/cgroup.py +++ b/lib/galaxy/jobs/metrics/instrumenters/cgroup.py @@ -63,10 +63,10 @@ class CgroupPlugin(InstrumentPlugin): return metrics def __record_cgroup_cpu_usage(self, job_directory): - return """if [ -e /proc/$$/cgroup ]; then cat /proc/$$/cgroup | awk -F':' '$2=="cpuacct,cpu"{print $2":"$3}' | xargs -I{} cgget -g {} > %(metrics)s ; else echo "" > %(metrics)s; fi""" % {"metrics": self.__cgroup_metrics_file(job_directory)} + return """if [ `command -v cgget` ] && [ -e /proc/$$/cgroup ]; then cat /proc/$$/cgroup | awk -F':' '$2=="cpuacct,cpu"{print $2":"$3}' | xargs -I{} cgget -g {} > %(metrics)s ; else echo "" > %(metrics)s; fi""" % {"metrics": self.__cgroup_metrics_file(job_directory)} def __record_cgroup_memory_usage(self, job_directory): - return """if [ -e /proc/$$/cgroup ]; then cat /proc/$$/cgroup | awk -F':' '$2=="memory"{print $2":"$3}' | xargs -I{} cgget -g {} >> %(metrics)s ; else echo "" > %(metrics)s; fi""" % {"metrics": self.__cgroup_metrics_file(job_directory)} + return """if [ `command -v cgget` ] && [ -e /proc/$$/cgroup ]; then cat /proc/$$/cgroup | awk -F':' '$2=="memory"{print $2":"$3}' | xargs -I{} cgget -g {} >> %(metrics)s ; else echo "" > %(metrics)s; fi""" % {"metrics": self.__cgroup_metrics_file(job_directory)} def __cgroup_metrics_file(self, job_directory): return self._instrument_file_path(job_directory, "_metrics")