Introduce a flag to skip comparing the local mac when raw sending
Raw receiving a snapshot back to the originating dataset is currently impossible because of user accounting being present in the originating dataset. One solution would be resetting user accounting when raw receiving on the receiving dataset. However, to recalculate it we would have to dirty all dnodes, which may not be preferable on big datasets. Instead, we rely on the os_phys flag OBJSET_FLAG_USERACCOUNTING_COMPLETE to indicate that user accounting is incomplete when raw receiving. Thus, on the next mount of the receiving dataset the local mac protecting user accounting is zeroed out. The flag is then cleared when user accounting of the raw received snapshot is calculated. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: George Amanakis <gamanakis@gmail.com> Closes #12981 Closes #10523 Closes #11221 Closes #11294 Closes #12594 Issue #11300
This commit is contained in:
George Amanakis
Tony Hutter
parent
1009e60992
commit
e257bd481b
|
|
@ -1076,11 +1076,26 @@ zio_crypt_do_objset_hmacs(zio_crypt_key_t *key, void *data, uint_t datalen,
|
|||
|
||||
bcopy(raw_portable_mac, portable_mac, ZIO_OBJSET_MAC_LEN);
|
||||
|
||||
/*
|
||||
* This is necessary here as we check next whether
|
||||
* OBJSET_FLAG_USERACCOUNTING_COMPLETE is set in order to
|
||||
* decide if the local_mac should be zeroed out. That flag will always
|
||||
* be set by dmu_objset_id_quota_upgrade_cb() and
|
||||
* dmu_objset_userspace_upgrade_cb() if useraccounting has been
|
||||
* completed.
|
||||
*/
|
||||
intval = osp->os_flags;
|
||||
if (should_bswap)
|
||||
intval = BSWAP_64(intval);
|
||||
boolean_t uacct_incomplete =
|
||||
!(intval & OBJSET_FLAG_USERACCOUNTING_COMPLETE);
|
||||
|
||||
/*
|
||||
* The local MAC protects the user, group and project accounting.
|
||||
* If these objects are not present, the local MAC is zeroed out.
|
||||
*/
|
||||
if ((datalen >= OBJSET_PHYS_SIZE_V3 &&
|
||||
if (uacct_incomplete ||
|
||||
(datalen >= OBJSET_PHYS_SIZE_V3 &&
|
||||
osp->os_userused_dnode.dn_type == DMU_OT_NONE &&
|
||||
osp->os_groupused_dnode.dn_type == DMU_OT_NONE &&
|
||||
osp->os_projectused_dnode.dn_type == DMU_OT_NONE) ||
|
||||
|
|
|
|||
|
|
@ -1203,11 +1203,26 @@ zio_crypt_do_objset_hmacs(zio_crypt_key_t *key, void *data, uint_t datalen,
|
|||
|
||||
bcopy(raw_portable_mac, portable_mac, ZIO_OBJSET_MAC_LEN);
|
||||
|
||||
/*
|
||||
* This is necessary here as we check next whether
|
||||
* OBJSET_FLAG_USERACCOUNTING_COMPLETE is set in order to
|
||||
* decide if the local_mac should be zeroed out. That flag will always
|
||||
* be set by dmu_objset_id_quota_upgrade_cb() and
|
||||
* dmu_objset_userspace_upgrade_cb() if useraccounting has been
|
||||
* completed.
|
||||
*/
|
||||
intval = osp->os_flags;
|
||||
if (should_bswap)
|
||||
intval = BSWAP_64(intval);
|
||||
boolean_t uacct_incomplete =
|
||||
!(intval & OBJSET_FLAG_USERACCOUNTING_COMPLETE);
|
||||
|
||||
/*
|
||||
* The local MAC protects the user, group and project accounting.
|
||||
* If these objects are not present, the local MAC is zeroed out.
|
||||
*/
|
||||
if ((datalen >= OBJSET_PHYS_SIZE_V3 &&
|
||||
if (uacct_incomplete ||
|
||||
(datalen >= OBJSET_PHYS_SIZE_V3 &&
|
||||
osp->os_userused_dnode.dn_type == DMU_OT_NONE &&
|
||||
osp->os_groupused_dnode.dn_type == DMU_OT_NONE &&
|
||||
osp->os_projectused_dnode.dn_type == DMU_OT_NONE) ||
|
||||
|
|
|
|||
|
|
@ -655,8 +655,13 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
|
|||
DNODE_FLAG_USEROBJUSED_ACCOUNTED;
|
||||
mutex_exit(&dn->dn_mtx);
|
||||
dmu_objset_userquota_get_ids(dn, B_FALSE, tx);
|
||||
} else {
|
||||
/* Once we account for it, we should always account for it */
|
||||
} else if (!(os->os_encrypted && dmu_objset_is_receiving(os))) {
|
||||
/*
|
||||
* Once we account for it, we should always account for it,
|
||||
* except for the case of a raw receive. We will not be able
|
||||
* to account for it until the receiving dataset has been
|
||||
* mounted.
|
||||
*/
|
||||
ASSERT(!(dn->dn_phys->dn_flags &
|
||||
DNODE_FLAG_USERUSED_ACCOUNTED));
|
||||
ASSERT(!(dn->dn_phys->dn_flags &
|
||||
|
|
|
|||
|
|
@ -2007,14 +2007,6 @@ dsl_crypto_recv_raw_objset_check(dsl_dataset_t *ds, dsl_dataset_t *fromds,
|
|||
if (ret != 0)
|
||||
return (ret);
|
||||
|
||||
/*
|
||||
* Useraccounting is not portable and must be done with the keys loaded.
|
||||
* Therefore, whenever we do any kind of receive the useraccounting
|
||||
* must not be present.
|
||||
*/
|
||||
ASSERT0(os->os_flags & OBJSET_FLAG_USERACCOUNTING_COMPLETE);
|
||||
ASSERT0(os->os_flags & OBJSET_FLAG_USEROBJACCOUNTING_COMPLETE);
|
||||
|
||||
mdn = DMU_META_DNODE(os);
|
||||
|
||||
/*
|
||||
|
|
@ -2106,6 +2098,7 @@ dsl_crypto_recv_raw_objset_sync(dsl_dataset_t *ds, dmu_objset_type_t ostype,
|
|||
arc_release(os->os_phys_buf, &os->os_phys_buf);
|
||||
bcopy(portable_mac, os->os_phys->os_portable_mac, ZIO_OBJSET_MAC_LEN);
|
||||
bzero(os->os_phys->os_local_mac, ZIO_OBJSET_MAC_LEN);
|
||||
os->os_flags &= ~OBJSET_FLAG_USERACCOUNTING_COMPLETE;
|
||||
os->os_next_write_raw[tx->tx_txg & TXG_MASK] = B_TRUE;
|
||||
|
||||
/* set metadnode compression and checksum */
|
||||
|
|
|
|||
|
|
@ -889,7 +889,8 @@ tests = [
|
|||
'userquota_004_pos', 'userquota_005_neg', 'userquota_006_pos',
|
||||
'userquota_007_pos', 'userquota_008_pos', 'userquota_009_pos',
|
||||
'userquota_010_pos', 'userquota_011_pos', 'userquota_012_neg',
|
||||
'userspace_001_pos', 'userspace_002_pos', 'userspace_encrypted']
|
||||
'userspace_001_pos', 'userspace_002_pos', 'userspace_encrypted',
|
||||
'userspace_send_encrypted']
|
||||
tags = ['functional', 'userquota']
|
||||
|
||||
[tests/functional/vdev_zaps]
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ dist_pkgdata_SCRIPTS = \
|
|||
userspace_001_pos.ksh \
|
||||
userspace_002_pos.ksh \
|
||||
userspace_003_pos.ksh \
|
||||
userspace_encrypted.ksh
|
||||
userspace_encrypted.ksh \
|
||||
userspace_send_encrypted.ksh
|
||||
|
||||
dist_pkgdata_DATA = \
|
||||
userquota.cfg \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,119 @@
|
|||
#!/bin/ksh -p
|
||||
#
|
||||
# This file and its contents are supplied under the terms of the
|
||||
# Common Development and Distribution License ("CDDL"), version 1.0.
|
||||
# You may only use this file in accordance with the terms of version
|
||||
# 1.0 of the CDDL.
|
||||
#
|
||||
# A full copy of the text of the CDDL should have accompanied this
|
||||
# source. A copy of the CDDL is also available via the Internet at
|
||||
# http://www.illumos.org/license/CDDL.
|
||||
#
|
||||
|
||||
#
|
||||
# Copyright 2021, George Amanakis <gamanakis@gmail.com>. All rights reserved.
|
||||
#
|
||||
|
||||
. $STF_SUITE/include/libtest.shlib
|
||||
. $STF_SUITE/tests/functional/userquota/userquota_common.kshlib
|
||||
|
||||
#
|
||||
# DESCRIPTION:
|
||||
# Sending raw encrypted datasets back to the source dataset succeeds.
|
||||
#
|
||||
#
|
||||
# STRATEGY:
|
||||
# 1. Create encrypted source dataset, set userquota and write a file
|
||||
# 2. Create base snapshot
|
||||
# 3. Write new file, snapshot, get userspace
|
||||
# 4. Raw send both snapshots
|
||||
# 5. Destroy latest snapshot at source and rollback
|
||||
# 6. Unmount, unload key from source
|
||||
# 7. Raw send latest snapshot back to source
|
||||
# 8. Mount both source and target datasets
|
||||
# 9. Verify encrypted datasets support 'zfs userspace' and 'zfs groupspace'
|
||||
# and the accounting is done correctly
|
||||
#
|
||||
|
||||
function cleanup
|
||||
{
|
||||
destroy_pool $POOLNAME
|
||||
rm -f $FILEDEV
|
||||
}
|
||||
|
||||
log_onexit cleanup
|
||||
|
||||
FILEDEV="$TEST_BASE_DIR/userspace_encrypted"
|
||||
POOLNAME="testpool$$"
|
||||
ENC_SOURCE="$POOLNAME/source"
|
||||
ENC_TARGET="$POOLNAME/target"
|
||||
|
||||
log_assert "Sending raw encrypted datasets back to the source dataset succeeds."
|
||||
|
||||
# Setup pool and create source
|
||||
truncate -s 200m $FILEDEV
|
||||
log_must zpool create -o feature@encryption=enabled $POOLNAME \
|
||||
$FILEDEV
|
||||
log_must eval "echo 'password' | zfs create -o encryption=on" \
|
||||
"-o keyformat=passphrase -o keylocation=prompt " \
|
||||
"$ENC_SOURCE"
|
||||
|
||||
# Set user quota and write file
|
||||
log_must zfs set userquota@$QUSER1=50m $ENC_SOURCE
|
||||
mkmount_writable $ENC_SOURCE
|
||||
mntpnt=$(get_prop mountpoint $ENC_SOURCE)
|
||||
log_must user_run $QUSER1 mkfile 10m /$mntpnt/file1
|
||||
sync
|
||||
|
||||
# Snapshot
|
||||
log_must zfs snap $ENC_SOURCE@base
|
||||
|
||||
# Write new file, snapshot, get userspace
|
||||
log_must user_run $QUSER1 mkfile 20m /$mntpnt/file2
|
||||
log_must zfs snap $ENC_SOURCE@s1
|
||||
|
||||
# Raw send both snapshots
|
||||
log_must eval "zfs send -w $ENC_SOURCE@base | zfs recv " \
|
||||
"$ENC_TARGET"
|
||||
log_must eval "zfs send -w -i @base $ENC_SOURCE@s1 | zfs recv " \
|
||||
"$ENC_TARGET"
|
||||
|
||||
# Destroy latest snapshot at source and rollback
|
||||
log_must zfs destroy $ENC_SOURCE@s1
|
||||
log_must zfs rollback $ENC_SOURCE@base
|
||||
rollback_uspace=$(zfs userspace -Hp $ENC_SOURCE | \
|
||||
awk "/$QUSER1/"' {printf "%d\n", $4 / 1024 / 1024}')
|
||||
|
||||
# Unmount, unload key
|
||||
log_must zfs umount $ENC_SOURCE
|
||||
log_must zfs unload-key -a
|
||||
|
||||
# Raw send latest snapshot back to source
|
||||
log_must eval "zfs send -w -i @base $ENC_TARGET@s1 | zfs recv " \
|
||||
"$ENC_SOURCE"
|
||||
|
||||
# Mount encrypted datasets and verify they support 'zfs userspace' and
|
||||
# 'zfs groupspace' and the accounting is done correctly
|
||||
log_must eval "echo 'password' | zfs load-key $ENC_SOURCE"
|
||||
log_must eval "echo 'password' | zfs load-key $ENC_TARGET"
|
||||
log_must zfs mount $ENC_SOURCE
|
||||
log_must zfs mount $ENC_TARGET
|
||||
sync
|
||||
|
||||
sleep 5
|
||||
|
||||
src_uspace=$(zfs userspace -Hp $ENC_SOURCE | \
|
||||
awk "/$QUSER1/"' {printf "%d\n", $4 / 1024 / 1024}')
|
||||
tgt_uspace=$(zfs userspace -Hp $ENC_TARGET | \
|
||||
awk "/$QUSER1/"' {printf "%d\n", $4 / 1024 / 1024}')
|
||||
log_must test "$src_uspace" -eq "$tgt_uspace"
|
||||
log_must test "$rollback_uspace" -ne "$src_uspace"
|
||||
|
||||
src_uquota=$(zfs userspace -Hp $ENC_SOURCE | awk "/$QUSER1/"' {print $5}')
|
||||
tgt_uquota=$(zfs userspace -Hp $ENC_TARGET | awk "/$QUSER1/"' {print $5}')
|
||||
log_must test "$src_uquota" -eq "$tgt_uquota"
|
||||
|
||||
# Cleanup
|
||||
cleanup
|
||||
|
||||
log_pass "Sending raw encrypted datasets back to the source dataset succeeds."
|
||||
Loading…
Reference in New Issue