merge to head

diff --git a/bwmon.py b/bwmon.py
index 3b4ab16..4d76fe0 100755 (executable)
--- a/bwmon.py
+++ b/bwmon.py
@@ -15,7 +15,7 @@
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #

-# $Id: bwmon.py,v 1.15 2006/12/13 21:39:23 faiyaza Exp $
+# $Id: bwmon.py,v 1.16 2006/12/19 16:52:24 faiyaza Exp $

 #
 
 import syslog
 #
 
 import syslog


@@ -62,6 +62,7 @@ default_ByteThresh = int(.8 * default_ByteMax)
 default_ExemptByteMax = 17609365914 
 default_ExemptByteThresh = int(.8 * default_ExemptByteMax) 
 
 default_ExemptByteMax = 17609365914 
 default_ExemptByteThresh = int(.8 * default_ExemptByteMax) 
 

+default_MinRate = 8

 
 # Average over 1 day
 period = 1 * seconds_per_day
 
 # Average over 1 day
 period = 1 * seconds_per_day


@@ -222,6 +223,8 @@ class Slice:
         if bytes >= (self.bytes + self.ByteThresh):
             new_maxrate = \
             int((self.ByteMax - self.bytes + bytes)/(period - time.time() - self.time))
         if bytes >= (self.bytes + self.ByteThresh):
             new_maxrate = \
             int((self.ByteMax - self.bytes + bytes)/(period - time.time() - self.time))

+            if new_maxrate < default_MinRate:
+                new_maxrate = default_MinRate

         else:
             new_maxrate = maxrate
 
         else:
             new_maxrate = maxrate
 


@@ -245,6 +248,8 @@ class Slice:
         if exemptbytes >= (self.exemptbytes + self.ExemptByteThresh):
             new_maxexemptrate = \
             int((self.ExemptByteMax - (self.bytes + bytes))/(period - (time.time() - self.time)))
         if exemptbytes >= (self.exemptbytes + self.ExemptByteThresh):
             new_maxexemptrate = \
             int((self.ExemptByteMax - (self.bytes + bytes))/(period - (time.time() - self.time)))

+            if new_maxexemptrate < default_MinRate:
+                new_maxexemptrate = default_MinRate

         else:
             new_maxexemptrate = maxexemptrate
 
         else:
             new_maxexemptrate = maxexemptrate
 


@@ -338,11 +343,11 @@ def main():
         (version, slices) = pickle.load(f)
         f.close()
         # Check version of data file
         (version, slices) = pickle.load(f)
         f.close()
         # Check version of data file

-        if version != "$Id: bwmon.py,v 1.15 2006/12/13 21:39:23 faiyaza Exp $":
+        if version != "$Id: bwmon.py,v 1.16 2006/12/19 16:52:24 faiyaza Exp $":

             print "Not using old version '%s' data file %s" % (version, datafile)
             raise Exception
     except Exception:
             print "Not using old version '%s' data file %s" % (version, datafile)
             raise Exception
     except Exception:

-        version = "$Id: bwmon.py,v 1.15 2006/12/13 21:39:23 faiyaza Exp $"
+        version = "$Id: bwmon.py,v 1.16 2006/12/19 16:52:24 faiyaza Exp $"

         slices = {}
 
     # Get special slice IDs
         slices = {}
 
     # Get special slice IDs

diff --git a/pl_mom.spec b/pl_mom.spec
index 559e7ea..bbebeaf 100644 (file)
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,6 +1,6 @@
 %define name pl_mom
 %define version 0.6
 %define name pl_mom
 %define version 0.6

-%define release 9%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release 10%{?pldistro:.%{pldistro}}%{?date:.%{date}}

  
 Summary: PlanetLab node monitoring tools
 Name: %{name}
  
 Summary: PlanetLab node monitoring tools
 Name: %{name}