From 8a53add3dd0bf0ef078276e42565e7dbe419e015 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Sun, 26 Jan 2020 15:21:37 +0100 Subject: [PATCH] web: Add job_tmpdir_size --- web/pages/mxq/mxq.in | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/web/pages/mxq/mxq.in b/web/pages/mxq/mxq.in index e5ca8bc5..71a166a9 100755 --- a/web/pages/mxq/mxq.in +++ b/web/pages/mxq/mxq.in @@ -380,6 +380,8 @@ sub group_details_raw { my $job_command=escapeHTML($o->{'job_command'}); my $group_status_text=group_status($o->{'group_status'}); + my $job_tmpdir_size = $o->{'job_tmpdir_size'} ? "$o->{'job_tmpdir_size'} GiB" : '-'; + return <<"__EOF__"
 group_name     : $group_name
@@ -392,10 +394,11 @@ user_name      : $o->{user_name}
 user_gid       : $o->{user_gid}
 user_group     : $o->{user_group}
 
-job_command    : $job_command
-job_threads    : $o->{job_threads}
-job_memory     : $o->{job_memory} MiB
-job_time       : $o->{job_time} minutes
+job_command     : $job_command
+job_threads     : $o->{job_threads}
+job_memory      : $o->{job_memory} MiB
+job_time        : $o->{job_time} minutes
+job_tmpdir_size : $job_tmpdir_size
 
 job_max_per_node      : $o->{job_max_per_node}
 
@@ -596,6 +599,7 @@ sub group_table {
 		group_id group_name job_threads
 		job_memory
 		job_time
+		job_tmpdir_size
 		user_name
 		group_status
 		group_jobs
@@ -609,6 +613,7 @@ sub group_table {
 		req.
threads req.
memory req.
runtime + req.
tmpdir user
name group
status jobs @@ -627,7 +632,7 @@ sub group_table { $out.=$q->Tr($q->th(\@head)); while (my $row=$sth->fetchrow_arrayref()) { my ($group_id,$group_name,$job_threads, - $job_memory,$job_time, + $job_memory,$job_time,$job_tmpdir_size, $user_name,$group_status, $group_jobs,$group_jobs_inq,$group_jobs_running,$group_jobs_finished,$group_jobs_failed,$group_jobs_cancelled,$group_jobs_unknown )=@$row; @@ -638,6 +643,7 @@ sub group_table { $q->td({class=>'number'},$job_threads), $q->td({class=>'number'},size($job_memory*1000**2)), $q->td({class=>'number'},days($job_time*60)), + $q->td({class=>'number'},size($job_tmpdir_size*1000*1000*1000)), $q->td($q->a({href=>my_url('groups',{user_name=>$user_name})},$user_name)), $q->td(group_status($group_status)), $q->td({class=>'number'},$group_jobs),