c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-03-14 06:16:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix history logging for zpool create -t

Browse Source 
`zpool create` is supposed to log the command to the new pool’s history,
as a special record that never gets evicted from the ring buffer. but
when you create a pool with `zpool create -t`, no such record is ever
logged (#18102). that bug may be the cause of issues like #16408.

`zpool create -t` (83e9986f6e) and `zpool
import -t` (26b42f3f9d) are both designed
to override the on-disk zpool property `name` with an in-core
“temporary” name, but they work somewhat differently under the hood.

importing with a temporary name sets `spa->spa_import_flags |=
ZFS_IMPORT_TEMP_NAME` in ZFS_IOC_POOL_IMPORT, which tells
spa_write_cachefile() and spa_config_generate() to use the
ZPOOL_CONFIG_POOL_NAME in `spa->spa_config` instead of `spa->spa_name`.

creating with a temporary name permanently(!) sets the internal zpool
property `tname` (ZPOOL_PROP_TNAME) in the `zc->zc_nvlist_src` of
ZFS_IOC_POOL_CREATE, which tells zfs_ioc_pool_create()
(4ceb8dd6fd) and spa_create() to use that
name instead of `zc->zc_name`, then sets `spa->spa_import_flags |=
ZFS_IMPORT_TEMP_NAME` like an import.

but zfsdev_ioctl_common() fails to check for `tname` when saving the
pool name to `zfs_allow_log_key`, so when we call ZFS_IOC_LOG_HISTORY,
we call spa_open() on the wrong pool name and get ENOENT, so the logging
silently fails.

this patch fixes #18102 by checking for `tname` in zfsdev_ioctl_common()
like we do in zfs_ioc_pool_create().

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <alexander.motin@TrueNAS.com>
Signed-off-by: delan azabani <dazabani@igalia.com>
Closes #18118  
Closes #18102
This commit is contained in:
shuppy 2026-01-15 06:51:51 +08:00 committed by GitHub
parent 765929cb4e
commit 09e4e01e93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/zfs/zfs_ioctl.c
View File

@ -8151,10 +8151,16 @@ zfsdev_ioctl_common(uint_t vecnum, zfs_cmd_t *zc, int flag)
* Can't use kmem_strdup() as we might truncate the string and * Can't use kmem_strdup() as we might truncate the string and
* kmem_strfree() would then free with incorrect size. * kmem_strfree() would then free with incorrect size.
*/ */
saved_poolname_len = strlen(zc->zc_name) + 1; const char *spa_name = zc->zc_name;
const char *tname;
if (nvlist_lookup_string(innvl,
zpool_prop_to_name(ZPOOL_PROP_TNAME), &tname) == 0) {
spa_name = tname;
}
saved_poolname_len = strlen(spa_name) + 1;
saved_poolname = kmem_alloc(saved_poolname_len, KM_SLEEP); saved_poolname = kmem_alloc(saved_poolname_len, KM_SLEEP);
strlcpy(saved_poolname, zc->zc_name, saved_poolname_len); strlcpy(saved_poolname, spa_name, saved_poolname_len);
saved_poolname[strcspn(saved_poolname, "/@#")] = '\0'; saved_poolname[strcspn(saved_poolname, "/@#")] = '\0';
if (vec->zvec_func != NULL) { if (vec->zvec_func != NULL) {

2
tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_tempname.ksh
View File

@ -60,6 +60,8 @@ for poolprop in "${poolprops[@]}"; do
log_must test "$(get_prop $propname $TEMPPOOL)" == "$propval" log_must test "$(get_prop $propname $TEMPPOOL)" == "$propval"
IFS='=' read -r propname propval <<<"$poolprop" IFS='=' read -r propname propval <<<"$poolprop"
log_must test "$(get_pool_prop $propname $TEMPPOOL)" == "$propval" log_must test "$(get_pool_prop $propname $TEMPPOOL)" == "$propval"
# 3. Verify the `zpool create` command is logged to the pool history
log_must eval "zpool history $TEMPPOOL | grep -q 'zpool create -t'"
# Cleanup # Cleanup
destroy_pool $TEMPPOOL destroy_pool $TEMPPOOL
done done