X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=database.py;h=92c5ef4280ab31031c24c2eccd0e08e70ea75b02;hb=314bfe393f7efb2f734ad8b4a6939a6900f89554;hp=890e9c2e6eae7e917b1150c2d1ea5bbc3d3f1cc4;hpb=55665e49361e51e7aec50698ca6d19ccd4647693;p=nodemanager.git

diff --git a/database.py b/database.py
index 890e9c2..92c5ef4 100644
--- a/database.py
+++ b/database.py
@@ -19,11 +19,11 @@ 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.
-MINIMUM_ALLOCATION = {'cpu_min': 0, 'cpu_share': 16, '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,13 +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)
 
-        # request a database dump
+		# Wake up bwmom to update limits.
+        bwmon.lock.set()
         global dump_requested
         dump_requested = True
         db_cond.notify()