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': 0, 'net_max': 8, 'net2_min': 0, 'net2_max': 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'
def deliver_record(self, rec):
"""A record is simply a dictionary with 'name' and 'timestamp' keys. We keep some persistent private data in the records under keys that start with '_'; thus record updates should not displace such keys."""
+ if rec['timestamp'] < self._min_timestamp: return
name = rec['name']
old_rec = self.get(name)
- if old_rec != None and rec['timestamp'] > old_rec['timestamp']:
+ if old_rec == None: self[name] = rec
+ elif rec['timestamp'] > old_rec['timestamp']:
for key in old_rec.keys():
if not key.startswith('_'): del old_rec[key]
old_rec.update(rec)
- elif rec['timestamp'] >= self._min_timestamp: self[name] = rec
def set_min_timestamp(self, ts):
"""The ._min_timestamp member is the timestamp on the last comprehensive update. We use it to determine if a record is stale. This method should be called whenever new GetSlivers() data comes in."""
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)
-
- # request a database dump
+ slivr = accounts.get(name)
+ logger.verbose("database:sync : %s is %s" %(name,slivr._get_class()))
+ # Make sure we refresh accounts that are running
+ if rec['instantiation'] == 'plc-instantiated': slivr.ensure_created(rec)
+ elif rec['instantiation'] == 'nm-controller': slivr.ensure_created(rec)
+ # Back door to ensure PLC overrides Ticket in delegation.
+ elif rec['instantiation'] == 'delegated' and slivr._get_class() != None:
+ # if the ticket has been delivered and the nm-contoroller started the slice
+ # update rspecs and keep them up to date.
+ if slivr.is_running(): slivr.ensure_created(rec)
+
+ # Wake up bwmom to update limits.
+ bwmon.lock.set()
global dump_requested
dump_requested = True
db_cond.notify()
while True:
db_lock.acquire()
while not dump_requested: db_cond.wait()
- db_copy = tools.deepcopy(db)
+ db_pickle = cPickle.dumps(db, cPickle.HIGHEST_PROTOCOL)
dump_requested = False
db_lock.release()
- try: tools.write_file(DB_FILE, lambda f: cPickle.dump(db_copy, f, -1))
+ try: tools.write_file(DB_FILE, lambda f: f.write(db_pickle))
except: logger.log_exc()
global db
try: