From ca552606191920c1f6d02c28b80273d2e9d4349a Mon Sep 17 00:00:00 2001 From: Philip Knirsch Date: Wed, 25 Feb 2009 11:45:48 +0100 Subject: - Added complete cleanup code in case of tuned exiting and/or getting a SIGTERM to restore default values - Made the disk tuning pluging less nosy if started as non-daemon - Fixed missing self. in the tuned.py config handling --- tuningplugins/disk.py | 8 ++++++-- tuningplugins/net.py | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'tuningplugins') diff --git a/tuningplugins/disk.py b/tuningplugins/disk.py index 6624890..3f0067e 100644 --- a/tuningplugins/disk.py +++ b/tuningplugins/disk.py @@ -36,6 +36,10 @@ class DiskTuning: def init(self, config): self.config = config + def cleanup(self): + for dev in self.devidle.keys(): + os.system("hdparm -S0 -B255 /dev/"+dev+" > /dev/null 2>&1") + def setTuning(self, load): disks = load.setdefault("DISK", {}) for dev in disks.keys(): @@ -43,10 +47,10 @@ class DiskTuning: self.__updateIdle__(dev, devload) if self.devidle[dev]["LEVEL"] == 0 and self.devidle[dev]["READ"] >= 30 and self.devidle[dev]["WRITE"] >= 30: self.devidle[dev]["LEVEL"] = 1 - os.system("hdparm -Y -S60 -B1 /dev/"+dev) + os.system("hdparm -Y -S60 -B1 /dev/"+dev+" > /dev/null 2>&1") if self.devidle[dev]["LEVEL"] > 0 and (self.devidle[dev]["READ"] == 0 or self.devidle[dev]["WRITE"] == 0): self.devidle[dev]["LEVEL"] = 0 - os.system("hdparm -S255 -B127 /dev/"+dev) + os.system("hdparm -S255 -B127 /dev/"+dev+" > /dev/null 2>&1") print(load, self.devidle) _plugin = DiskTuning() diff --git a/tuningplugins/net.py b/tuningplugins/net.py index 687d306..4529253 100644 --- a/tuningplugins/net.py +++ b/tuningplugins/net.py @@ -36,6 +36,10 @@ class NetTuning: def init(self, config): self.config = config + def cleanup(self): + for dev in self.devidle.keys(): + os.system("ethtool -s "+dev+" advertise 0x03F") + def setTuning(self, load): disks = load.setdefault("NET", {}) for dev in disks.keys(): -- cgit