-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(mount): do not truncate shares not zfs mount
When running zfs share -a resetting the exports.d/zfs.exports makes sense the get a clean state. Truncating was also called with zfs mount which would not populate the file again. Add test to verify shares persist after mount -a. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Stefan Lendl <s.lendl@proxmox.com> Closes #15607 Closes #15660
- Loading branch information
Showing
4 changed files
with
67 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
tests/zfs-tests/tests/functional/cli_root/zfs_share/zfs_share_after_mount.ksh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
#!/bin/ksh -p | ||
# | ||
# 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 https://opensource.org/licenses/CDDL-1.0. | ||
# 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) 2023 by Proxmox. All rights reserved. | ||
# | ||
|
||
. $STF_SUITE/include/libtest.shlib | ||
|
||
# DESCRIPTION: | ||
# Verify that nfs shares persist after zfs mount -a | ||
# | ||
# STRATEGY: | ||
# 1. Verify that the filesystem is not shared. | ||
# 2. Enable the 'sharenfs' property | ||
# 3. Verify filesystem is shared | ||
# 4. Invoke 'zfs mount -a' | ||
# 5. Verify filesystem is still shared | ||
|
||
verify_runnable "global" | ||
|
||
function cleanup | ||
{ | ||
log_must zfs set sharenfs=off $TESTPOOL/$TESTFS | ||
is_shared $TESTPOOL/$TESTFS && \ | ||
log_must unshare_fs $TESTPOOL/$TESTFS | ||
log_must zfs share -a | ||
} | ||
|
||
|
||
log_onexit cleanup | ||
|
||
cleanup | ||
|
||
log_must zfs set sharenfs="on" $TESTPOOL/$TESTFS | ||
log_must is_shared $TESTPOOL/$TESTFS | ||
log_must is_exported $TESTPOOL/$TESTFS | ||
|
||
log_must zfs mount -a | ||
log_must is_shared $TESTPOOL/$TESTFS | ||
log_must is_exported $TESTPOOL/$TESTFS | ||
|
||
log_pass "Verify that nfs shares persist after zfs mount -a" |