web: Add job_tmpdir_size

mariux64 · Jan 29, 2020 · 8a53add · 8a53add
1 parent 91fdfb6
commit 8a53add
Showing 1 changed file with 11 additions and 5 deletions.
diff --git 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__"
 <pre>
 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.<br>threads
 		req.<br>memory
 		req.<br>runtime
+		req.<br>tmpdir
 		user<br>name
 		group<br>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),