X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=92c5ef4280ab31031c24c2eccd0e08e70ea75b02;hb=refs%2Fheads%2Ftrellis;hp=7b95ed2d0bfad245d312c70b7c1bd3d65574d0d8;hpb=eedfc8774fd54183fc44b029eaac6f110a16e8fe;p=nodemanager.git

diff --git a/database.py b/database.py
index 7b95ed2..92c5ef4 100644
--- a/database.py
+++ b/database.py
@@ -23,7 +23,7 @@ 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.
-MINIMUM_ALLOCATION = {'cpu_min': 0, 'cpu_share': 32, 'net_min_rate': 0, 'net_max_rate': 8, 'net_i2_min_rate': 0, 'net_i2_max_rate': 8, 'net_share': 1}
+MINIMUM_ALLOCATION = {'cpu_pct': 0, 'cpu_share': 1, 'net_min_rate': 0, 'net_max_rate': 8, 'net_i2_min_rate': 0, 'net_i2_max_rate': 8, 'net_share': 1}
 LOANABLE_RESOURCES = MINIMUM_ALLOCATION.keys()
 
 DB_FILE = '/root/sliver_mgr_db.pickle'
@@ -97,16 +97,17 @@ class Database(dict):
         self._compute_effective_rspecs()
 
         # create and destroy accounts as needed
+        logger.verbose("database:sync : fetching accounts")
         existing_acct_names = accounts.all()
         for name in existing_acct_names:
+            logger.verbose("database:sync : loop on %s"%name)
             if name not in self: accounts.get(name).ensure_destroyed()
         for name, rec in self.iteritems():
             if rec['instantiation'] == 'plc-instantiated': accounts.get(name).ensure_created(rec)
+            if rec['instantiation'] == 'nm-controller': accounts.get(name).ensure_created(rec)
 
-        try: bwmon.GetSlivers(self)
-        except: logger.log_exc()
-
-        # request a database dump
+		# Wake up bwmom to update limits.
+        bwmon.lock.set()
         global dump_requested
         dump_requested = True
         db_cond.notify()