From owner-svn-ports-head@freebsd.org Sat Sep 14 16:02:32 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E3C8DF894B; Sat, 14 Sep 2019 16:02:32 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Vy2J5lP1z48Nv; Sat, 14 Sep 2019 16:02:32 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8A0122258; Sat, 14 Sep 2019 16:02:32 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8EG2WEQ030347; Sat, 14 Sep 2019 16:02:32 GMT (envelope-from jwb@FreeBSD.org) Received: (from jwb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8EG2WuX030345; Sat, 14 Sep 2019 16:02:32 GMT (envelope-from jwb@FreeBSD.org) Message-Id: <201909141602.x8EG2WuX030345@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jwb set sender to jwb@FreeBSD.org using -f From: "Jason W. Bacon" Date: Sat, 14 Sep 2019 16:02:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512031 - in head/sysutils/slurm-wlm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jwb X-SVN-Commit-Paths: in head/sysutils/slurm-wlm: . files X-SVN-Commit-Revision: 512031 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2019 16:02:33 -0000 Author: jwb Date: Sat Sep 14 16:02:32 2019 New Revision: 512031 URL: https://svnweb.freebsd.org/changeset/ports/512031 Log: sysutils/slurm-wlm: Temporary patch to silence job accounting errors Disables linux-specific code when using jobacct_gather/linux for now. Long-term solution is to revamp job accounting code for FreeBSD. Added: head/sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c (contents, props changed) Modified: head/sysutils/slurm-wlm/Makefile Modified: head/sysutils/slurm-wlm/Makefile ============================================================================== --- head/sysutils/slurm-wlm/Makefile Sat Sep 14 15:54:20 2019 (r512030) +++ head/sysutils/slurm-wlm/Makefile Sat Sep 14 16:02:32 2019 (r512031) @@ -2,7 +2,7 @@ PORTNAME= slurm DISTVERSION= 19.05.1-2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm Added: head/sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/slurm-wlm/files/patch-src_plugins_jobacct__gather_common_common__jag.c Sat Sep 14 16:02:32 2019 (r512031) @@ -0,0 +1,26 @@ +--- src/plugins/jobacct_gather/common/common_jag.c.orig 2019-09-13 13:35:31 UTC ++++ src/plugins/jobacct_gather/common/common_jag.c +@@ -250,6 +250,12 @@ static int _get_sys_interface_freq_line(uint32_t cpu, + return 0; + } + ++ ++/* ++ * Check for lightweight processes (POSIX threads) ++ * Should be rewritten for FreeBSD so it doesn't depend on /proc ++ */ ++ + static int _is_a_lwp(uint32_t pid) + { + char *filename = NULL; +@@ -258,6 +264,10 @@ static int _is_a_lwp(uint32_t pid) + ssize_t n; + char *tgids = NULL; + pid_t tgid = -1; ++ ++ // Disable check for now, this will only skew process accounting ++ // slightly by including threads ++ return 0; + + xstrfmtcat(filename, "/proc/%u/status", pid); +