Skip to content

Commit e6eed79

Browse files
authored
Add .command.log redirection in K8s container command (#6455) [ci fast]
Signed-off-by: jorgee <[email protected]>
1 parent 7c8fa3d commit e6eed79

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

plugins/nf-k8s/src/main/nextflow/k8s/K8sTaskHandler.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,11 @@ class K8sTaskHandler extends TaskHandler implements FusionAwareTask {
148148
}
149149

150150
protected List<String> classicSubmitCli(TaskRun task) {
151+
final workDir = Escape.path(task.workDir)
152+
151153
final result = new ArrayList(BashWrapperBuilder.BASH)
152-
result.add("${Escape.path(task.workDir)}/${TaskRun.CMD_RUN}".toString())
154+
result.add('-c')
155+
result.add("bash ${workDir}/${TaskRun.CMD_RUN} 2>&1 | tee ${workDir}/${TaskRun.CMD_LOG}")
153156
return result
154157
}
155158

plugins/nf-k8s/src/test/nextflow/k8s/K8sTaskHandlerTest.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class K8sTaskHandlerTest extends Specification {
9696
containers: [[
9797
name:'nf-123',
9898
image:'debian:latest',
99-
args:['/bin/bash', '-ue','/some/work/dir/.command.run']
99+
args:['/bin/bash', '-ue','-c','bash /some/work/dir/.command.run 2>&1 | tee /some/work/dir/.command.log']
100100
]]
101101
]
102102
]
@@ -123,7 +123,7 @@ class K8sTaskHandlerTest extends Specification {
123123
and:
124124
result.metadata.labels == [sessionId: 'xxx']
125125
result.metadata.annotations == [evict: 'false']
126-
result.spec.containers[0].command == ['/bin/bash', '-ue', '/some/work/dir/.command.run']
126+
result.spec.containers[0].command == ['/bin/bash', '-ue', '-c','bash /some/work/dir/.command.run 2>&1 | tee /some/work/dir/.command.log']
127127
result.spec.containers[0].resources == [ requests: [cpu:1] ]
128128
result.spec.containers[0].env == [ [name:'NXF_OWNER', value:'501:502'] ]
129129

@@ -148,7 +148,7 @@ class K8sTaskHandlerTest extends Specification {
148148
and:
149149
result.metadata.namespace == 'namespace-x'
150150
result.spec.containers[0].image == 'user/alpine:1.0'
151-
result.spec.containers[0].command == ['/bin/bash', '-ue', '/some/work/dir/.command.run']
151+
result.spec.containers[0].command == ['/bin/bash', '-ue', '-c','bash /some/work/dir/.command.run 2>&1 | tee /some/work/dir/.command.log']
152152
result.spec.containers[0].resources == [ requests: [cpu:4, memory:'16384Mi'], limits: [memory:'16384Mi'] ]
153153

154154
}
@@ -428,7 +428,7 @@ class K8sTaskHandlerTest extends Specification {
428428
containers: [[
429429
name: 'nf-123',
430430
image: 'debian:latest',
431-
command: ['/bin/bash', '-ue','/some/work/dir/.command.run']
431+
command: ['/bin/bash', '-ue','-c','bash /some/work/dir/.command.run 2>&1 | tee /some/work/dir/.command.log']
432432
]]
433433
]
434434
]

0 commit comments

Comments
 (0)