From patchwork Tue Oct 6 00:06:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Simmons X-Patchwork-Id: 11817945 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD1EF112E for ; Tue, 6 Oct 2020 00:07:45 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F245206F4 for ; Tue, 6 Oct 2020 00:07:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F245206F4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lustre-devel-bounces@lists.lustre.org Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id C10072F5ADF; Mon, 5 Oct 2020 17:07:12 -0700 (PDT) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from smtp4.ccs.ornl.gov (smtp4.ccs.ornl.gov [160.91.203.40]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 367542F58A4 for ; Mon, 5 Oct 2020 17:06:40 -0700 (PDT) Received: from star.ccs.ornl.gov (star.ccs.ornl.gov [160.91.202.134]) by smtp4.ccs.ornl.gov (Postfix) with ESMTP id 75C6710087FE; Mon, 5 Oct 2020 20:06:25 -0400 (EDT) Received: by star.ccs.ornl.gov (Postfix, from userid 2004) id 733682F0E5; Mon, 5 Oct 2020 20:06:25 -0400 (EDT) From: James Simmons To: Andreas Dilger , Oleg Drokin , NeilBrown Date: Mon, 5 Oct 2020 20:06:21 -0400 Message-Id: <1601942781-24950-43-git-send-email-jsimmons@infradead.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1601942781-24950-1-git-send-email-jsimmons@infradead.org> References: <1601942781-24950-1-git-send-email-jsimmons@infradead.org> Subject: [lustre-devel] [PATCH 42/42] lustre: obdclass: fixes and improvements for jobid. X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List MIME-Version: 1.0 Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" From: NeilBrown 1/ When lustre_get_jobid() uses jobid_current(), it should copy into tmp_jobid, not into jobid. 2/ A '%j' in jobname should use jobid_current() 3/ If there is a %j in jobid_name, then it should be used even if jobid_var is 'session'. Fixes: 2646ff0b3509 ("lustre: obdclass: allow per-session jobids.") Reviewed-by: James Simmons Signed-off-by: NeilBrown --- fs/lustre/obdclass/jobid.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/lustre/obdclass/jobid.c b/fs/lustre/obdclass/jobid.c index 98b3f39..3ee9d40 100644 --- a/fs/lustre/obdclass/jobid.c +++ b/fs/lustre/obdclass/jobid.c @@ -206,7 +206,7 @@ static void jobid_prune_expedite(void) * %e = executable * %g = gid * %h = hostname - * %j = jobid from environment + * %j = per-session * %p = pid * %u = uid * @@ -247,10 +247,9 @@ static int jobid_interpret_string(const char *jobfmt, char *jobid, l = snprintf(jobid, joblen, "%s", init_utsname()->nodename); break; - case 'j': /* jobid requested by process - * - currently not supported - */ - l = snprintf(jobid, joblen, "%s", "jobid"); + case 'j': /* jobid requested by process */ + l = snprintf(jobid, joblen, "%s", + jobid_current() ?: "jobid"); break; case 'p': /* process ID */ l = snprintf(jobid, joblen, "%u", current->pid); @@ -306,7 +305,8 @@ int lustre_get_jobid(char *jobid, size_t joblen) goto out_cache_jobid; /* Whole node dedicated to single job */ - if (strcmp(obd_jobid_var, JOBSTATS_NODELOCAL) == 0) { + if (strcmp(obd_jobid_var, JOBSTATS_NODELOCAL) == 0 || + strnstr(obd_jobid_name, "%j", LUSTRE_JOBID_SIZE)) { int rc2 = jobid_interpret_string(obd_jobid_name, tmp_jobid, joblen); if (!rc2) @@ -327,7 +327,7 @@ int lustre_get_jobid(char *jobid, size_t joblen) rcu_read_lock(); jid = jobid_current(); if (jid) - strlcpy(jobid, jid, sizeof(jobid)); + strlcpy(tmp_jobid, jid, sizeof(tmp_jobid)); rcu_read_unlock(); goto out_cache_jobid; }