Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit 7b2239d0 authored by MOMMESSIN Clement's avatar MOMMESSIN Clement
Browse files

Fix schedulers

parent 4bb7c5d5
......@@ -183,7 +183,7 @@ class Profiles(metaclass=ABCMeta):
class Parallel(Profile):
"""Implementation of the MsgParallel profile."""
type = "msg_par"
type = "parallel"
def __init__(self, nbres=0, cpu=[], com=[], **kwargs):
super().__init__(**kwargs)
......@@ -209,7 +209,7 @@ class Profiles(metaclass=ABCMeta):
class ParallelHomogeneous(Profile):
"""Implementation of the MsgParallelHomogeneous profile."""
type = "msg_par_hg"
type = "parallel_homogeneous"
def __init__(self, cpu=0, com=0, **kwargs):
super().__init__(**kwargs)
......@@ -234,7 +234,7 @@ class Profiles(metaclass=ABCMeta):
class ParallelHomogeneousTotal(ParallelHomogeneous):
"""Implementation of the MsgParallelHomogeneousTotal profile."""
type = "msg_par_hg_tot"
type = "parallel_homogeneous_total"
class Smpi(Profile):
......@@ -296,7 +296,7 @@ class Profiles(metaclass=ABCMeta):
class ParallelPFS(Profile):
"""Implementation of the MsgParallelHomogeneousPFSMultipleTiers profile."""
type = "msg_par_hg_pfs"
type = "parallel_homogeneous_pfs"
def __init__(self, size_read, size_write,
storage="pfs",
......
......@@ -434,7 +434,7 @@ class Scheduler(metaclass=ABCMeta):
If the _pre_init method is overridden the super method should be called with:
`super()._pre_init()`
"""
for r in self._batsim.resources.values():
for r in self._batsim.machines["compute"]:
self._resources.add(ComputeResource(self,
id=r["id"],
name=r["name"],
......
......@@ -149,7 +149,7 @@ class FcfsSchedSleep(BatsimScheduler):
if job.requested_resources > self.bs.nb_compute_resources:
self.bs.reject_jobs([job]) # This job requests more resources than the machine has
else:
self.open_jobs.add(job)
self.open_jobs.append(job)
self.scheduleJobs()
def onJobCompletion(self, job):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment