From 899ea47c9af999d9d8bf177eadbf4992193521f7 Mon Sep 17 00:00:00 2001 From: Jelle Scholtalbers Date: Tue, 27 Feb 2018 11:46:55 +0100 Subject: [PATCH] fix cgroup metric collector when no cgroup is available --- lib/galaxy/jobs/metrics/instrumenters/cgroup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/jobs/metrics/instrumenters/cgroup.py b/lib/galaxy/jobs/metrics/instrumenters/cgroup.py index 454b90f1310..936d1d36ef1 100644 --- a/lib/galaxy/jobs/metrics/instrumenters/cgroup.py +++ b/lib/galaxy/jobs/metrics/instrumenters/cgroup.py @@ -63,13 +63,13 @@ class CgroupPlugin(InstrumentPlugin): return metrics def __record_cgroup_cpu_usage(self, job_directory): - return """cat /proc/$$/cgroup | awk -F':' '$2=="cpuacct,cpu"{print $2":"$3}' | xargs -I{} cgget -g {} > %s""" % self.__cgroup_metrics_file(job_directory) + return """if [ -x /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 """cat /proc/$$/cgroup | awk -F':' '$2=="memory"{print $2":"$3}' | xargs -I{} cgget -g {} >> %s""" % self.__cgroup_metrics_file(job_directory) + return """if [ -x /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, "cgroup_metrics") + return self._instrument_file_path(job_directory, "_metrics") def __read_metrics(self, path): metrics = {}