Skip to content

bot attempt to figure the bug, based on reproducible example #6882

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

Open
vagkaratzas wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −3
Open

bot attempt to figure the bug, based on reproducible example #6882

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ class TaskProcessor {
@CompileStatic
final protected void checkCachedOrLaunchTask( TaskRun task, HashCode hash, boolean shouldTryCache ) {

int tries = task.failCount +1
int tries = 1
while( true ) {
hash = HashBuilder.defaultHasher().putBytes(hash.asBytes()).putInt(tries).hash()

Expand Down Expand Up @@ -1050,8 +1050,13 @@ class TaskProcessor {
final taskCopy = task.makeCopy()
session.getExecService().submit {
try {
// Compute the base hash with attempt=1 so the hash chain is consistent
// with what checkCachedOrLaunchTask produces on -resume (which always
// starts from a fresh task with attempt=1).
taskCopy.config.attempt = 1
final retryHash = new TaskHasher(taskCopy).compute()
taskCopy.runType = RunType.RETRY
checkCachedOrLaunchTask( taskCopy, taskCopy.hash, false )
checkCachedOrLaunchTask( taskCopy, retryHash, false )
}
catch( Throwable e ) {
log.error("Unable to re-submit task `${taskCopy.name}`", e)
Expand Down Expand Up @@ -1170,11 +1175,17 @@ class TaskProcessor {
final taskCopy = task.makeCopy()
session.getExecService().submit({
try {
// Compute the base hash with attempt=1 so the hash chain is consistent
// with what checkCachedOrLaunchTask produces on -resume (which always
// starts from a fresh task with attempt=1). This must happen before
// taskCopy.config.attempt is bumped to the retry attempt number.
taskCopy.config.attempt = 1
final retryHash = new TaskHasher(taskCopy).compute()
taskCopy.config.attempt = taskErrCount+1
taskCopy.config.submitAttempt = submitRetries+1
taskCopy.runType = RunType.RETRY
taskCopy.resolve(taskBody)
checkCachedOrLaunchTask( taskCopy, taskCopy.hash, false )
checkCachedOrLaunchTask( taskCopy, retryHash, false )
}
catch( Throwable e ) {
log.error("Unable to re-submit task `${safeTaskName(taskCopy)}`", e)
Expand Down
Loading