x
/
synergy-scheduler-manager
Code Issues Proposed changes

The FairshareManager should not use the Manager.condition var 

The Manager.condition (i.e. threading.Condition()) variable is used by Synergy for scheduling the periodic manager's tasks at fixed rate. FairshareManager inherits the same variable from Manager and wrongly uses it for different purposes. The problem is that every time the FairshareManager calls the condition.notifyAll() method, triggers unwittingly the execution of the task() method.

Change-Id: I910a50c566e076439de78d0f4e4df0d9a893aadb
Sem-Ver: bugfix
Closes-bug: #1644496
This commit is contained in:
Lisa Zangrando 2016-11-24 11:17:22 +01:00
parent 98221a2a6e
commit 9e16739c8e
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
synergy_scheduler_manager/fairshare_manager.py
View File

@ -73,7 +73,7 @@ class FairShareManager(Manager):
self.queue_manager = self.getManager("QueueManager")
self.quota_manager = self.getManager("QuotaManager")
self.keystone_manager = self.getManager("KeystoneManager")
self.condition = threading.Condition()
self.fs_condition = threading.Condition()
if self.decay_weight < 0:
self.decay_weight = float(0)
@ -108,14 +108,14 @@ class FairShareManager(Manager):
raise Exception("command=%r not supported!" % command)
def task(self):
with self.condition:
with self.fs_condition:
try:
self.calculateFairShare()
except Exception as ex:
LOG.error(ex)
raise ex
finally:
self.condition.notifyAll()
self.fs_condition.notifyAll()
def destroy(self):
pass
@ -128,12 +128,9 @@ class FairShareManager(Manager):
if not user:
raise Exception("user=%s not found!" % user_id)
with self.condition:
priority = user.getPriority()
fairshare_vcpus = priority.getFairShare("vcpus")
fairshare_memory = priority.getFairShare("memory")
self.condition.notifyAll()
priority = user.getPriority()
fairshare_vcpus = priority.getFairShare("vcpus")
fairshare_memory = priority.getFairShare("memory")
if not timestamp:
timestamp = datetime.utcnow()
@ -170,9 +167,9 @@ class FairShareManager(Manager):
def removeProject(self, prj_id):
if prj_id in self.projects:
with self.condition:
with self.fs_condition:
del self.projects[prj_id]
self.condition.notifyAll()
self.fs_condition.notifyAll()
def calculateFairShare(self):
if not self.projects: