Skip to content
Snippets Groups Projects
Commit e80938ac authored by Auke Klazema's avatar Auke Klazema
Browse files

SW-720: Change args to kwargs for rpc and remove incorrect busname (merge from trunk)

parent a898224a
No related branches found
No related tags found
1 merge request!4Lofar release 4 0 minor fixes
......@@ -233,7 +233,7 @@ class ResourceAssigner(object):
otdb_id = specification_tree['otdb_id']
estimates = self.rerpc.execute("get_estimated_resources", {"specification_tree": specification_tree})
estimates = self.rerpc.execute("get_estimated_resources", specification_tree=specification_tree)
logger.info('Resource Estimator reply = %s', estimates)
if estimates['errors']:
......
......@@ -462,6 +462,7 @@ class StationScheduler(BasicScheduler):
# Schedule all resources
super(StationScheduler, self)._schedule_task(available_resources)
class PriorityScheduler(StationScheduler):
""" A Scheduler that searches for an allocation with a fixed start time, but flexible resources.
Conflict resolution is done by killing jobs with lower priority. """
......@@ -482,7 +483,7 @@ class PriorityScheduler(StationScheduler):
super(PriorityScheduler, self).__init__(task_id, specification_tree, resource_estimator, resource_availability_checker, radbcreds)
self.momqueryservice = MoMQueryRPC(busname=busname, broker=broker, timeout=180)
self.momqueryservice = MoMQueryRPC.create(broker=broker, timeout=180)
# Time needed in between tasks to setup the stations
self.STATION_SETUP_TIME_MINUTES = 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment