diff --git a/workflow/conf/aws.config b/workflow/conf/aws.config index 17ed841dad17692114480378063229f9e2b79165..cdd91da7bb7ede67aa9a004ab4d617186edee334 100644 --- a/workflow/conf/aws.config +++ b/workflow/conf/aws.config @@ -112,6 +112,10 @@ process { cpus = 1 memory = '1 GB' } + withName:failPreExecutionRun { + cpus = 1 + memory = '1 GB' + } withName:failExecutionRun { cpus = 1 memory = '1 GB' diff --git a/workflow/conf/biohpc.config b/workflow/conf/biohpc.config index 817a2ab3c416a3a3810c6ef70c6feaca2b413524..82ee0f31d08516e54d75c038dafc69aeb91e0a3a 100755 --- a/workflow/conf/biohpc.config +++ b/workflow/conf/biohpc.config @@ -20,7 +20,7 @@ process { executor = 'local' } withName:trimData { - queue = '128GB,256GB,256GBv1,384GB' + queue = 'super' } withName:getRefInfer { queue = 'super' @@ -79,6 +79,12 @@ process { withName:finalizeExecutionRun { executor = 'local' } + withName:failPreExecutionRun { + executor = 'local' + } + withName:failPreExecutionRun { + executor = 'local' + } withName:failExecutionRun { executor = 'local' } diff --git a/workflow/nextflow.config b/workflow/nextflow.config index a22693451369437a2bef5b87105c0f07285592da..a62f9f584907cd170d9c2bea73864ba02a66f28e 100644 --- a/workflow/nextflow.config +++ b/workflow/nextflow.config @@ -88,6 +88,9 @@ process { withName:finalizeExecutionRun { container = 'gudmaprbk/deriva1.3:1.0.0' } + withName:failPreExecutionRun { + container = 'gudmaprbk/deriva1.3:1.0.0' + } withName:failExecutionRun { container = 'gudmaprbk/deriva1.3:1.0.0' } diff --git a/workflow/rna-seq.nf b/workflow/rna-seq.nf index 082aa09e83e32d269a5f0ab25b29cc2694d0f68c..b223f2e27ec3d0595241a45ff2ccf0719b0a644a 100644 --- a/workflow/rna-seq.nf +++ b/workflow/rna-seq.nf @@ -374,7 +374,7 @@ process parseMetadata { # check read counts match for fastqs fastqReadError=false fastqReadError_details="" - if [ "\${endsMeta}" == "pe" ] + if [ "\${endsManual}" == "pe" ] then r1Count=\$(zcat ${fastq[0]} | wc -l) r2Count=\$(zcat ${fastq[1]} | wc -l) @@ -2082,13 +2082,6 @@ process failPreExecutionRun { hostname > ${repRID}.failPreExecutionRun.log ulimit -a >> ${repRID}.failPreExecutionRun.log - executionRun=\$(curl -s https://${source}/ermrest/catalog/2/entity/RNASeq:Execution_Run/RID=${executionRunRID}) - workflow=\$(echo \${executionRun} | grep -o '\\"Workflow\\":.*\\"Reference' | grep -oP '(?<=\\"Workflow\\":\\").*(?=\\",\\"Reference)') - genome=\$(echo \${executionRun} | grep -o '\\"Reference_Genome\\":.*\\"Input_Bag' | grep -oP '(?<=\\"Reference_Genome\\":\\").*(?=\\",\\"Input_Bag)') - - cookie=\$(cat credential.json | grep -A 1 '\\"${source}\\": {' | grep -o '\\"cookie\\": \\".*\\"') - cookie=\${cookie:11:-1} - errorDetails="" if [ ${fastqCountError} == true ] then