Merge changes from trunk. Check auth and recompute session key when out of synch...

[nodemanager.git] / bwmon.py

diff --git a/bwmon.py b/bwmon.py
index d980abc..be146f6 100644 (file)
--- a/bwmon.py
+++ b/bwmon.py
@@ -199,7 +199,7 @@ class Slice:
         self.emailed = False
         self.capped = False
 
         self.emailed = False
         self.capped = False
 

-        self.updateSliceAttributes(rspec)
+        self.updateSliceTags(rspec)

         bwlimit.set(xid = self.xid, 
                 minrate = self.MinRate * 1000, 
                 maxrate = self.MaxRate * 1000, 
         bwlimit.set(xid = self.xid, 
                 minrate = self.MinRate * 1000, 
                 maxrate = self.MaxRate * 1000, 


@@ -210,7 +210,7 @@ class Slice:
     def __repr__(self):
         return self.name
 
     def __repr__(self):
         return self.name
 

-    def updateSliceAttributes(self, rspec):
+    def updateSliceTags(self, rspec):

         '''
         Use respects from GetSlivers to PLC to populate slice object.  Also
         do some sanity checking.
         '''
         Use respects from GetSlivers to PLC to populate slice object.  Also
         do some sanity checking.


@@ -277,10 +277,10 @@ class Slice:
         to their default values.
         """
         # Cache share for later comparison
         to their default values.
         """
         # Cache share for later comparison

-        runningrates.get('share', 1) = self.Share
+        self.Share = runningrates.get('share', 1)

 
         # Query Node Manager for max rate overrides
 
         # Query Node Manager for max rate overrides

-        self.updateSliceAttributes(rspec)    
+        self.updateSliceTags(rspec)    

 
         # Reset baseline time
         self.time = time.time()
 
         # Reset baseline time
         self.time = time.time()


@@ -370,7 +370,7 @@ class Slice:
         runningrates['share'] = self.Share
 
         # Query Node Manager for max rate overrides
         runningrates['share'] = self.Share
 
         # Query Node Manager for max rate overrides

-        self.updateSliceAttributes(rspec)    
+        self.updateSliceTags(rspec)    

 
         usedbytes = runningrates['usedbytes']
         usedi2bytes = runningrates['usedi2bytes']
 
         usedbytes = runningrates['usedbytes']
         usedi2bytes = runningrates['usedi2bytes']


@@ -646,9 +646,40 @@ def sync(nmdbcopy):
     pickle.dump((version, slices, deaddb), f)
     f.close()
 
     pickle.dump((version, slices, deaddb), f)
     f.close()
 

+
+def getDefaults(nmdbcopy):
+    '''
+    Get defaults from default slice's slice attributes.
+    '''
+    status = True
+    # default slice
+    dfltslice = nmdbcopy.get(PLC_SLICE_PREFIX+"_default")
+    if dfltslice: 
+        if dfltslice['rspec']['net_max_rate'] == -1:
+            allOff()
+            status = False
+    return status
+
+
+def allOff():
+    """
+    Turn off all slice HTBs
+    """
+    # Get/set special slice IDs
+    root_xid = bwlimit.get_xid("root")
+    default_xid = bwlimit.get_xid("default")
+    kernelhtbs = gethtbs(root_xid, default_xid)
+    if len(kernelhtbs):
+        logger.log("bwlimit:  Disabling all running HTBs.")
+        for htb in kernelhtbs.keys(): bwlimit.off(htb) 
+
+

 lock = threading.Event()
 def run():
 lock = threading.Event()
 def run():

-    """When run as a thread, wait for event, lock db, deep copy it, release it, run bwmon.GetSlivers(), then go back to waiting."""
+    """
+    When run as a thread, wait for event, lock db, deep copy it, release it, 
+    run bwmon.GetSlivers(), then go back to waiting.
+    """

     logger.log("bwmon:  Thread started", 2)
     while True:
         lock.wait()
     logger.log("bwmon:  Thread started", 2)
     while True:
         lock.wait()


@@ -656,7 +687,11 @@ def run():
         database.db_lock.acquire()
         nmdbcopy = copy.deepcopy(database.db)
         database.db_lock.release()
         database.db_lock.acquire()
         nmdbcopy = copy.deepcopy(database.db)
         database.db_lock.release()

-        try:  sync(nmdbcopy)
+        try:  
+            if getDefaults(nmdbcopy) and len(bwlimit.tc("class show dev eth0")) > 0:
+                # class show to check if net:InitNodeLimit:bwlimit.init has run.
+                sync(nmdbcopy)
+            else: logger.log("bwmon:  BW limits DISABLED.")

         except: logger.log_exc()
         lock.clear()
 
         except: logger.log_exc()
         lock.clear()