From 3bc479eaa73cd02bfd85c1fd2663075ab0144758 Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Tue, 26 Jun 2007 18:59:05 +0000 Subject: [PATCH] HTBS exist but aren't in dat file are no longer toggled on and off. Just update dat's byte counts. --- bwmon.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/bwmon.py b/bwmon.py index 85bc2a9..977aa0b 100644 --- a/bwmon.py +++ b/bwmon.py @@ -15,7 +15,7 @@ # Faiyaz Ahmed # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: bwmon.py,v 1.22 2007/06/26 18:00:46 faiyaza Exp $ +# $Id: bwmon.py,v 1.21 2007/06/16 14:30:17 faiyaza Exp $ # import os @@ -404,8 +404,6 @@ def gethtbs(root_xid, default_xid): name = bwlimit.get_slice(xid) - - if (name is None) \ and (xid != root_xid) \ and (xid != default_xid): @@ -458,11 +456,11 @@ def sync(nmdbcopy): (version, slices) = pickle.load(f) f.close() # Check version of data file - if version != "$Id: bwmon.py,v 1.22 2007/06/26 18:00:46 faiyaza Exp $": + if version != "$Id: bwmon.py,v 1.21 2007/06/16 14:30:17 faiyaza Exp $": logger.log("bwmon: Not using old version '%s' data file %s" % (version, datafile)) raise Exception except Exception: - version = "$Id: bwmon.py,v 1.22 2007/06/26 18:00:46 faiyaza Exp $" + version = "$Id: bwmon.py,v 1.21 2007/06/16 14:30:17 faiyaza Exp $" slices = {} # Get/set special slice IDs @@ -500,10 +498,17 @@ def sync(nmdbcopy): newslicesxids = Set(live.keys()) - Set(livehtbs.keys()) logger.log("bwmon: Found %s new slices" % newslicesxids.__len__()) - # Incase we upgraded nm and need to keep track of already running htbs + # Incase we rebooted and need to keep track of already running htbs norecxids = Set(livehtbs.keys()) - Set(slices.keys()) logger.log("bwmon: Found %s slices that have htbs but not in dat." % norecxids.__len__()) - newslicesxids.update(norecxids) + # Reset tc counts. + for norecxid in norecxids: + slices[norecxid] = Slice(norecxid, live[norecxid]['name'], live[norecxid]['_rspec']) + slices[norecxid].reset(livehtbs[norecxid]['maxrate'], + livehtbs[norecxid]['maxexemptrate'], + livehtbs[norecxid]['usedbytes'], + livehtbs[norecxid]['usedi2bytes'], + live[norecxid]['_rspec']) # Setup new slices for newslice in newslicesxids: -- 2.47.0