From a91de85289686473a6a44fe26a0677fcd1129466 Mon Sep 17 00:00:00 2001 From: munishchouhan Date: Fri, 21 Nov 2025 17:09:08 +0100 Subject: [PATCH] Added number of reclamations in TraceRecord Signed-off-by: munishchouhan --- .../src/main/groovy/nextflow/trace/TraceRecord.groovy | 3 ++- .../test/groovy/nextflow/trace/TraceRecordTest.groovy | 3 +++ .../test/io/seqera/tower/plugin/TowerClientTest.groovy | 9 +++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/nextflow/src/main/groovy/nextflow/trace/TraceRecord.groovy b/modules/nextflow/src/main/groovy/nextflow/trace/TraceRecord.groovy index 06e37b541c..1455b1f9b0 100644 --- a/modules/nextflow/src/main/groovy/nextflow/trace/TraceRecord.groovy +++ b/modules/nextflow/src/main/groovy/nextflow/trace/TraceRecord.groovy @@ -103,7 +103,8 @@ class TraceRecord implements Serializable { vol_ctxt: 'num', // -- /proc/$pid/status field 'voluntary_ctxt_switches' inv_ctxt: 'num', // -- /proc/$pid/status field 'nonvoluntary_ctxt_switches' hostname: 'str', - cpu_model: 'str' + cpu_model: 'str', + num_reclamations: 'num' ] static public Map> FORMATTER = [ diff --git a/modules/nextflow/src/test/groovy/nextflow/trace/TraceRecordTest.groovy b/modules/nextflow/src/test/groovy/nextflow/trace/TraceRecordTest.groovy index 528d93afd2..d1807ad4c9 100644 --- a/modules/nextflow/src/test/groovy/nextflow/trace/TraceRecordTest.groovy +++ b/modules/nextflow/src/test/groovy/nextflow/trace/TraceRecordTest.groovy @@ -172,6 +172,7 @@ class TraceRecordTest extends Specification { rss=146536 peak_vmem=323252 peak_rss=197136 + num_reclamations=3 '''.stripIndent().leftTrim() when: @@ -192,12 +193,14 @@ class TraceRecordTest extends Specification { trace.rss == 146536 * KB trace.peak_vmem == 323252 * KB trace.peak_rss == 197136 * KB + trace.num_reclamations == 3 trace.getFmtStr('%mem') == '0.9%' trace.getFmtStr('vmem') == '315.5 MB' trace.getFmtStr('rss') == '143.1 MB' trace.getFmtStr('peak_vmem') == '315.7 MB' trace.getFmtStr('peak_rss') == '192.5 MB' + trace.getFmtStr('num_reclamations') == '3' } def 'should parse a legacy trace file and return a TraceRecord object'() { diff --git a/plugins/nf-tower/src/test/io/seqera/tower/plugin/TowerClientTest.groovy b/plugins/nf-tower/src/test/io/seqera/tower/plugin/TowerClientTest.groovy index 8b69f963dc..5647f300fc 100644 --- a/plugins/nf-tower/src/test/io/seqera/tower/plugin/TowerClientTest.groovy +++ b/plugins/nf-tower/src/test/io/seqera/tower/plugin/TowerClientTest.groovy @@ -110,10 +110,11 @@ class TowerClientTest extends Specification { expect: tower.underscoreToCamelCase(STR) == EXPECTED where: - STR | EXPECTED - 'abc' | 'abc' - 'a_b_c' | 'aBC' - 'foo__bar' | 'fooBar' + STR | EXPECTED + 'abc' | 'abc' + 'a_b_c' | 'aBC' + 'foo__bar' | 'fooBar' + 'num_reclamations' | 'numReclamations' }