From 6f9e118cd7ca5a628cf24d11c335b81d63598f8a Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 26 Oct 2015 14:28:05 +0100 Subject: [PATCH 1/4] mxqd: fix typo in log --- mxqd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mxqd.c b/mxqd.c index 697eff5..167ed12 100644 --- a/mxqd.c +++ b/mxqd.c @@ -1143,7 +1143,7 @@ unsigned long start_job(struct mxq_group_list *group) group->group.user_name, group->group.user_uid, group->group.group_id, mxqjob.job_id); cpuset_init_job(&mxqjob.host_cpu_set,&server->cpu_set_available,&server->cpu_set_running,group->slots_per_job); - cpuset_log(" job assgined cpus: ",&mxqjob.host_cpu_set); + cpuset_log(" job assigned cpus: ",&mxqjob.host_cpu_set); mx_mysql_disconnect(server->mysql); From a092d65b2265c29cd4dd15fbff2fe8a9ad00ce57 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 22 Oct 2015 18:38:41 +0200 Subject: [PATCH 2/4] mxq_job: fix memory leak --- mxq_job.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mxq_job.c b/mxq_job.c index ebde474..d4bbe21 100644 --- a/mxq_job.c +++ b/mxq_job.c @@ -670,6 +670,7 @@ int mxq_load_job_from_group_for_server(struct mx_mysql *mysql, struct mxq_job *m } if(res == 1) { memcpy(mxqjob, &jobs[0], sizeof(*mxqjob)); + free(jobs); break; } From c8a578414f517f628d048454a7bea069c420f1e5 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Thu, 22 Oct 2015 13:34:26 +0200 Subject: [PATCH 3/4] web: show threads in group table and runtime in minutes for completed jobs --- web/pages/mxq/mxq.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/web/pages/mxq/mxq.in b/web/pages/mxq/mxq.in index db24812..e938bbe 100755 --- a/web/pages/mxq/mxq.in +++ b/web/pages/mxq/mxq.in @@ -312,7 +312,7 @@ sub job { $dbh or db_init(); - my $sth=$dbh->prepare('SELECT *,timestampdiff(MINUTE,date_start,now()) as t FROM mxq_job WHERE job_id=? LIMIT 1',undef); + my $sth=$dbh->prepare('SELECT *,timestampdiff(MINUTE,date_start,now()) as t,timestampdiff(MINUTE,date_start,date_end) as t2 FROM mxq_job WHERE job_id=? LIMIT 1',undef); $sth->execute($job_id); my %o=%{$sth->fetchrow_hashref('NAME_lc')}; @@ -326,8 +326,8 @@ sub job { my $job_stdout=escapeHTML($o{job_stdout}); my $job_stderr=escapeHTML($o{job_stderr}); - - my $ago = defined $o{t} ? "($o{t} minutes ago)" : ''; + my $ago = $job_status_text eq 'RUNNING' && defined $o{t} ? "($o{t} minutes ago)" : ''; + my $rt = defined $o{t2} ? "($o{t2} minutes runtime)" : ''; defined $_ or $_='<null>' for values %o; @@ -359,7 +359,7 @@ host_slots : $o{host_slots} date_submit : $o{date_submit} date_start : $o{date_start} $ago -date_end : $o{date_end} +date_end : $o{date_end} $rt job_id_new : $o{job_id_new} job_id_old : $o{job_id_old} @@ -397,17 +397,17 @@ sub group_table_rows { $out.=$q->Tr($q->th($head)); while (my $row=$sth->fetchrow_arrayref()) { - my ($group_id,$group_name,$user_name,$group_mtime,$group_status, + my ($group_id,$group_name,$job_threads,$user_name,$group_mtime,$group_status, $group_jobs,$group_jobs_inq,$group_jobs_running,$group_jobs_finished,$group_jobs_failed,$group_jobs_cancelled,$group_jobs_unknown )=@$row; $out.=$q->Tr( $q->td({class=>'number'},$q->a({href=>selfurl("/group/$group_id")},$group_id)), $q->td($group_name), + $q->td({class=>'number'},$job_threads), $q->td($user_name), $q->td($group_mtime), $q->td(group_status($group_status)), - $q->td({class=>'number'},$group_jobs), $q->td({class=>'number'},$group_jobs_inq), $q->td({class=>'number'},$group_jobs_running), @@ -429,11 +429,11 @@ sub group_table { my $out; my @cols=qw( - group_id group_name user_name group_mtime group_status + group_id group_name job_threads user_name group_mtime group_status group_jobs group_jobs_inq group_jobs_running group_jobs_finished group_jobs_failed group_jobs_cancelled group_jobs_unknown ); my @head=qw( - group_id group_name user_name group_mtime group_status + group_id group_name threads user_name group_mtime group_status jobs inq running finished failed cancelled unknown ); @@ -447,6 +447,7 @@ sub group_table { @cols=qw( group_id group_name + job_threads user_name group_date_end group_status @@ -460,6 +461,7 @@ sub group_table { @head=qw( group_id group_name + threads user_name date_end group_status From 0e1b70d0bcbb0402208bd4c26015d262427ad847 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Mon, 26 Oct 2015 15:55:26 +0100 Subject: [PATCH 4/4] make: add LOCALSTATEDIR --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Makefile b/Makefile index fa1f1ae..deeda39 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ LIBEXECDIR = ${EPREFIX}/libexec DATADIR = ${PREFIX}/share MANDIR = ${DATADIR}/man SYSCONFDIR = ${PREFIX}/etc +LOCALSTATEDIR = ${PREFIX}/var DESTDIR= @@ -43,6 +44,11 @@ ifneq (, $(filter /usr /usr/local, ${PREFIX})) SYSCONFDIR = /etc endif +### set localstatedir /var if prefix /usr || /usr/local +ifneq (, $(filter /usr /usr/local, ${PREFIX})) + LOCALSTATEDIR = /var +endif + ######################################################################## ### strip /mxq from SYSCONFDIR if set @@ -125,6 +131,7 @@ CFLAGS += -DLIBEXECDIR=\"${LIBEXECDIR}\" CFLAGS += -DDATADIR=\"${DATADIR}\" CFLAGS += -DMANDIR=\"${MANDIR}\" CFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\" +CFLAGS += -DLOCALSTATEDIR=\"${LOCALSTATEDIR}\" CFLAGS += $(EXTRA_CFLAGS) ########################################################################