c15d36c674
== Motivation and Context The current implementation of 'sharenfs' and 'sharesmb' relies on the use of the sharetab file. The use of this file is os-specific and not required by linux or freebsd. Currently the code must maintain updates to this file which adds complexity and presents a significant performance impact when sharing many datasets. In addition, concurrently running 'zfs sharenfs' command results in missing entries in the sharetab file leading to unexpected failures. == Description This change removes the sharetab logic from the linux and freebsd implementation of 'sharenfs' and 'sharesmb'. It still preserves an os-specific library which contains the logic required for sharing NFS or SMB. The following entry points exist in the vastly simplified libshare library: - sa_enable_share -- shares a dataset but may not commit the change - sa_disable_share -- unshares a dataset but may not commit the change - sa_is_shared -- determine if a dataset is shared - sa_commit_share -- notify NFS/SMB subsystem to commit the shares - sa_validate_shareopts -- determine if sharing options are valid The sa_commit_share entry point is provided as a performance enhancement and is not required. The sa_enable_share/sa_disable_share may commit the share as part of the implementation. Libshare provides a framework for both NFS and SMB but some operating systems may not fully support these protocols or all features of the protocol. NFS Operation: For linux, libshare updates /etc/exports.d/zfs.exports to add and remove shares and then commits the changes by invoking 'exportfs -r'. This file, is automatically read by the kernel NFS implementation which makes for better integration with the NFS systemd service. For FreeBSD, libshare updates /etc/zfs/exports to add and remove shares and then commits the changes by sending a SIGHUP to mountd. SMB Operation: For linux, libshare adds and removes files in /var/lib/samba/usershares by calling the 'net' command directly. There is no need to commit the changes. FreeBSD does not support SMB. == Performance Results To test sharing performance we created a pool with an increasing number of datasets and invoked various zfs actions that would enable and disable sharing. The performance testing was limited to NFS sharing. The following tests were performed on an 8 vCPU system with 128GB and a pool comprised of 4 50GB SSDs: Scale testing: - Share all filesystems in parallel -- zfs sharenfs=on <dataset> & - Unshare all filesystems in parallel -- zfs sharenfs=off <dataset> & Functional testing: - share each filesystem serially -- zfs share -a - unshare each filesystem serially -- zfs unshare -a - reset sharenfs property and unshare -- zfs inherit -r sharenfs <pool> For 'zfs sharenfs=on' scale testing we saw an average reduction in time of 89.43% and for 'zfs sharenfs=off' we saw an average reduction in time of 83.36%. Functional testing also shows a huge improvement: - zfs share -- 97.97% reduction in time - zfs unshare -- 96.47% reduction in time - zfs inhert -r sharenfs -- 99.01% reduction in time Reviewed-by: Matt Ahrens <matt@delphix.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Ryan Moeller <ryan@ixsystems.com> Reviewed-by: Bryant G. Ly <bryangly@gmail.com> Signed-off-by: George Wilson <gwilson@delphix.com> External-Issue: DLPX-68690 Closes #1603 Closes #7692 Closes #7943 Closes #10300
129 lines
3.1 KiB
C
129 lines
3.1 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License (the "License").
|
|
* You may not use this file except in compliance with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
|
|
/*
|
|
* Copyright (c) 2020 by Delphix. All rights reserved.
|
|
*/
|
|
|
|
#include <time.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <strings.h>
|
|
#include <fcntl.h>
|
|
#include <sys/wait.h>
|
|
#include <unistd.h>
|
|
#include <dirent.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <libzfs.h>
|
|
#include <libshare.h>
|
|
#include "libshare_impl.h"
|
|
#include "smb.h"
|
|
|
|
static sa_fstype_t *smb_fstype;
|
|
|
|
/*
|
|
* Enables SMB sharing for the specified share.
|
|
*/
|
|
static int
|
|
smb_enable_share(sa_share_impl_t impl_share)
|
|
{
|
|
fprintf(stderr, "No SMB support in FreeBSD yet.\n");
|
|
return (SA_NOT_SUPPORTED);
|
|
}
|
|
/*
|
|
* Disables SMB sharing for the specified share.
|
|
*/
|
|
static int
|
|
smb_disable_share(sa_share_impl_t impl_share)
|
|
{
|
|
fprintf(stderr, "No SMB support in FreeBSD yet.\n");
|
|
return (SA_NOT_SUPPORTED);
|
|
}
|
|
|
|
/*
|
|
* Checks whether the specified SMB share options are syntactically correct.
|
|
*/
|
|
static int
|
|
smb_validate_shareopts(const char *shareopts)
|
|
{
|
|
fprintf(stderr, "No SMB support in FreeBSD yet.\n");
|
|
return (SA_NOT_SUPPORTED);
|
|
}
|
|
|
|
/*
|
|
* Checks whether a share is currently active.
|
|
*/
|
|
static boolean_t
|
|
smb_is_share_active(sa_share_impl_t impl_share)
|
|
{
|
|
return (B_FALSE);
|
|
}
|
|
|
|
/*
|
|
* Called to update a share's options. A share's options might be out of
|
|
* date if the share was loaded from disk and the "sharesmb" dataset
|
|
* property has changed in the meantime. This function also takes care
|
|
* of re-enabling the share if necessary.
|
|
*/
|
|
static int
|
|
smb_update_shareopts(sa_share_impl_t impl_share, const char *shareopts)
|
|
{
|
|
return (SA_OK);
|
|
}
|
|
|
|
static int
|
|
smb_update_shares(void)
|
|
{
|
|
/* Not implemented */
|
|
return (0);
|
|
}
|
|
/*
|
|
* Clears a share's SMB options. Used by libshare to
|
|
* clean up shares that are about to be free()'d.
|
|
*/
|
|
static void
|
|
smb_clear_shareopts(sa_share_impl_t impl_share)
|
|
{
|
|
FSINFO(impl_share, smb_fstype)->shareopts = NULL;
|
|
}
|
|
|
|
static const sa_share_ops_t smb_shareops = {
|
|
.enable_share = smb_enable_share,
|
|
.disable_share = smb_disable_share,
|
|
.is_shared = smb_is_share_active,
|
|
|
|
.validate_shareopts = smb_validate_shareopts,
|
|
.update_shareopts = smb_update_shareopts,
|
|
.clear_shareopts = smb_clear_shareopts,
|
|
.commit_shares = smb_update_shares,
|
|
};
|
|
|
|
/*
|
|
* Initializes the SMB functionality of libshare.
|
|
*/
|
|
void
|
|
libshare_smb_init(void)
|
|
{
|
|
smb_fstype = register_fstype("smb", &smb_shareops);
|
|
}
|