From d0cef883887b0153ca614a4133aeb21364a3befe Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Fri, 13 Apr 2007 17:01:40 +0000 Subject: [PATCH] * bwmon now uses rspecs instead of direct plcapi call to getslivers data. Insert right after sync() in database --- bwmon.py | 179 ++++++++++++++++++++++++++++------------------------ database.py | 4 +- 2 files changed, 99 insertions(+), 84 deletions(-) diff --git a/bwmon.py b/bwmon.py index 06d19f7..646d93a 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.1.2.5 2007/02/28 05:26:54 faiyaza Exp $ +# $Id: bwmon.py,v 1.12 2007/03/06 20:46:54 faiyaza Exp $ # import os @@ -24,11 +24,11 @@ import time import pickle import socket -#import xmlrpclib import bwlimit import logger from sets import Set + try: sys.path.append("/etc/planetlab") from plc_config import * @@ -39,10 +39,6 @@ except: PLC_MAIL_SUPPORT_ADDRESS = "support@planet-lab.org" PLC_MAIL_SLICE_ADDRESS = "SLICE@slices.planet-lab.org" - -# Utility functions -#from pl_mom import * - # Constants seconds_per_day = 24 * 60 * 60 bits_per_byte = 8 @@ -183,7 +179,7 @@ class Slice: """ - def __init__(self, xid, name, data): + def __init__(self, xid, name, rspec): self.xid = xid self.name = name self.time = 0 @@ -198,9 +194,10 @@ class Slice: self.Maxi2KByte = default_Maxi2KByte self.Threshi2KByte = default_Threshi2KByte self.Share = default_Share + self.Sharei2 = default_Share self.emailed = False - self.updateSliceAttributes(data) + self.updateSliceAttributes(rspec) bwlimit.set(xid = self.xid, minrate = self.MinRate * 1000, maxrate = self.MaxRate * 1000, @@ -208,11 +205,10 @@ class Slice: minexemptrate = self.Mini2Rate * 1000, share = self.Share) - def __repr__(self): return self.name - def updateSliceAttributes(self, data): + def updateSliceAttributes(self, rspec): # Incase the limits have changed. if (self.MaxRate != default_MaxRate) or \ (self.Maxi2Rate != default_Maxi2Rate): @@ -220,63 +216,68 @@ class Slice: self.Maxi2Rate = int(bwlimit.bwmax / 1000) # Get attributes - for sliver in data['slivers']: - if sliver['name'] == self.name: - for attribute in sliver['attributes']: - if attribute['name'] == 'net_min_rate': - logger.log("bwmon: Updating %s. Min Rate = %s" \ - %(self.name, self.MinRate)) - # To ensure min does not go above 25% of nodecap. - if int(attribute['value']) > int(.25 * default_MaxRate): - self.MinRate = int(.25 * default_MaxRate) - else: - self.MinRate = int(attribute['value']) - elif attribute['name'] == 'net_max_rate': - self.MaxRate = int(attribute['value']) - logger.log("bwmon: Updating %s. Max Rate = %s" \ - %(self.name, self.MaxRate)) - elif attribute['name'] == 'net_i2_min_rate': - self.Mini2Rate = int(attribute['value']) - logger.log("bwmon: Updating %s. Min i2 Rate = %s" \ - %(self.name, self.Mini2Rate)) - elif attribute['name'] == 'net_i2_max_rate': - self.Maxi2Rate = int(attribute['value']) - logger.log("bwmon: Updating %s. Max i2 Rate = %s" \ - %(self.name, self.Maxi2Rate)) - elif attribute['name'] == 'net_max_kbyte': - self.MaxKByte = int(attribute['value']) - logger.log("bwmon: Updating %s. Max KByte lim = %s" \ - %(self.name, self.MaxKByte)) - elif attribute['name'] == 'net_i2_max_kbyte': - self.Maxi2KByte = int(attribute['value']) - logger.log("bwmon: Updating %s. Max i2 KByte = %s" \ - %(self.name, self.Maxi2KByte)) - elif attribute['name'] == 'net_thresh_kbyte': - self.ThreshKByte = int(attribute['value']) - logger.log("bwmon: Updating %s. Thresh KByte = %s" \ - %(self.name, self.ThreshKByte)) - elif attribute['name'] == 'net_i2_thresh_kbyte': - self.Threshi2KByte = int(attribute['value']) - logger.log("bwmon: Updating %s. i2 Thresh KByte = %s" \ - %(self.name, self.Threshi2KByte)) - elif attribute['name'] == 'net_share': - self.Share = int(attribute['value']) - logger.log("bwmon: Updating %s. Net Share = %s" \ - %(self.name, self.Share)) - elif attribute['name'] == 'net_i2_share': - self.Sharei2 = int(attribute['value']) - logger.log("bwmon: Updating %s. Net i2 Share = %s" \ - %(self.name, self.i2Share)) - - - def reset(self, runningmaxrate, runningmaxi2rate, usedbytes, usedi2bytes, data): + if rspec.has_key('net_min_rate'): + logger.log("bwmon: Updating %s. Min Rate = %s" %(self.name, self.MinRate)) + # To ensure min does not go above 25% of nodecap. + if int(rspec['net_min_rate']) > int(.25 * default_MaxRate): + self.MinRate = int(.25 * default_MaxRate) + else: + self.MinRate = int(rspec['net_min_rate']) + + MaxRate = int(rspec.get('net_max_rate', bwlimit.get_bwcap() / 1000)) + if MaxRate != self.MaxRate: + self.MaxRate = MaxRate + logger.log("bwmon: Updating %s. Max Rate = %s" %(self.name, self.MaxRate)) + + Mini2Rate = int(rspec.get('net_i2_min_rate', default_Mini2Rate)) + if Mini2Rate != self.Mini2Rate: + self.Mini2Rate = Mini2Rate + logger.log("bwmon: Updating %s. Min i2 Rate = %s" %(self.name, self.Mini2Rate)) + + Maxi2Rate = int(rspec.get('net_i2_max_rate', bwlimit.bwmax / 1000)) + if Maxi2Rate != self.Maxi2Rate: + self.Maxi2Rate = Maxi2Rate + logger.log("bwmon: Updating %s. Max i2 Rate = %s" %(self.name, self.Maxi2Rate)) + + MaxKByte = int(rspec.get('net_max_kbyte', default_MaxKByte)) + if MaxKByte != self.MaxKByte: + self.MaxKByte = MaxKByte + logger.log("bwmon: Updating %s. Max KByte lim = %s" %(self.name, self.MaxKByte)) + + Maxi2KByte = int(rspec.get('net_i2_max_kbyte', default_Maxi2KByte)) + if Maxi2KByte != self.Maxi2KByte: + self.Maxi2KByte = Maxi2KByte + logger.log("bwmon: Updating %s. Max i2 KByte = %s" %(self.name, self.Maxi2KByte)) + + ThreshKByte = int(rspec.get('net_thresh_kbyte', default_ThreshKByte)) + if ThreshKByte != self.ThreshKByte: + self.ThreshKByte = ThreshKByte + logger.log("bwmon: Updating %s. Thresh KByte = %s" %(self.name, self.ThreshKByte)) + + Threshi2KByte = int(rspec.get('net_i2_thresh_kbyte', default_Threshi2KByte)) + if Threshi2KByte != self.Threshi2KByte: + self.Threshi2KByte = Threshi2KByte + logger.log("bwmon: Updating %s. i2 Thresh KByte = %s" %(self.name, self.Threshi2KByte)) + + Share = int(rspec.get('net_share', default_Share)) + if Share != self.Share: + self.Share = Share + logger.log("bwmon: Updating %s. Net Share = %s" %(self.name, self.Share)) + + Sharei2 = int(rspec.get('net_i2_share', default_Share)) + if Sharei2 != self.Sharei2: + self.Sharei2 = Sharei2 + logger.log("bwmon: Updating %s. Net i2 Share = %s" %(self.name, self.i2Share)) + + + def reset(self, runningmaxrate, runningmaxi2rate, usedbytes, usedi2bytes, rspec): """ Begin a new recording period. Remove caps by restoring limits to their default values. """ # Query Node Manager for max rate overrides - self.updateSliceAttributes(data) + self.updateSliceAttributes(rspec) # Reset baseline time self.time = time.time() @@ -302,14 +303,14 @@ class Slice: minexemptrate = self.Mini2Rate * 1000, share = self.Share) - def update(self, runningmaxrate, runningmaxi2rate, usedbytes, usedi2bytes, data): + def update(self, runningmaxrate, runningmaxi2rate, usedbytes, usedi2bytes, rspec): """ Update byte counts and check if byte limits have been exceeded. """ # Query Node Manager for max rate overrides - self.updateSliceAttributes(data) + self.updateSliceAttributes(rspec) # Prepare message parameters from the template message = "" @@ -385,7 +386,7 @@ class Slice: self.emailed = True slicemail(self.name, subject, message + (footer % params)) -def GetSlivers(data): +def GetSlivers(db): # Defaults global datafile, \ period, \ @@ -416,11 +417,11 @@ def GetSlivers(data): (version, slices) = pickle.load(f) f.close() # Check version of data file - if version != "$Id: bwmon.py,v 1.1.2.5 2007/02/28 05:26:54 faiyaza Exp $": + if version != "$Id: bwmon.py,v 1.12 2007/03/06 20:46:54 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.1.2.5 2007/02/28 05:26:54 faiyaza Exp $" + version = "$Id: bwmon.py,v 1.12 2007/03/06 20:46:54 faiyaza Exp $" slices = {} # Get/set special slice IDs @@ -428,26 +429,27 @@ def GetSlivers(data): default_xid = bwlimit.get_xid("default") if root_xid not in slices.keys(): - slices[root_xid] = Slice(root_xid, "root", data) - slices[root_xid].reset(0, 0, 0, 0, data) + slices[root_xid] = Slice(root_xid, "root", {}) + slices[root_xid].reset(0, 0, 0, 0, {}) if default_xid not in slices.keys(): - slices[default_xid] = Slice(default_xid, "default", data) - slices[default_xid].reset(0, 0, 0, 0, data) + slices[default_xid] = Slice(default_xid, "default", {}) + slices[default_xid].reset(0, 0, 0, 0, {}) live = {} - # Get running slivers. {xid: name} - for sliver in data['slivers']: - live[bwlimit.get_xid(sliver['name'])] = sliver['name'] + # Get running slivers that should be on this node (from plc). {xid: name} + for sliver in db.keys(): + live[bwlimit.get_xid(sliver)] = sliver # Setup new slices. # live.xids - runing.xids = new.xids newslicesxids = Set(live.keys()) - Set(slices.keys()) for newslicexid in newslicesxids: - if newslicexid != None: + if newslicexid != None or db[live[newslicexid]].has_key('_rspec') != True: logger.log("bwmon: New Slice %s" % live[newslicexid]) - slices[newslicexid] = Slice(newslicexid, live[newslicexid], data) - slices[newslicexid].reset(0, 0, 0, 0, data) + rspec = db[live[newslicexid]]['_rspec'] + slices[newslicexid] = Slice(newslicexid, live[newslicexid], rspec) + slices[newslicexid].reset(0, 0, 0, 0, rspec) else: logger.log("bwmon Slice %s doesn't have xid. Must be delegated. Skipping." % live[newslicexid]) # Get actual running values from tc. @@ -481,16 +483,28 @@ def GetSlivers(data): # that the byte counters have overflowed (or, more # likely, the node was restarted or the HTB buckets # were re-initialized). - slice.reset(maxrate, maxexemptrate, usedbytes, usedi2bytes, data) + slice.reset(maxrate, \ + maxexemptrate, \ + usedbytes, \ + usedi2bytes, \ + db[slice.name]['_rspec']) else: # Update byte counts - slice.update(maxrate, maxexemptrate, usedbytes, usedi2bytes, data) + slice.update(maxrate, \ + maxexemptrate, \ + usedbytes, \ + usedi2bytes, \ + db[slice.name]['_rspec']) else: # Just in case. Probably (hopefully) this will never happen. # New slice, initialize state logger.log("bwmon: New Slice %s" % name) - slice = slices[xid] = Slice(xid, name, data) - slice.reset(maxrate, maxexemptrate, usedbytes, usedi2bytes, data) + slice = slices[xid] = Slice(xid, name, db[slice.name]['_rspec']) + slice.reset(maxrate, \ + maxexemptrate, \ + usedbytes, \ + usedi2bytes, \ + db[slice.name]['_rspec']) # Delete dead slices dead = Set(slices.keys()) - Set(live.keys()) @@ -513,6 +527,5 @@ def GetSlivers(data): # for attribute in sliver['attributes']: # if attribute['name'] == "KByteThresh": print attribute['value'] -def start(options, config): - pass - +#def start(options, config): +# pass diff --git a/database.py b/database.py index 58dffbe..878a7ba 100644 --- a/database.py +++ b/database.py @@ -19,7 +19,7 @@ import time import accounts import logger import tools - +import bwmon # We enforce minimum allocations to keep the clueless from hosing their slivers. # Disallow disk loans because there's currently no way to punish slivers over quota. @@ -103,6 +103,8 @@ class Database(dict): for name, rec in self.iteritems(): if rec['instantiation'] == 'plc-instantiated': accounts.get(name).ensure_created(rec) + bwmon.GetSlivers(self) + # request a database dump global dump_requested dump_requested = True -- 2.43.0