Skip to content

feat: Add per-task Fusion control via disk directive #6508

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

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

feat: Add per-task Fusion control via disk directive #6508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd044ff
feat: Add fusion field to DiskResource
edmundmiller Oct 23, 2025
24bd0a0
feat: Implement task-level Fusion override via disk directive
edmundmiller Oct 23, 2025
cd122f4
test: Add tests for disk fusion feature
edmundmiller Oct 23, 2025
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
24 changes: 14 additions & 10 deletions modules/nextflow/src/main/groovy/nextflow/executor/res/DiskResource.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import nextflow.util.MemoryUnit

/**
* Models disk resource request
*
*
* @author Ben Sherman <[email protected]>
*/
@ToString(includeNames = true, includePackage = false)
Expand All @@ -33,30 +33,34 @@ class DiskResource {

final MemoryUnit request
final String type
final Boolean fusion

DiskResource( value ) {
DiskResource(value) {
this(request: value)
}

DiskResource( Map opts ) {
this.request = toMemoryUnit(opts.request)
DiskResource(Map opts) {
this.request = opts.request != null ? toMemoryUnit(opts.request) : null

if( opts.type )
if (opts.type)
this.type = opts.type as String

if (opts.fusion != null)
this.fusion = opts.fusion as Boolean
}

DiskResource withRequest(MemoryUnit value) {
return new DiskResource(request: value, type: this.type)
return new DiskResource(request: value, type: this.type, fusion: this.fusion)
}

private static MemoryUnit toMemoryUnit( value ) {
if( value instanceof MemoryUnit )
return (MemoryUnit)value
private static MemoryUnit toMemoryUnit(value) {
if (value instanceof MemoryUnit)
return (MemoryUnit) value

try {
return new MemoryUnit(value.toString().trim())
}
catch( Exception e ) {
catch (Exception e) {
throw new IllegalArgumentException("Not a valid disk value: $value")
}
}
Expand Down
9 changes: 8 additions & 1 deletion modules/nextflow/src/main/groovy/nextflow/fusion/FusionAwareTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@ trait FusionAwareTask {

boolean fusionEnabled() {
if( fusionEnabled==null ) {
fusionEnabled = getExecutor0().isFusionEnabled()
// Check task-level disk.fusion setting first
def diskFusion = getTask().config?.getDiskResource()?.fusion
if( diskFusion != null ) {
fusionEnabled = diskFusion
} else {
// Fall back to executor-level setting
fusionEnabled = getExecutor0().isFusionEnabled()
}
}
return fusionEnabled
}
Expand Down
14 changes: 10 additions & 4 deletions modules/nextflow/src/test/groovy/nextflow/executor/res/DiskResourceTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,23 @@ class DiskResourceTest extends Specification {
then:
disk.request == REQ
disk.type == TYPE
disk.fusion == FUSION

where:
VALUE | REQ | TYPE
_100_GB | _100_GB | null
[request: _100_GB] | _100_GB | null
[request: _375_GB, type: 'local-ssd'] | _375_GB | 'local-ssd'
VALUE | REQ | TYPE | FUSION
_100_GB | _100_GB | null | null
[request: _100_GB] | _100_GB | null | null
[request: _375_GB, type: 'local-ssd'] | _375_GB | 'local-ssd' | null
[request: _100_GB, fusion: true] | _100_GB | null | true
[request: _100_GB, fusion: false] | _100_GB | null | false
[request: _375_GB, type: 'local-ssd', fusion: false] | _375_GB | 'local-ssd' | false
}

def 'should return a disk resource with the specified request' () {
expect:
new DiskResource(request: _100_GB).withRequest(_375_GB) == new DiskResource(request: _375_GB)
new DiskResource(request: _100_GB, type: 'ssd').withRequest(_375_GB) == new DiskResource(request: _375_GB, type: 'ssd')
new DiskResource(request: _100_GB, fusion: true).withRequest(_375_GB) == new DiskResource(request: _375_GB, fusion: true)
new DiskResource(request: _100_GB, type: 'ssd', fusion: false).withRequest(_375_GB) == new DiskResource(request: _375_GB, type: 'ssd', fusion: false)
}
}