From 43e70191f19f89b65b37c42141aa2c038f122940 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sat, 22 Feb 2014 13:34:14 +0100 Subject: [PATCH] RRD: Fix updating of DS --- RRD.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/RRD.py b/RRD.py index d1ae870..9bb87a0 100644 --- a/RRD.py +++ b/RRD.py @@ -80,9 +80,9 @@ class RRD: raise FileNotFoundError(self.filename) info = self.info() if set(ds_list) - set(info['ds'].values()) != set(): - if set((ds.name, ds.type) for ds in ds_list) \ - - set((ds.name, ds.type) for ds in info['ds'].values()) != set(): - raise RRDIncompatibleException() + for ds in ds_list: + if ds.name in info['ds'] and ds.type != info['ds'][ds.name].type: + raise RRDIncompatibleException("%s is %s but should be %s" % (ds.name, ds.type, info['ds'][ds.name].type)) else: raise RRDOutdatedException() @@ -177,15 +177,8 @@ class RRD: echo = True dump.stdout.close() restore.stdin.close() - try: - dump.wait(1) - except subprocess.TimeoutExpired: - dump.kill() - try: - restore.wait(2) - except subprocess.TimeoutExpired: - dump.kill() - raise RuntimeError("rrdtool restore process killed") + dump.wait() + restore.wait() os.rename(self.filename + ".new", self.filename) self._cached_info = None