From 9e4dacd5e7e560bae614ddf390a9f02c2c19a25d Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Mon, 7 Sep 2015 16:45:48 +0100 Subject: [PATCH 1/2] The maxrss reported by getrusage is in kilobytes, not pages --- synapse/metrics/__init__.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py index d7bcad8a8..3f7b7158a 100644 --- a/synapse/metrics/__init__.py +++ b/synapse/metrics/__init__.py @@ -17,7 +17,7 @@ from __future__ import absolute_import import logging -from resource import getrusage, getpagesize, RUSAGE_SELF +from resource import getrusage, RUSAGE_SELF import functools import os import stat @@ -100,7 +100,6 @@ def render_all(): # process resource usage rusage = None -PAGE_SIZE = getpagesize() def update_resource_metrics(): @@ -113,8 +112,8 @@ resource_metrics = get_metrics_for("process.resource") resource_metrics.register_callback("utime", lambda: rusage.ru_utime * 1000) resource_metrics.register_callback("stime", lambda: rusage.ru_stime * 1000) -# pages -resource_metrics.register_callback("maxrss", lambda: rusage.ru_maxrss * PAGE_SIZE) +# kilobytes +resource_metrics.register_callback("maxrss", lambda: rusage.ru_maxrss * 1024) TYPES = { stat.S_IFSOCK: "SOCK", From 709ba99afda371bb19a34e4448dc771a6cdab320 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Mon, 7 Sep 2015 16:45:55 +0100 Subject: [PATCH 2/2] Check that /proc/self/fd exists before listing it --- synapse/metrics/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py index 3f7b7158a..943d63745 100644 --- a/synapse/metrics/__init__.py +++ b/synapse/metrics/__init__.py @@ -130,6 +130,10 @@ def _process_fds(): counts = {(k,): 0 for k in TYPES.values()} counts[("other",)] = 0 + # Not every OS will have a /proc/self/fd directory + if not os.path.exists("/proc/self/fd"): + return counts + for fd in os.listdir("/proc/self/fd"): try: s = os.stat("/proc/self/fd/%s" % (fd))