Skip to content

[bugfix] Use the default Slurm partition with --flex-alloc-tasks if none is specified #676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 19, 2019
Merged

[bugfix] Use the default Slurm partition with --flex-alloc-tasks if none is specified #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a2294d
Use the 'default' partition with 'flex-alloc-tasks'
Feb 11, 2019
f0214ac
Fix bug in unittests
Feb 11, 2019
6572025
Merge branch 'master' into bugfix/flex_alloc_default_partition
Feb 13, 2019
6bcb02b
Address PR comments
Feb 13, 2019
df26b2c
Merge branch 'master' into bugfix/flex_alloc_default_partition
vkarak Feb 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions reframe/core/schedulers/slurm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@ def _get_all_nodes(self):
node_descriptions = completed.stdout.splitlines()
return {SlurmNode(descr) for descr in node_descriptions}

def _get_default_partition(self):
completed = _run_strict('scontrol -a show -o partitions')
partition_match = re.search(r'PartitionName=(?P<partition>\S+)\s+'
r'.*Default=YES.*', completed.stdout)
if partition_match:
return partition_match.group('partition')

return None

def get_partition_nodes(self):
nodes = self._get_all_nodes()
return self.filter_nodes(nodes, self.sched_access)
Expand All @@ -187,10 +196,14 @@ def filter_nodes(self, nodes, options):

if partitions:
partitions = set(partitions.strip().split(','))
nodes = {n for n in nodes if n.partitions >= partitions}
getlogger().debug(
'flex_alloc_tasks: filtering nodes by partition(s) %s: '
'available nodes now: %s' % (partitions, len(nodes)))
else:
default_partition = self._get_default_partition()
partitions = {default_partition} if default_partition else set()

nodes = {n for n in nodes if n.partitions >= partitions}
getlogger().debug(
'flex_alloc_tasks: filtering nodes by partition(s) %s: '
'available nodes now: %s' % (partitions, len(nodes)))

if constraints:
constraints = set(constraints.strip().split(','))
Expand Down
14 changes: 10 additions & 4 deletions unittests/test_schedulers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,9 @@ def test_guess_num_tasks(self):
# monkey patch `get_partition_nodes()` to simulate extraction of
# slurm nodes through the use of `scontrol show`
self.testjob.get_partition_nodes = lambda: set()
# monkey patch `_get_default_partition()` to simulate extraction
# of the default partition through the use of `scontrol show`
self.testjob._get_default_partition = lambda: 'pdef'
self.assertEqual(self.testjob.guess_num_tasks(), 0)


Expand Down Expand Up @@ -502,7 +505,7 @@ def create_dummy_nodes(obj):
'RealMemory=32220 AllocMem=0 FreeMem=10000 '
'Sockets=1 Boards=1 State=MAINT+DRAIN '
'ThreadsPerCore=2 TmpDisk=0 Weight=1 Owner=N/A '
'MCS_label=N/A Partitions=p1,p2 '
'MCS_label=N/A Partitions=p1,p2,pdef '
'BootTime=01 Jan 2018 '
'SlurmdStartTime=01 Jan 2018 '
'CfgTRES=cpu=24,mem=32220M '
Expand All @@ -520,7 +523,7 @@ def create_dummy_nodes(obj):
'RealMemory=32220 AllocMem=0 FreeMem=10000 '
'Sockets=1 Boards=1 State=MAINT+DRAIN '
'ThreadsPerCore=2 TmpDisk=0 Weight=1 Owner=N/A '
'MCS_label=N/A Partitions=p2,p3'
'MCS_label=N/A Partitions=p2,p3,pdef '
'BootTime=01 Jan 2018 '
'SlurmdStartTime=01 Jan 2018 '
'CfgTRES=cpu=24,mem=32220M '
Expand All @@ -538,7 +541,7 @@ def create_dummy_nodes(obj):
'RealMemory=32220 AllocMem=0 FreeMem=10000 '
'Sockets=1 Boards=1 State=IDLE '
'ThreadsPerCore=2 TmpDisk=0 Weight=1 Owner=N/A '
'MCS_label=N/A Partitions=p1,p3 '
'MCS_label=N/A Partitions=p1,p3,pdef '
'BootTime=01 Jan 2018 '
'SlurmdStartTime=01 Jan 2018 '
'CfgTRES=cpu=24,mem=32220M '
Expand All @@ -556,7 +559,7 @@ def create_dummy_nodes(obj):
'RealMemory=32220 AllocMem=0 FreeMem=10000 '
'Sockets=1 Boards=1 State=IDLE '
'ThreadsPerCore=2 TmpDisk=0 Weight=1 Owner=N/A '
'MCS_label=N/A Partitions=p1,p3 '
'MCS_label=N/A Partitions=p1,p3,pdef '
'BootTime=01 Jan 2018 '
'SlurmdStartTime=01 Jan 2018 '
'CfgTRES=cpu=24,mem=32220M '
Expand Down Expand Up @@ -589,6 +592,9 @@ def setUp(self):
# monkey patch `_get_all_nodes` to simulate extraction of
# slurm nodes through the use of `scontrol show`
self.testjob._get_all_nodes = self.create_dummy_nodes
# monkey patch `_get_default_partition` to simulate extraction
# of the default partition
self.testjob._get_default_partition = lambda: 'pdef'
self.testjob._sched_flex_alloc_tasks = 'all'
self.testjob._num_tasks_per_node = 4
self.testjob._num_tasks = 0
Expand Down