From owner-svn-src-all@freebsd.org Fri Jun 15 11:52:35 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75987101D8E8; Fri, 15 Jun 2018 11:52:35 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 289EE690AA; Fri, 15 Jun 2018 11:52:35 +0000 (UTC) (envelope-from rmacklem@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 097E5170A1; Fri, 15 Jun 2018 11:52:35 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5FBqYgt071124; Fri, 15 Jun 2018 11:52:34 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5FBqYnU071121; Fri, 15 Jun 2018 11:52:34 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201806151152.w5FBqYnU071121@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Fri, 15 Jun 2018 11:52:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335192 - head/usr.sbin/pnfsdskill X-SVN-Group: head X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: head/usr.sbin/pnfsdskill X-SVN-Commit-Revision: 335192 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2018 11:52:35 -0000 Author: rmacklem Date: Fri Jun 15 11:52:34 2018 New Revision: 335192 URL: https://svnweb.freebsd.org/changeset/base/335192 Log: Add a command that disables a pNFS server mirrored DS. This command can be used by a sysadmin to disable a malfunctioning pNFS server mirrored DS. It is safe to use when a mirrored DS has already been disabled via an I/O or network partitioning error. Added: head/usr.sbin/pnfsdskill/ head/usr.sbin/pnfsdskill/Makefile (contents, props changed) head/usr.sbin/pnfsdskill/pnfsdskill.8 (contents, props changed) head/usr.sbin/pnfsdskill/pnfsdskill.c (contents, props changed) Added: head/usr.sbin/pnfsdskill/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/pnfsdskill/Makefile Fri Jun 15 11:52:34 2018 (r335192) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +PROG= pnfsdskill +MAN= pnfsdskill.8 + +.include Added: head/usr.sbin/pnfsdskill/pnfsdskill.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/pnfsdskill/pnfsdskill.8 Fri Jun 15 11:52:34 2018 (r335192) @@ -0,0 +1,64 @@ +.\" Copyright (c) 2018 Rick Macklem +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 9, 2018 +.Dt PNFSDSKILL 8 +.Os +.Sh NAME +.Nm pnfsdskill +.Nd +disables a pNFS data storage server (DS) +.Sh SYNOPSIS +.Nm +.Ar mounted-on-DS-dir +.Sh DESCRIPTION +The +.Nm +command disables one DS when mirroring is enabled. +If one mirrored DS is malfunctioning, a system administrator +may use this command on the metadata server (MDS) to disable use of this mirror. +This command must be used on the MDS and the +.Ar mounted-on-DS-dir +must be the exact pathname used when mounting the DS on the MDS. +.Pp +If this command fails with +.Dq Device not configured +(ENXIO), it probably +means that the DS has already been disabled due to an error either detected +by the MDS or reported to the MDS by a client. +.Pp +The pNFS service should continue to run normally so long as the number of +operational DSs is at least as many as the level of mirroring. +.El +.Sh SEE ALSO +.Xr nfsv4 4 , +.Xr pnfs 4 , +.Xr nfsd 8 , +.Xr pnfsdscopymr 8 , +.Xr pnfsdsfile 8 +.Sh HISTORY +The +.Nm +command appeared in FreeBSD12. Added: head/usr.sbin/pnfsdskill/pnfsdskill.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/pnfsdskill/pnfsdskill.c Fri Jun 15 11:52:34 2018 (r335192) @@ -0,0 +1,76 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2017 Rick Macklem + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +static void usage(void); + +/* + * This program disables use of a DS mirror. The "dspath" command line + * argument must be an exact match for the mounted-on path of the DS. + * It should be done before any forced dismount is performed on the path + * and should work even when the mount point is hung. + */ +int +main(int argc, char *argv[]) +{ + struct nfsd_pnfsd_args pnfsdarg; + + if (argc != 2) + usage(); + if (geteuid() != 0) + errx(1, "Must be run as root/su"); + + pnfsdarg.op = PNFSDOP_DELDSSERVER; + pnfsdarg.dspath = argv[1]; + if (nfssvc(NFSSVC_PNFSDS, &pnfsdarg) < 0) + err(1, "Can't kill %s", argv[1]); +} + +static void +usage(void) +{ + + fprintf(stderr, "pnfsdsfile [filepath]\n"); + exit(1); +} +