X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bwmon.py;h=2410b7d7e885738ea25b68a19a7c2b11c7fc6104;hb=288b66d5ba2651b9184a25d2a795dfb912439701;hp=b31e893c43ec17371994308c3e8796f529ec4474;hpb=cacd7158435573b7391c44ad96c94713ff29db5c;p=mom.git diff --git a/bwmon.py b/bwmon.py index b31e893..2410b7d 100755 --- a/bwmon.py +++ b/bwmon.py @@ -54,14 +54,13 @@ default_maxexemptrate = bwlimit.bwmax # 1.5 Mbit or 16.4 GB per day #default_avgexemptrate = 1500000 -# 4 Gbyte per day. 4 * 1024K * 1024M * 1024G -default_ByteThresh = 4294967296 +# 5.4 Gbyte per day. 5.4 * 1024M * 1024G kbytes # 5.4 Gbyte per day max allowed transfered per recording period -default_ByteMax = 5798205850 -# 14 Gbyte per day -default_ExemptByteThresh = 15032385536 +default_ByteMax = 5662310 +default_ByteThresh = int(.8 * default_ByteMax) # 16.4 Gbyte per day max allowed transfered per recording period to I2 -default_ExemptByteMax = 17609365914 +default_ExemptByteMax = 17196646 +default_ExemptByteThresh = int(.8 * default_ExemptByteMax) # Average over 1 day @@ -100,12 +99,8 @@ class Slice: ByteThresh - After thresh, cap node to (maxbyte - bytes)/(time left in period) ExemptByteMax - Same as above, but for i2. ExemptByteThresh - i2 ByteThresh - #last_maxexemptrate - last recorded maxexemptrate from NM. Slice attribute. - #last_maxrate - last recorded maxrate from NM. Slice attribute. - #last_ByteMax - Last recorded from NM. total volume of data allowed. - #last_ByteThresh - Last recorded from NM. After thresh, cap node to (maxbyte - bytes)/(period - t) - #last_ExemptByteMax - Last recorded from NM. Same as above, but for i2. - #last_ExemptByteThresh - Last recorded from NM. i2 ByteThresh + maxrate - max_rate slice attribute. + maxexemptrate - max_exempt_rate slice attribute. """ @@ -121,12 +116,6 @@ class Slice: self.ExemptByteThresh = default_ExemptByteThresh self.maxrate = default_maxrate self.maxexemptrate = default_maxexemptrate - #self.last_maxrate = default_maxrate - #self.last_maxexemptrate = default_maxexemptrate - #self.last_ByteMax = default_ByteMax - #self.last_ByteThresh = default_ByteThresh - #self.last_ExemptByteMax = default_ExemptByteMax - #self.last_ExemptByteThresh = default_ExemptByteThresh # Get real values where applicable self.reset(maxrate, maxexemptrate, bytes, exemptbytes) @@ -139,8 +128,28 @@ class Slice: try: vals = nm.query(self.name, [('nm_net_max_rate', self.maxrate), - ('nm_net_max_exempt_rate', self.maxexemptrate)]) - (self.maxrate, self.maxexemptrate) = vals + ('nm_net_max_exempt_rate', self.maxexemptrate), + ("nm_net_max_byte", self.ByteMax), + ("nm_net_max_exempt_byte", self.ExemptByteMax), + ("nm_net_max_thresh_byte", int( .8 * self.ByteMax)), + ("nm_net_max_thresh_exempt_byte", int(.8 * self.ExemptByteMax)), + ("nm_net_avg_rate", 0), + ("nm_net_avg_exempt_rate", 0)]) + + (self.maxrate, + self.maxexemptrate, + self.ByteMax, + self.ExemptByteMax, + self.ByteThresh, + self.ExemptByteThresh, + avgrate, + avgexemptrate) = vals + + if (avgrate != 0) or (avgexemptrate != 0): + self.ByteMax = avgrate * period + self.ByteThresh = int(self.ByteMax * .8) + self.ExemptByteMax = avgexemptrate * period + self.ExemptByteThresh = int(self.ExemptByteMax * .8) except Exception, err: print "Warning: Exception received while querying NM:", err @@ -170,13 +179,8 @@ class Slice: def update(self, maxrate, maxexemptrate, bytes, exemptbytes): """ - Update byte counts and check if average rates have been - exceeded. In the worst case (instantaneous usage of the entire - average daily byte limit at the beginning of the recording - period), the slice will be immediately capped and will get to - send twice the average daily byte limit. In the common case, - it will get to send slightly more than the average daily byte - limit. + Update byte counts and check if byte limits have been + exceeded. """ # Query Node Manager for max rate overrides @@ -190,8 +194,9 @@ class Slice: 'date': time.asctime(time.gmtime()) + " GMT", 'period': format_period(period)} - if bytes >= (self.bytes + self.ByteThresh): - new_maxrate = (self.ByteMax - self.ByteThresh)/(period - (time.time() - self.time)) + if bytes >= (self.bytes + (self.ByteThresh * 1024)): + new_maxrate = \ + int(((self.ByteMax * 1024) - self.bytes + bytes)/(period - time.time() - self.time)) else: new_maxrate = maxrate @@ -199,12 +204,12 @@ class Slice: params['class'] = "low bandwidth" params['bytes'] = format_bytes(bytes - self.bytes) params['maxrate'] = bwlimit.format_tc_rate(maxrate) - params['limit'] = format_bytes(self.ByteMax) + params['limit'] = format_bytes(int(self.ByteMax * 1024)) params['new_maxrate'] = bwlimit.format_tc_rate(new_maxrate) if verbose: print "%(slice)s %(class)s " \ - "%(bytes)s, %(limit)s (%(new_maxrate)s avg)" % \ + "%(bytes)s of %(limit)s (%(new_maxrate)s maxrate)" % \ params # Cap low bandwidth burst rate @@ -212,9 +217,9 @@ class Slice: message += template % params print "%(slice)s %(class)s capped at %(new_maxrate)s " % params - if exemptbytes >= (self.exemptbytes + self.ExemptByteThresh): + if exemptbytes >= (self.exemptbytes + (self.ExemptByteThresh * 1024)): new_maxexemptrate = \ - (self.ExemptByteMax - self.ExemptByteThresh)/(period - (time.time() - self.time)) + int(((self.ExemptByteMax * 1024) - (self.bytes + bytes))/(period - (time.time() - self.time))) else: new_maxexemptrate = maxexemptrate @@ -222,12 +227,12 @@ class Slice: params['class'] = "high bandwidth" params['bytes'] = format_bytes(exemptbytes - self.exemptbytes) params['maxrate'] = bwlimit.format_tc_rate(maxexemptrate) - params['limit'] = format_bytes(self.ExemptByteMax) + params['limit'] = format_bytes(self.ExemptByteMax * 1024) params['new_maxrate'] = bwlimit.format_tc_rate(new_maxexemptrate) if verbose: print "%(slice)s %(class)s " \ - "%(bytes)s, %(limit)s (%(new_maxrate)s avg)" % params + "%(bytes)s of %(limit)s (%(new_maxrate)s maxrate)" % params # Cap high bandwidth burst rate if new_maxexemptrate != maxexemptrate: @@ -247,6 +252,8 @@ class Slice: else: slicemail(self.name, subject, message + (footer % params)) + + def usage(): print """ Usage: %s [OPTIONS]... @@ -328,8 +335,17 @@ def main(): bytes, exemptbytes) = params live.append(xid) - # Delete Me - print("name %s , minrate %s, maxrate %s, minexemptrate %s, maxexemptrate %s, bytes %s, exemptbytes %s" % (bwlimit.get_slice(xid), minrate, maxrate, minexemptrate, maxexemptrate, bytes, exemptbytes)) + if verbose: + print("\nRunning stats for %s"\ + "\n minrate %s, maxrate %s, minexemptrate %s,"\ + " maxexemptrate %s, bytes %s, exemptbytes %s" % \ + (bwlimit.get_slice(xid), + bwlimit.format_tc_rate(minrate), + bwlimit.format_tc_rate(maxrate), + bwlimit.format_tc_rate(minexemptrate), + bwlimit.format_tc_rate(maxexemptrate), + bytes, + exemptbytes)) # Ignore root and default buckets if xid == root_xid or xid == default_xid: