From 34eec336249f01daf1827c29f46f3906f723b46b Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Mon, 12 Feb 2007 23:05:58 +0000 Subject: [PATCH] Sets up slice bw limits and HTBs. Incorporates pl_mom/bwmon. --- bwmon.py | 2 ++ nm.py | 2 +- sliver_vs.py | 16 ++++++++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bwmon.py b/bwmon.py index 1e894ff..59f3253 100644 --- a/bwmon.py +++ b/bwmon.py @@ -478,6 +478,8 @@ def GetSlivers(data): # Delete dead slices dead = Set(slices.keys()) - Set(live.keys()) for xid in dead: + if xid == root_xid or xid == default_xid: + continue del slices[xid] bwlimit.off(xid) diff --git a/nm.py b/nm.py index 6e56501..ae92e07 100644 --- a/nm.py +++ b/nm.py @@ -51,7 +51,7 @@ def run(): print "Warning while writing PID file:", err # Load and start modules - for module in ['net', 'proper', 'conf_files', 'sm']: + for module in ['net', 'proper', 'conf_files', 'sm', 'bwmon']: try: m = __import__(module) m.start(options, config) diff --git a/sliver_vs.py b/sliver_vs.py index e4c438c..ce7a5cb 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -118,14 +118,14 @@ class Sliver_VS(accounts.Account, vserver.VServer): # N.B. net_*_rate are in kbps because of XML-RPC maxint # limitations, convert to bps which is what bwlimit.py expects. - net_limits = (self.rspec['net_min_rate'] * 1000, - self.rspec['net_max_rate'] * 1000, - self.rspec['net_i2_min_rate'] * 1000, - self.rspec['net_i2_max_rate'] * 1000, - self.rspec['net_share']) - logger.log('%s: setting net limits to %s bps' % (self.name, net_limits[:-1])) - logger.log('%s: setting net share to %d' % (self.name, net_limits[-1])) - self.set_bwlimit(*net_limits) +# net_limits = (self.rspec['net_min_rate'] * 1000, +# self.rspec['net_max_rate'] * 1000, +# self.rspec['net_i2_min_rate'] * 1000, +# self.rspec['net_i2_max_rate'] * 1000, +# self.rspec['net_share']) +# logger.log('%s: setting net limits to %s bps' % (self.name, net_limits[:-1])) +# logger.log('%s: setting net share to %d' % (self.name, net_limits[-1])) +# self.set_bwlimit(*net_limits) cpu_min = self.rspec['cpu_min'] cpu_share = self.rspec['cpu_share'] -- 2.43.0