x/synergy-scheduler-manager
Code Issues Proposed changes

Add a backfill_depth parameter

Browse Source 
Allow Synergy to not check the whole queue when looking for jobs to
start.

Change-Id: Idf8b92d3d91c0beadabea09f31e042c39320e4f0
Sem-Ver: feature
Closes-bug: #1644188
DocImpact
This commit is contained in:
Lisa Zangrando 2016-11-23 12:29:47 +01:00 committed by Vincent Llorens
parent 3b74b591fe
commit 1a36a1db90
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
synergy_scheduler_manager/scheduler_manager.py
View File

@ -102,11 +102,13 @@ class Notifications(object):
class Worker(Thread): class Worker(Thread):
def __init__(self, name, queue, projects, nova_manager, keystone_manager): def __init__(self, name, queue, projects, nova_manager,
keystone_manager, backfill_depth=100):
super(Worker, self).__init__() super(Worker, self).__init__()
self.setDaemon(True) self.setDaemon(True)
self.name = name self.name = name
self.backfill_depth = backfill_depth
self.queue = queue self.queue = queue
self.projects = projects self.projects = projects
self.nova_manager = nova_manager self.nova_manager = nova_manager
@ -136,8 +138,11 @@ class Worker(Thread):
last_release_time = SharedQuota.getLastReleaseTime() last_release_time = SharedQuota.getLastReleaseTime()
while queue_items: while queue_items:
item = queue_items.pop(0) self.queue.reinsertItem(queue_items.pop(0))
self.queue.reinsertItem(item)
if len(queue_items) >= self.backfill_depth:
SharedQuota.wait()
continue
queue_item = self.queue.getItem(blocking=False) queue_item = self.queue.getItem(blocking=False)
@ -167,8 +172,8 @@ class Worker(Thread):
self.queue.deleteItem(queue_item) self.queue.deleteItem(queue_item)
continue continue
except Exception as ex: except Exception as ex:
LOG.warn("Worker %s: the server %r is not anymore " LOG.warn("Worker %s: the server %r is not anymore availa"
"available! reason=%s" % (self.name, prj_id, ex)) "ble ! [reason=%s]" % (self.name, server_id, ex))
self.queue.deleteItem(queue_item) self.queue.deleteItem(queue_item)
continue continue
@ -235,7 +240,8 @@ class SchedulerManager(Manager):
super(SchedulerManager, self).__init__("SchedulerManager") super(SchedulerManager, self).__init__("SchedulerManager")
self.config_opts = [ self.config_opts = [
cfg.FloatOpt('default_TTL', default=10.0), cfg.IntOpt("backfill_depth", default=100),
cfg.FloatOpt("default_TTL", default=10.0),
cfg.ListOpt("projects", default=[], help="the projects list"), cfg.ListOpt("projects", default=[], help="the projects list"),
cfg.ListOpt("shares", default=[], help="the shares list"), cfg.ListOpt("shares", default=[], help="the shares list"),
cfg.ListOpt("TTLs", default=[], help="the TTLs list") cfg.ListOpt("TTLs", default=[], help="the TTLs list")
@ -264,7 +270,7 @@ class SchedulerManager(Manager):
self.keystone_manager = self.getManager("KeystoneManager") self.keystone_manager = self.getManager("KeystoneManager")
self.fairshare_manager = self.getManager("FairShareManager") self.fairshare_manager = self.getManager("FairShareManager")
self.default_TTL = float(CONF.SchedulerManager.default_TTL) self.default_TTL = float(CONF.SchedulerManager.default_TTL)
self.fairshare_manager = self.getManager("FairShareManager") self.backfill_depth = CONF.SchedulerManager.backfill_depth
self.projects = {} self.projects = {}
self.listener = None self.listener = None
self.exit = False self.exit = False
@ -403,7 +409,8 @@ class SchedulerManager(Manager):
self.dynamic_queue, self.dynamic_queue,
self.projects, self.projects,
self.nova_manager, self.nova_manager,
self.keystone_manager) self.keystone_manager,
self.backfill_depth)
dynamic_worker.start() dynamic_worker.start()
self.workers.append(dynamic_worker) self.workers.append(dynamic_worker)
@ -417,7 +424,7 @@ class SchedulerManager(Manager):
targets=[target], targets=[target],
endpoints=[self.notifications]) endpoints=[self.notifications])
LOG.info("listener created") self.quota_manager.deleteExpiredServers()
self.listener.start() self.listener.start()
self.configured = True self.configured = True