2010-05-29 00:45:14 +04:00
|
|
|
/*
|
|
|
|
* 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) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
2017-02-09 21:19:12 +03:00
|
|
|
* Copyright (c) 2011, 2016 by Delphix. All rights reserved.
|
2017-05-26 21:42:10 +03:00
|
|
|
* Copyright (c) 2017 Datto Inc.
|
2010-05-29 00:45:14 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/bpobj.h>
|
|
|
|
#include <sys/zfs_context.h>
|
|
|
|
#include <sys/refcount.h>
|
2011-11-17 22:14:36 +04:00
|
|
|
#include <sys/dsl_pool.h>
|
2012-12-24 03:57:14 +04:00
|
|
|
#include <sys/zfeature.h>
|
|
|
|
#include <sys/zap.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return an empty bpobj, preferably the empty dummy one (dp_empty_bpobj).
|
|
|
|
*/
|
|
|
|
uint64_t
|
|
|
|
bpobj_alloc_empty(objset_t *os, int blocksize, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
spa_t *spa = dmu_objset_spa(os);
|
|
|
|
dsl_pool_t *dp = dmu_objset_pool(os);
|
|
|
|
|
2013-10-08 21:13:05 +04:00
|
|
|
if (spa_feature_is_enabled(spa, SPA_FEATURE_EMPTY_BPOBJ)) {
|
|
|
|
if (!spa_feature_is_active(spa, SPA_FEATURE_EMPTY_BPOBJ)) {
|
2013-05-11 01:17:03 +04:00
|
|
|
ASSERT0(dp->dp_empty_bpobj);
|
2012-12-24 03:57:14 +04:00
|
|
|
dp->dp_empty_bpobj =
|
2014-11-03 23:15:08 +03:00
|
|
|
bpobj_alloc(os, SPA_OLD_MAXBLOCKSIZE, tx);
|
2012-12-24 03:57:14 +04:00
|
|
|
VERIFY(zap_add(os,
|
|
|
|
DMU_POOL_DIRECTORY_OBJECT,
|
|
|
|
DMU_POOL_EMPTY_BPOBJ, sizeof (uint64_t), 1,
|
|
|
|
&dp->dp_empty_bpobj, tx) == 0);
|
|
|
|
}
|
2013-10-08 21:13:05 +04:00
|
|
|
spa_feature_incr(spa, SPA_FEATURE_EMPTY_BPOBJ, tx);
|
2012-12-24 03:57:14 +04:00
|
|
|
ASSERT(dp->dp_empty_bpobj != 0);
|
|
|
|
return (dp->dp_empty_bpobj);
|
|
|
|
} else {
|
|
|
|
return (bpobj_alloc(os, blocksize, tx));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
bpobj_decr_empty(objset_t *os, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
dsl_pool_t *dp = dmu_objset_pool(os);
|
|
|
|
|
2013-10-08 21:13:05 +04:00
|
|
|
spa_feature_decr(dmu_objset_spa(os), SPA_FEATURE_EMPTY_BPOBJ, tx);
|
|
|
|
if (!spa_feature_is_active(dmu_objset_spa(os),
|
|
|
|
SPA_FEATURE_EMPTY_BPOBJ)) {
|
2012-12-24 03:57:14 +04:00
|
|
|
VERIFY3U(0, ==, zap_remove(dp->dp_meta_objset,
|
|
|
|
DMU_POOL_DIRECTORY_OBJECT,
|
|
|
|
DMU_POOL_EMPTY_BPOBJ, tx));
|
|
|
|
VERIFY3U(0, ==, dmu_object_free(os, dp->dp_empty_bpobj, tx));
|
|
|
|
dp->dp_empty_bpobj = 0;
|
|
|
|
}
|
|
|
|
}
|
2010-05-29 00:45:14 +04:00
|
|
|
|
|
|
|
uint64_t
|
|
|
|
bpobj_alloc(objset_t *os, int blocksize, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
int size;
|
|
|
|
|
|
|
|
if (spa_version(dmu_objset_spa(os)) < SPA_VERSION_BPOBJ_ACCOUNT)
|
|
|
|
size = BPOBJ_SIZE_V0;
|
|
|
|
else if (spa_version(dmu_objset_spa(os)) < SPA_VERSION_DEADLISTS)
|
|
|
|
size = BPOBJ_SIZE_V1;
|
|
|
|
else
|
|
|
|
size = sizeof (bpobj_phys_t);
|
|
|
|
|
|
|
|
return (dmu_object_alloc(os, DMU_OT_BPOBJ, blocksize,
|
|
|
|
DMU_OT_BPOBJ_HDR, size, tx));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
bpobj_free(objset_t *os, uint64_t obj, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
int64_t i;
|
|
|
|
bpobj_t bpo;
|
|
|
|
dmu_object_info_t doi;
|
|
|
|
int epb;
|
|
|
|
dmu_buf_t *dbuf = NULL;
|
|
|
|
|
2012-12-24 03:57:14 +04:00
|
|
|
ASSERT(obj != dmu_objset_pool(os)->dp_empty_bpobj);
|
2010-05-29 00:45:14 +04:00
|
|
|
VERIFY3U(0, ==, bpobj_open(&bpo, os, obj));
|
|
|
|
|
|
|
|
mutex_enter(&bpo.bpo_lock);
|
|
|
|
|
|
|
|
if (!bpo.bpo_havesubobj || bpo.bpo_phys->bpo_subobjs == 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
VERIFY3U(0, ==, dmu_object_info(os, bpo.bpo_phys->bpo_subobjs, &doi));
|
|
|
|
epb = doi.doi_data_block_size / sizeof (uint64_t);
|
|
|
|
|
|
|
|
for (i = bpo.bpo_phys->bpo_num_subobjs - 1; i >= 0; i--) {
|
|
|
|
uint64_t *objarray;
|
|
|
|
uint64_t offset, blkoff;
|
|
|
|
|
|
|
|
offset = i * sizeof (uint64_t);
|
|
|
|
blkoff = P2PHASE(i, epb);
|
|
|
|
|
|
|
|
if (dbuf == NULL || dbuf->db_offset > offset) {
|
|
|
|
if (dbuf)
|
|
|
|
dmu_buf_rele(dbuf, FTAG);
|
|
|
|
VERIFY3U(0, ==, dmu_buf_hold(os,
|
|
|
|
bpo.bpo_phys->bpo_subobjs, offset, FTAG, &dbuf, 0));
|
|
|
|
}
|
|
|
|
|
|
|
|
ASSERT3U(offset, >=, dbuf->db_offset);
|
|
|
|
ASSERT3U(offset, <, dbuf->db_offset + dbuf->db_size);
|
|
|
|
|
|
|
|
objarray = dbuf->db_data;
|
|
|
|
bpobj_free(os, objarray[blkoff], tx);
|
|
|
|
}
|
|
|
|
if (dbuf) {
|
|
|
|
dmu_buf_rele(dbuf, FTAG);
|
|
|
|
dbuf = NULL;
|
|
|
|
}
|
|
|
|
VERIFY3U(0, ==, dmu_object_free(os, bpo.bpo_phys->bpo_subobjs, tx));
|
|
|
|
|
|
|
|
out:
|
|
|
|
mutex_exit(&bpo.bpo_lock);
|
|
|
|
bpobj_close(&bpo);
|
|
|
|
|
|
|
|
VERIFY3U(0, ==, dmu_object_free(os, obj, tx));
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
bpobj_open(bpobj_t *bpo, objset_t *os, uint64_t object)
|
|
|
|
{
|
|
|
|
dmu_object_info_t doi;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = dmu_object_info(os, object, &doi);
|
|
|
|
if (err)
|
|
|
|
return (err);
|
|
|
|
|
|
|
|
bzero(bpo, sizeof (*bpo));
|
|
|
|
mutex_init(&bpo->bpo_lock, NULL, MUTEX_DEFAULT, NULL);
|
|
|
|
|
|
|
|
ASSERT(bpo->bpo_dbuf == NULL);
|
|
|
|
ASSERT(bpo->bpo_phys == NULL);
|
|
|
|
ASSERT(object != 0);
|
|
|
|
ASSERT3U(doi.doi_type, ==, DMU_OT_BPOBJ);
|
|
|
|
ASSERT3U(doi.doi_bonus_type, ==, DMU_OT_BPOBJ_HDR);
|
|
|
|
|
2010-08-27 01:24:34 +04:00
|
|
|
err = dmu_bonus_hold(os, object, bpo, &bpo->bpo_dbuf);
|
|
|
|
if (err)
|
|
|
|
return (err);
|
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
bpo->bpo_os = os;
|
|
|
|
bpo->bpo_object = object;
|
|
|
|
bpo->bpo_epb = doi.doi_data_block_size >> SPA_BLKPTRSHIFT;
|
|
|
|
bpo->bpo_havecomp = (doi.doi_bonus_size > BPOBJ_SIZE_V0);
|
|
|
|
bpo->bpo_havesubobj = (doi.doi_bonus_size > BPOBJ_SIZE_V1);
|
|
|
|
bpo->bpo_phys = bpo->bpo_dbuf->db_data;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
boolean_t
|
|
|
|
bpobj_is_open(const bpobj_t *bpo)
|
|
|
|
{
|
|
|
|
return (bpo->bpo_object != 0);
|
|
|
|
}
|
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
void
|
|
|
|
bpobj_close(bpobj_t *bpo)
|
|
|
|
{
|
|
|
|
/* Lame workaround for closing a bpobj that was never opened. */
|
|
|
|
if (bpo->bpo_object == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
dmu_buf_rele(bpo->bpo_dbuf, bpo);
|
|
|
|
if (bpo->bpo_cached_dbuf != NULL)
|
|
|
|
dmu_buf_rele(bpo->bpo_cached_dbuf, bpo);
|
|
|
|
bpo->bpo_dbuf = NULL;
|
|
|
|
bpo->bpo_phys = NULL;
|
|
|
|
bpo->bpo_cached_dbuf = NULL;
|
2010-08-27 01:24:34 +04:00
|
|
|
bpo->bpo_object = 0;
|
2010-05-29 00:45:14 +04:00
|
|
|
|
|
|
|
mutex_destroy(&bpo->bpo_lock);
|
|
|
|
}
|
|
|
|
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
boolean_t
|
|
|
|
bpobj_is_empty(bpobj_t *bpo)
|
2014-06-06 01:19:08 +04:00
|
|
|
{
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
return (bpo->bpo_phys->bpo_num_blkptrs == 0 &&
|
|
|
|
(!bpo->bpo_havesubobj || bpo->bpo_phys->bpo_num_subobjs == 0));
|
2014-06-06 01:19:08 +04:00
|
|
|
}
|
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
static int
|
|
|
|
bpobj_iterate_impl(bpobj_t *bpo, bpobj_itor_t func, void *arg, dmu_tx_t *tx,
|
|
|
|
boolean_t free)
|
|
|
|
{
|
|
|
|
dmu_object_info_t doi;
|
|
|
|
int epb;
|
|
|
|
int64_t i;
|
|
|
|
int err = 0;
|
|
|
|
dmu_buf_t *dbuf = NULL;
|
|
|
|
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
ASSERT(bpobj_is_open(bpo));
|
2010-05-29 00:45:14 +04:00
|
|
|
mutex_enter(&bpo->bpo_lock);
|
|
|
|
|
|
|
|
if (free)
|
|
|
|
dmu_buf_will_dirty(bpo->bpo_dbuf, tx);
|
|
|
|
|
|
|
|
for (i = bpo->bpo_phys->bpo_num_blkptrs - 1; i >= 0; i--) {
|
|
|
|
blkptr_t *bparray;
|
|
|
|
blkptr_t *bp;
|
|
|
|
uint64_t offset, blkoff;
|
|
|
|
|
|
|
|
offset = i * sizeof (blkptr_t);
|
|
|
|
blkoff = P2PHASE(i, bpo->bpo_epb);
|
|
|
|
|
|
|
|
if (dbuf == NULL || dbuf->db_offset > offset) {
|
|
|
|
if (dbuf)
|
|
|
|
dmu_buf_rele(dbuf, FTAG);
|
|
|
|
err = dmu_buf_hold(bpo->bpo_os, bpo->bpo_object, offset,
|
|
|
|
FTAG, &dbuf, 0);
|
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
ASSERT3U(offset, >=, dbuf->db_offset);
|
|
|
|
ASSERT3U(offset, <, dbuf->db_offset + dbuf->db_size);
|
|
|
|
|
|
|
|
bparray = dbuf->db_data;
|
|
|
|
bp = &bparray[blkoff];
|
|
|
|
err = func(arg, bp, tx);
|
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
if (free) {
|
|
|
|
bpo->bpo_phys->bpo_bytes -=
|
|
|
|
bp_get_dsize_sync(dmu_objset_spa(bpo->bpo_os), bp);
|
|
|
|
ASSERT3S(bpo->bpo_phys->bpo_bytes, >=, 0);
|
|
|
|
if (bpo->bpo_havecomp) {
|
|
|
|
bpo->bpo_phys->bpo_comp -= BP_GET_PSIZE(bp);
|
|
|
|
bpo->bpo_phys->bpo_uncomp -= BP_GET_UCSIZE(bp);
|
|
|
|
}
|
|
|
|
bpo->bpo_phys->bpo_num_blkptrs--;
|
|
|
|
ASSERT3S(bpo->bpo_phys->bpo_num_blkptrs, >=, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (dbuf) {
|
|
|
|
dmu_buf_rele(dbuf, FTAG);
|
|
|
|
dbuf = NULL;
|
|
|
|
}
|
|
|
|
if (free) {
|
|
|
|
VERIFY3U(0, ==, dmu_free_range(bpo->bpo_os, bpo->bpo_object,
|
2017-10-27 02:58:38 +03:00
|
|
|
(i + 1) * sizeof (blkptr_t), DMU_OBJECT_END, tx));
|
2010-05-29 00:45:14 +04:00
|
|
|
}
|
|
|
|
if (err || !bpo->bpo_havesubobj || bpo->bpo_phys->bpo_subobjs == 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ASSERT(bpo->bpo_havecomp);
|
|
|
|
err = dmu_object_info(bpo->bpo_os, bpo->bpo_phys->bpo_subobjs, &doi);
|
2010-08-27 01:24:34 +04:00
|
|
|
if (err) {
|
|
|
|
mutex_exit(&bpo->bpo_lock);
|
2010-05-29 00:45:14 +04:00
|
|
|
return (err);
|
2010-08-27 01:24:34 +04:00
|
|
|
}
|
2013-10-08 21:13:05 +04:00
|
|
|
ASSERT3U(doi.doi_type, ==, DMU_OT_BPOBJ_SUBOBJ);
|
2010-05-29 00:45:14 +04:00
|
|
|
epb = doi.doi_data_block_size / sizeof (uint64_t);
|
|
|
|
|
|
|
|
for (i = bpo->bpo_phys->bpo_num_subobjs - 1; i >= 0; i--) {
|
|
|
|
uint64_t *objarray;
|
|
|
|
uint64_t offset, blkoff;
|
|
|
|
bpobj_t sublist;
|
|
|
|
uint64_t used_before, comp_before, uncomp_before;
|
|
|
|
uint64_t used_after, comp_after, uncomp_after;
|
|
|
|
|
|
|
|
offset = i * sizeof (uint64_t);
|
|
|
|
blkoff = P2PHASE(i, epb);
|
|
|
|
|
|
|
|
if (dbuf == NULL || dbuf->db_offset > offset) {
|
|
|
|
if (dbuf)
|
|
|
|
dmu_buf_rele(dbuf, FTAG);
|
|
|
|
err = dmu_buf_hold(bpo->bpo_os,
|
|
|
|
bpo->bpo_phys->bpo_subobjs, offset, FTAG, &dbuf, 0);
|
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
ASSERT3U(offset, >=, dbuf->db_offset);
|
|
|
|
ASSERT3U(offset, <, dbuf->db_offset + dbuf->db_size);
|
|
|
|
|
|
|
|
objarray = dbuf->db_data;
|
|
|
|
err = bpobj_open(&sublist, bpo->bpo_os, objarray[blkoff]);
|
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
if (free) {
|
|
|
|
err = bpobj_space(&sublist,
|
|
|
|
&used_before, &comp_before, &uncomp_before);
|
2015-04-27 01:30:46 +03:00
|
|
|
if (err != 0) {
|
|
|
|
bpobj_close(&sublist);
|
2010-05-29 00:45:14 +04:00
|
|
|
break;
|
2015-04-27 01:30:46 +03:00
|
|
|
}
|
2010-05-29 00:45:14 +04:00
|
|
|
}
|
|
|
|
err = bpobj_iterate_impl(&sublist, func, arg, tx, free);
|
|
|
|
if (free) {
|
|
|
|
VERIFY3U(0, ==, bpobj_space(&sublist,
|
|
|
|
&used_after, &comp_after, &uncomp_after));
|
|
|
|
bpo->bpo_phys->bpo_bytes -= used_before - used_after;
|
|
|
|
ASSERT3S(bpo->bpo_phys->bpo_bytes, >=, 0);
|
2010-08-27 01:24:34 +04:00
|
|
|
bpo->bpo_phys->bpo_comp -= comp_before - comp_after;
|
2010-05-29 00:45:14 +04:00
|
|
|
bpo->bpo_phys->bpo_uncomp -=
|
|
|
|
uncomp_before - uncomp_after;
|
|
|
|
}
|
|
|
|
|
|
|
|
bpobj_close(&sublist);
|
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
if (free) {
|
|
|
|
err = dmu_object_free(bpo->bpo_os,
|
|
|
|
objarray[blkoff], tx);
|
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
bpo->bpo_phys->bpo_num_subobjs--;
|
|
|
|
ASSERT3S(bpo->bpo_phys->bpo_num_subobjs, >=, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (dbuf) {
|
|
|
|
dmu_buf_rele(dbuf, FTAG);
|
|
|
|
dbuf = NULL;
|
|
|
|
}
|
|
|
|
if (free) {
|
|
|
|
VERIFY3U(0, ==, dmu_free_range(bpo->bpo_os,
|
|
|
|
bpo->bpo_phys->bpo_subobjs,
|
2017-10-27 02:58:38 +03:00
|
|
|
(i + 1) * sizeof (uint64_t), DMU_OBJECT_END, tx));
|
2010-05-29 00:45:14 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
/* If there are no entries, there should be no bytes. */
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
if (bpobj_is_empty(bpo)) {
|
2014-06-06 01:19:08 +04:00
|
|
|
ASSERT0(bpo->bpo_phys->bpo_bytes);
|
|
|
|
ASSERT0(bpo->bpo_phys->bpo_comp);
|
|
|
|
ASSERT0(bpo->bpo_phys->bpo_uncomp);
|
|
|
|
}
|
2010-05-29 00:45:14 +04:00
|
|
|
|
|
|
|
mutex_exit(&bpo->bpo_lock);
|
|
|
|
return (err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Iterate and remove the entries. If func returns nonzero, iteration
|
|
|
|
* will stop and that entry will not be removed.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
bpobj_iterate(bpobj_t *bpo, bpobj_itor_t func, void *arg, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
return (bpobj_iterate_impl(bpo, func, arg, tx, B_TRUE));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Iterate the entries. If func returns nonzero, iteration will stop.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
bpobj_iterate_nofree(bpobj_t *bpo, bpobj_itor_t func, void *arg, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
return (bpobj_iterate_impl(bpo, func, arg, tx, B_FALSE));
|
|
|
|
}
|
|
|
|
|
bpobj_enqueue_subobj() should copy small subobj's
When we delete a snapshot, we consolidate some bpobj's together because
we no longer need to keep their entries in separate buckets. This is
done in constant time by including the "sub" bpobj by reference in the
parent bpobj.
After many snapshots have been deleted, we may have many sub-bpobj's.
Usually, most sub-bpobj's don't contain many BP's. Compared to this
small payload, the sub-bpobj is relatively heavyweight since it is a
object in the MOS. A common scenario on a long-lived pool is for the
vast majority of MOS objects to be small sub-bpobj's.
To improve this situation, when consolidating bpobj's together,
bpobj_enqueue_subobj() can copy the contents of small bpobj's into the
parent, and then delete the enqueued bpobj, rather than including it by
reference. Since this copying is limited in size (to one block), the
consolidation is still constant time, though with a larger constant due
to reading in the one block of the enqueued bpobj.
This idea and mechanism are similar to how we handle "sub-subobj's".
When including a sub-bpobj by reference, if the sub-bpobj itself has
less than a block of sub-sub-bpobj's, the list of sub-sub-bpobj's is
copied to the parent bpobj's list of sub-bpobj's.
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Paul Zuchowski <pzuchowski@datto.com>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #8053
Issue #7908
2018-10-31 19:58:17 +03:00
|
|
|
/*
|
|
|
|
* Logically add subobj's contents to the parent bpobj.
|
|
|
|
*
|
|
|
|
* In the most general case, this is accomplished in constant time by adding
|
|
|
|
* a reference to subobj. This case is used when enqueuing a large subobj:
|
|
|
|
* +--------------+ +--------------+
|
|
|
|
* | bpobj |----------------------->| subobj list |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+--+--+
|
|
|
|
* | bp | bp | bp | bp | bp | | obj | obj | obj |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+-----+
|
|
|
|
*
|
|
|
|
* +--------------+ +--------------+
|
|
|
|
* | sub-bpobj |----------------------> | subsubobj |
|
|
|
|
* +----+----+----+----+---------+----+ +-----+-----+--+--------+-----+
|
|
|
|
* | bp | bp | bp | bp | ... | bp | | obj | obj | ... | obj |
|
|
|
|
* +----+----+----+----+---------+----+ +-----+-----+-----------+-----+
|
|
|
|
*
|
|
|
|
* Result: sub-bpobj added to parent's subobj list.
|
|
|
|
* +--------------+ +--------------+
|
|
|
|
* | bpobj |----------------------->| subobj list |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+--+--+-----+
|
|
|
|
* | bp | bp | bp | bp | bp | | obj | obj | obj | OBJ |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+-----+--|--+
|
|
|
|
* |
|
|
|
|
* /-----------------------------------------------------/
|
|
|
|
* v
|
|
|
|
* +--------------+ +--------------+
|
|
|
|
* | sub-bpobj |----------------------> | subsubobj |
|
|
|
|
* +----+----+----+----+---------+----+ +-----+-----+--+--------+-----+
|
|
|
|
* | bp | bp | bp | bp | ... | bp | | obj | obj | ... | obj |
|
|
|
|
* +----+----+----+----+---------+----+ +-----+-----+-----------+-----+
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* In a common case, the subobj is small: its bp's and its list of subobj's
|
|
|
|
* are each stored in a single block. In this case we copy the subobj's
|
|
|
|
* contents to the parent:
|
|
|
|
* +--------------+ +--------------+
|
|
|
|
* | bpobj |----------------------->| subobj list |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+--+--+
|
|
|
|
* | bp | bp | bp | bp | bp | | obj | obj | obj |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+-----+
|
|
|
|
* ^ ^
|
|
|
|
* +--------------+ | +--------------+ |
|
|
|
|
* | sub-bpobj |---------^------------> | subsubobj | ^
|
|
|
|
* +----+----+----+ | +-----+-----+--+ |
|
|
|
|
* | BP | BP |-->-->-->-->-/ | OBJ | OBJ |-->-/
|
|
|
|
* +----+----+ +-----+-----+
|
|
|
|
*
|
|
|
|
* Result: subobj destroyed, contents copied to parent:
|
|
|
|
* +--------------+ +--------------+
|
|
|
|
* | bpobj |----------------------->| subobj list |
|
|
|
|
* +----+----+----+----+----+----+----+ +-----+-----+--+--+-----+-----+
|
|
|
|
* | bp | bp | bp | bp | bp | BP | BP | | obj | obj | obj | OBJ | OBJ |
|
|
|
|
* +----+----+----+----+----+----+----+ +-----+-----+-----+-----+-----+
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* If the subobj has many BP's but few subobj's, we can copy the sub-subobj's
|
|
|
|
* but retain the sub-bpobj:
|
|
|
|
* +--------------+ +--------------+
|
|
|
|
* | bpobj |----------------------->| subobj list |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+--+--+
|
|
|
|
* | bp | bp | bp | bp | bp | | obj | obj | obj |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+-----+
|
|
|
|
* ^
|
|
|
|
* +--------------+ +--------------+ |
|
|
|
|
* | sub-bpobj |----------------------> | subsubobj | ^
|
|
|
|
* +----+----+----+----+---------+----+ +-----+-----+--+ |
|
|
|
|
* | bp | bp | bp | bp | ... | bp | | OBJ | OBJ |-->-/
|
|
|
|
* +----+----+----+----+---------+----+ +-----+-----+
|
|
|
|
*
|
|
|
|
* Result: sub-sub-bpobjs and subobj added to parent's subobj list.
|
|
|
|
* +--------------+ +--------------+
|
|
|
|
* | bpobj |-------------------->| subobj list |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+--+--+-----+-----+------+
|
|
|
|
* | bp | bp | bp | bp | bp | | obj | obj | obj | OBJ | OBJ | OBJ* |
|
|
|
|
* +----+----+----+----+----+ +-----+-----+-----+-----+-----+--|---+
|
|
|
|
* |
|
|
|
|
* /--------------------------------------------------------------/
|
|
|
|
* v
|
|
|
|
* +--------------+
|
|
|
|
* | sub-bpobj |
|
|
|
|
* +----+----+----+----+---------+----+
|
|
|
|
* | bp | bp | bp | bp | ... | bp |
|
|
|
|
* +----+----+----+----+---------+----+
|
|
|
|
*/
|
2010-05-29 00:45:14 +04:00
|
|
|
void
|
|
|
|
bpobj_enqueue_subobj(bpobj_t *bpo, uint64_t subobj, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
bpobj_t subbpo;
|
2010-08-27 01:24:34 +04:00
|
|
|
uint64_t used, comp, uncomp, subsubobjs;
|
bpobj_enqueue_subobj() should copy small subobj's
When we delete a snapshot, we consolidate some bpobj's together because
we no longer need to keep their entries in separate buckets. This is
done in constant time by including the "sub" bpobj by reference in the
parent bpobj.
After many snapshots have been deleted, we may have many sub-bpobj's.
Usually, most sub-bpobj's don't contain many BP's. Compared to this
small payload, the sub-bpobj is relatively heavyweight since it is a
object in the MOS. A common scenario on a long-lived pool is for the
vast majority of MOS objects to be small sub-bpobj's.
To improve this situation, when consolidating bpobj's together,
bpobj_enqueue_subobj() can copy the contents of small bpobj's into the
parent, and then delete the enqueued bpobj, rather than including it by
reference. Since this copying is limited in size (to one block), the
consolidation is still constant time, though with a larger constant due
to reading in the one block of the enqueued bpobj.
This idea and mechanism are similar to how we handle "sub-subobj's".
When including a sub-bpobj by reference, if the sub-bpobj itself has
less than a block of sub-sub-bpobj's, the list of sub-sub-bpobj's is
copied to the parent bpobj's list of sub-bpobj's.
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Paul Zuchowski <pzuchowski@datto.com>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #8053
Issue #7908
2018-10-31 19:58:17 +03:00
|
|
|
boolean_t copy_subsub = B_TRUE;
|
|
|
|
boolean_t copy_bps = B_TRUE;
|
2010-05-29 00:45:14 +04:00
|
|
|
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
ASSERT(bpobj_is_open(bpo));
|
|
|
|
ASSERT(subobj != 0);
|
2010-05-29 00:45:14 +04:00
|
|
|
ASSERT(bpo->bpo_havesubobj);
|
|
|
|
ASSERT(bpo->bpo_havecomp);
|
2012-12-24 03:57:14 +04:00
|
|
|
ASSERT(bpo->bpo_object != dmu_objset_pool(bpo->bpo_os)->dp_empty_bpobj);
|
|
|
|
|
|
|
|
if (subobj == dmu_objset_pool(bpo->bpo_os)->dp_empty_bpobj) {
|
|
|
|
bpobj_decr_empty(bpo->bpo_os, tx);
|
|
|
|
return;
|
|
|
|
}
|
2010-05-29 00:45:14 +04:00
|
|
|
|
|
|
|
VERIFY3U(0, ==, bpobj_open(&subbpo, bpo->bpo_os, subobj));
|
|
|
|
VERIFY3U(0, ==, bpobj_space(&subbpo, &used, &comp, &uncomp));
|
|
|
|
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
if (bpobj_is_empty(&subbpo)) {
|
2010-05-29 00:45:14 +04:00
|
|
|
/* No point in having an empty subobj. */
|
2010-08-27 01:24:34 +04:00
|
|
|
bpobj_close(&subbpo);
|
2010-05-29 00:45:14 +04:00
|
|
|
bpobj_free(bpo->bpo_os, subobj, tx);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-02-09 21:19:12 +03:00
|
|
|
mutex_enter(&bpo->bpo_lock);
|
2010-05-29 00:45:14 +04:00
|
|
|
dmu_buf_will_dirty(bpo->bpo_dbuf, tx);
|
|
|
|
|
bpobj_enqueue_subobj() should copy small subobj's
When we delete a snapshot, we consolidate some bpobj's together because
we no longer need to keep their entries in separate buckets. This is
done in constant time by including the "sub" bpobj by reference in the
parent bpobj.
After many snapshots have been deleted, we may have many sub-bpobj's.
Usually, most sub-bpobj's don't contain many BP's. Compared to this
small payload, the sub-bpobj is relatively heavyweight since it is a
object in the MOS. A common scenario on a long-lived pool is for the
vast majority of MOS objects to be small sub-bpobj's.
To improve this situation, when consolidating bpobj's together,
bpobj_enqueue_subobj() can copy the contents of small bpobj's into the
parent, and then delete the enqueued bpobj, rather than including it by
reference. Since this copying is limited in size (to one block), the
consolidation is still constant time, though with a larger constant due
to reading in the one block of the enqueued bpobj.
This idea and mechanism are similar to how we handle "sub-subobj's".
When including a sub-bpobj by reference, if the sub-bpobj itself has
less than a block of sub-sub-bpobj's, the list of sub-sub-bpobj's is
copied to the parent bpobj's list of sub-bpobj's.
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Paul Zuchowski <pzuchowski@datto.com>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #8053
Issue #7908
2018-10-31 19:58:17 +03:00
|
|
|
dmu_object_info_t doi;
|
2013-09-04 16:00:57 +04:00
|
|
|
|
bpobj_enqueue_subobj() should copy small subobj's
When we delete a snapshot, we consolidate some bpobj's together because
we no longer need to keep their entries in separate buckets. This is
done in constant time by including the "sub" bpobj by reference in the
parent bpobj.
After many snapshots have been deleted, we may have many sub-bpobj's.
Usually, most sub-bpobj's don't contain many BP's. Compared to this
small payload, the sub-bpobj is relatively heavyweight since it is a
object in the MOS. A common scenario on a long-lived pool is for the
vast majority of MOS objects to be small sub-bpobj's.
To improve this situation, when consolidating bpobj's together,
bpobj_enqueue_subobj() can copy the contents of small bpobj's into the
parent, and then delete the enqueued bpobj, rather than including it by
reference. Since this copying is limited in size (to one block), the
consolidation is still constant time, though with a larger constant due
to reading in the one block of the enqueued bpobj.
This idea and mechanism are similar to how we handle "sub-subobj's".
When including a sub-bpobj by reference, if the sub-bpobj itself has
less than a block of sub-sub-bpobj's, the list of sub-sub-bpobj's is
copied to the parent bpobj's list of sub-bpobj's.
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Paul Zuchowski <pzuchowski@datto.com>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #8053
Issue #7908
2018-10-31 19:58:17 +03:00
|
|
|
if (bpo->bpo_phys->bpo_subobjs != 0) {
|
|
|
|
ASSERT0(dmu_object_info(bpo->bpo_os, bpo->bpo_phys->bpo_subobjs,
|
|
|
|
&doi));
|
|
|
|
ASSERT3U(doi.doi_type, ==, DMU_OT_BPOBJ_SUBOBJ);
|
|
|
|
}
|
2010-08-27 01:24:34 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If subobj has only one block of subobjs, then move subobj's
|
bpobj_enqueue_subobj() should copy small subobj's
When we delete a snapshot, we consolidate some bpobj's together because
we no longer need to keep their entries in separate buckets. This is
done in constant time by including the "sub" bpobj by reference in the
parent bpobj.
After many snapshots have been deleted, we may have many sub-bpobj's.
Usually, most sub-bpobj's don't contain many BP's. Compared to this
small payload, the sub-bpobj is relatively heavyweight since it is a
object in the MOS. A common scenario on a long-lived pool is for the
vast majority of MOS objects to be small sub-bpobj's.
To improve this situation, when consolidating bpobj's together,
bpobj_enqueue_subobj() can copy the contents of small bpobj's into the
parent, and then delete the enqueued bpobj, rather than including it by
reference. Since this copying is limited in size (to one block), the
consolidation is still constant time, though with a larger constant due
to reading in the one block of the enqueued bpobj.
This idea and mechanism are similar to how we handle "sub-subobj's".
When including a sub-bpobj by reference, if the sub-bpobj itself has
less than a block of sub-sub-bpobj's, the list of sub-sub-bpobj's is
copied to the parent bpobj's list of sub-bpobj's.
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Paul Zuchowski <pzuchowski@datto.com>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #8053
Issue #7908
2018-10-31 19:58:17 +03:00
|
|
|
* subobjs to bpo's subobj list directly. This reduces recursion in
|
|
|
|
* bpobj_iterate due to nested subobjs.
|
2010-08-27 01:24:34 +04:00
|
|
|
*/
|
|
|
|
subsubobjs = subbpo.bpo_phys->bpo_subobjs;
|
|
|
|
if (subsubobjs != 0) {
|
bpobj_enqueue_subobj() should copy small subobj's
When we delete a snapshot, we consolidate some bpobj's together because
we no longer need to keep their entries in separate buckets. This is
done in constant time by including the "sub" bpobj by reference in the
parent bpobj.
After many snapshots have been deleted, we may have many sub-bpobj's.
Usually, most sub-bpobj's don't contain many BP's. Compared to this
small payload, the sub-bpobj is relatively heavyweight since it is a
object in the MOS. A common scenario on a long-lived pool is for the
vast majority of MOS objects to be small sub-bpobj's.
To improve this situation, when consolidating bpobj's together,
bpobj_enqueue_subobj() can copy the contents of small bpobj's into the
parent, and then delete the enqueued bpobj, rather than including it by
reference. Since this copying is limited in size (to one block), the
consolidation is still constant time, though with a larger constant due
to reading in the one block of the enqueued bpobj.
This idea and mechanism are similar to how we handle "sub-subobj's".
When including a sub-bpobj by reference, if the sub-bpobj itself has
less than a block of sub-sub-bpobj's, the list of sub-sub-bpobj's is
copied to the parent bpobj's list of sub-bpobj's.
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Paul Zuchowski <pzuchowski@datto.com>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #8053
Issue #7908
2018-10-31 19:58:17 +03:00
|
|
|
VERIFY0(dmu_object_info(bpo->bpo_os, subsubobjs, &doi));
|
|
|
|
if (doi.doi_max_offset > doi.doi_data_block_size) {
|
|
|
|
copy_subsub = B_FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If, in addition to having only one block of subobj's, subobj has
|
|
|
|
* only one block of bp's, then move subobj's bp's to bpo's bp list
|
|
|
|
* directly. This reduces recursion in bpobj_iterate due to nested
|
|
|
|
* subobjs.
|
|
|
|
*/
|
|
|
|
VERIFY3U(0, ==, dmu_object_info(bpo->bpo_os, subobj, &doi));
|
|
|
|
if (doi.doi_max_offset > doi.doi_data_block_size || !copy_subsub) {
|
|
|
|
copy_bps = B_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (copy_subsub && subsubobjs != 0) {
|
|
|
|
dmu_buf_t *subdb;
|
|
|
|
uint64_t numsubsub = subbpo.bpo_phys->bpo_num_subobjs;
|
|
|
|
|
|
|
|
VERIFY0(dmu_buf_hold(bpo->bpo_os, subsubobjs,
|
|
|
|
0, FTAG, &subdb, 0));
|
|
|
|
/*
|
|
|
|
* Make sure that we are not asking dmu_write()
|
|
|
|
* to write more data than we have in our buffer.
|
|
|
|
*/
|
|
|
|
VERIFY3U(subdb->db_size, >=,
|
|
|
|
numsubsub * sizeof (subobj));
|
|
|
|
if (bpo->bpo_phys->bpo_subobjs == 0) {
|
|
|
|
bpo->bpo_phys->bpo_subobjs =
|
|
|
|
dmu_object_alloc(bpo->bpo_os,
|
|
|
|
DMU_OT_BPOBJ_SUBOBJ, SPA_OLD_MAXBLOCKSIZE,
|
|
|
|
DMU_OT_NONE, 0, tx);
|
2010-08-27 01:24:34 +04:00
|
|
|
}
|
bpobj_enqueue_subobj() should copy small subobj's
When we delete a snapshot, we consolidate some bpobj's together because
we no longer need to keep their entries in separate buckets. This is
done in constant time by including the "sub" bpobj by reference in the
parent bpobj.
After many snapshots have been deleted, we may have many sub-bpobj's.
Usually, most sub-bpobj's don't contain many BP's. Compared to this
small payload, the sub-bpobj is relatively heavyweight since it is a
object in the MOS. A common scenario on a long-lived pool is for the
vast majority of MOS objects to be small sub-bpobj's.
To improve this situation, when consolidating bpobj's together,
bpobj_enqueue_subobj() can copy the contents of small bpobj's into the
parent, and then delete the enqueued bpobj, rather than including it by
reference. Since this copying is limited in size (to one block), the
consolidation is still constant time, though with a larger constant due
to reading in the one block of the enqueued bpobj.
This idea and mechanism are similar to how we handle "sub-subobj's".
When including a sub-bpobj by reference, if the sub-bpobj itself has
less than a block of sub-sub-bpobj's, the list of sub-sub-bpobj's is
copied to the parent bpobj's list of sub-bpobj's.
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Paul Zuchowski <pzuchowski@datto.com>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #8053
Issue #7908
2018-10-31 19:58:17 +03:00
|
|
|
dmu_write(bpo->bpo_os, bpo->bpo_phys->bpo_subobjs,
|
|
|
|
bpo->bpo_phys->bpo_num_subobjs * sizeof (subobj),
|
|
|
|
numsubsub * sizeof (subobj), subdb->db_data, tx);
|
|
|
|
dmu_buf_rele(subdb, FTAG);
|
|
|
|
bpo->bpo_phys->bpo_num_subobjs += numsubsub;
|
|
|
|
|
|
|
|
dmu_buf_will_dirty(subbpo.bpo_dbuf, tx);
|
|
|
|
subbpo.bpo_phys->bpo_subobjs = 0;
|
|
|
|
VERIFY0(dmu_object_free(bpo->bpo_os, subsubobjs, tx));
|
2010-08-27 01:24:34 +04:00
|
|
|
}
|
bpobj_enqueue_subobj() should copy small subobj's
When we delete a snapshot, we consolidate some bpobj's together because
we no longer need to keep their entries in separate buckets. This is
done in constant time by including the "sub" bpobj by reference in the
parent bpobj.
After many snapshots have been deleted, we may have many sub-bpobj's.
Usually, most sub-bpobj's don't contain many BP's. Compared to this
small payload, the sub-bpobj is relatively heavyweight since it is a
object in the MOS. A common scenario on a long-lived pool is for the
vast majority of MOS objects to be small sub-bpobj's.
To improve this situation, when consolidating bpobj's together,
bpobj_enqueue_subobj() can copy the contents of small bpobj's into the
parent, and then delete the enqueued bpobj, rather than including it by
reference. Since this copying is limited in size (to one block), the
consolidation is still constant time, though with a larger constant due
to reading in the one block of the enqueued bpobj.
This idea and mechanism are similar to how we handle "sub-subobj's".
When including a sub-bpobj by reference, if the sub-bpobj itself has
less than a block of sub-sub-bpobj's, the list of sub-sub-bpobj's is
copied to the parent bpobj's list of sub-bpobj's.
Reviewed-by: Serapheim Dimitropoulos <serapheim@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Paul Zuchowski <pzuchowski@datto.com>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #8053
Issue #7908
2018-10-31 19:58:17 +03:00
|
|
|
|
|
|
|
if (copy_bps) {
|
|
|
|
dmu_buf_t *bps;
|
|
|
|
uint64_t numbps = subbpo.bpo_phys->bpo_num_blkptrs;
|
|
|
|
|
|
|
|
ASSERT(copy_subsub);
|
|
|
|
VERIFY0(dmu_buf_hold(bpo->bpo_os, subobj,
|
|
|
|
0, FTAG, &bps, 0));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Make sure that we are not asking dmu_write()
|
|
|
|
* to write more data than we have in our buffer.
|
|
|
|
*/
|
|
|
|
VERIFY3U(bps->db_size, >=, numbps * sizeof (blkptr_t));
|
|
|
|
dmu_write(bpo->bpo_os, bpo->bpo_object,
|
|
|
|
bpo->bpo_phys->bpo_num_blkptrs * sizeof (blkptr_t),
|
|
|
|
numbps * sizeof (blkptr_t),
|
|
|
|
bps->db_data, tx);
|
|
|
|
dmu_buf_rele(bps, FTAG);
|
|
|
|
bpo->bpo_phys->bpo_num_blkptrs += numbps;
|
|
|
|
|
|
|
|
bpobj_close(&subbpo);
|
|
|
|
VERIFY0(dmu_object_free(bpo->bpo_os, subobj, tx));
|
|
|
|
} else {
|
|
|
|
bpobj_close(&subbpo);
|
|
|
|
if (bpo->bpo_phys->bpo_subobjs == 0) {
|
|
|
|
bpo->bpo_phys->bpo_subobjs =
|
|
|
|
dmu_object_alloc(bpo->bpo_os,
|
|
|
|
DMU_OT_BPOBJ_SUBOBJ, SPA_OLD_MAXBLOCKSIZE,
|
|
|
|
DMU_OT_NONE, 0, tx);
|
|
|
|
}
|
|
|
|
|
|
|
|
dmu_write(bpo->bpo_os, bpo->bpo_phys->bpo_subobjs,
|
|
|
|
bpo->bpo_phys->bpo_num_subobjs * sizeof (subobj),
|
|
|
|
sizeof (subobj), &subobj, tx);
|
|
|
|
bpo->bpo_phys->bpo_num_subobjs++;
|
|
|
|
}
|
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
bpo->bpo_phys->bpo_bytes += used;
|
|
|
|
bpo->bpo_phys->bpo_comp += comp;
|
|
|
|
bpo->bpo_phys->bpo_uncomp += uncomp;
|
|
|
|
mutex_exit(&bpo->bpo_lock);
|
2010-08-27 01:24:34 +04:00
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
bpobj_enqueue(bpobj_t *bpo, const blkptr_t *bp, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
blkptr_t stored_bp = *bp;
|
|
|
|
uint64_t offset;
|
|
|
|
int blkoff;
|
|
|
|
blkptr_t *bparray;
|
|
|
|
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
ASSERT(bpobj_is_open(bpo));
|
2010-05-29 00:45:14 +04:00
|
|
|
ASSERT(!BP_IS_HOLE(bp));
|
2012-12-24 03:57:14 +04:00
|
|
|
ASSERT(bpo->bpo_object != dmu_objset_pool(bpo->bpo_os)->dp_empty_bpobj);
|
2010-05-29 00:45:14 +04:00
|
|
|
|
2014-06-06 01:19:08 +04:00
|
|
|
if (BP_IS_EMBEDDED(bp)) {
|
|
|
|
/*
|
|
|
|
* The bpobj will compress better without the payload.
|
|
|
|
*
|
|
|
|
* Note that we store EMBEDDED bp's because they have an
|
|
|
|
* uncompressed size, which must be accounted for. An
|
|
|
|
* alternative would be to add their size to bpo_uncomp
|
|
|
|
* without storing the bp, but that would create additional
|
|
|
|
* complications: bpo_uncomp would be inconsistent with the
|
|
|
|
* set of BP's stored, and bpobj_iterate() wouldn't visit
|
|
|
|
* all the space accounted for in the bpobj.
|
|
|
|
*/
|
|
|
|
bzero(&stored_bp, sizeof (stored_bp));
|
|
|
|
stored_bp.blk_prop = bp->blk_prop;
|
|
|
|
stored_bp.blk_birth = bp->blk_birth;
|
|
|
|
} else if (!BP_GET_DEDUP(bp)) {
|
|
|
|
/* The bpobj will compress better without the checksum */
|
|
|
|
bzero(&stored_bp.blk_cksum, sizeof (stored_bp.blk_cksum));
|
|
|
|
}
|
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
/* We never need the fill count. */
|
|
|
|
stored_bp.blk_fill = 0;
|
|
|
|
|
|
|
|
mutex_enter(&bpo->bpo_lock);
|
|
|
|
|
|
|
|
offset = bpo->bpo_phys->bpo_num_blkptrs * sizeof (stored_bp);
|
|
|
|
blkoff = P2PHASE(bpo->bpo_phys->bpo_num_blkptrs, bpo->bpo_epb);
|
|
|
|
|
|
|
|
if (bpo->bpo_cached_dbuf == NULL ||
|
|
|
|
offset < bpo->bpo_cached_dbuf->db_offset ||
|
|
|
|
offset >= bpo->bpo_cached_dbuf->db_offset +
|
|
|
|
bpo->bpo_cached_dbuf->db_size) {
|
|
|
|
if (bpo->bpo_cached_dbuf)
|
|
|
|
dmu_buf_rele(bpo->bpo_cached_dbuf, bpo);
|
|
|
|
VERIFY3U(0, ==, dmu_buf_hold(bpo->bpo_os, bpo->bpo_object,
|
|
|
|
offset, bpo, &bpo->bpo_cached_dbuf, 0));
|
|
|
|
}
|
|
|
|
|
|
|
|
dmu_buf_will_dirty(bpo->bpo_cached_dbuf, tx);
|
|
|
|
bparray = bpo->bpo_cached_dbuf->db_data;
|
|
|
|
bparray[blkoff] = stored_bp;
|
|
|
|
|
|
|
|
dmu_buf_will_dirty(bpo->bpo_dbuf, tx);
|
|
|
|
bpo->bpo_phys->bpo_num_blkptrs++;
|
|
|
|
bpo->bpo_phys->bpo_bytes +=
|
|
|
|
bp_get_dsize_sync(dmu_objset_spa(bpo->bpo_os), bp);
|
|
|
|
if (bpo->bpo_havecomp) {
|
|
|
|
bpo->bpo_phys->bpo_comp += BP_GET_PSIZE(bp);
|
|
|
|
bpo->bpo_phys->bpo_uncomp += BP_GET_UCSIZE(bp);
|
|
|
|
}
|
|
|
|
mutex_exit(&bpo->bpo_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct space_range_arg {
|
|
|
|
spa_t *spa;
|
|
|
|
uint64_t mintxg;
|
|
|
|
uint64_t maxtxg;
|
|
|
|
uint64_t used;
|
|
|
|
uint64_t comp;
|
|
|
|
uint64_t uncomp;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* ARGSUSED */
|
|
|
|
static int
|
|
|
|
space_range_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
|
|
|
|
{
|
|
|
|
struct space_range_arg *sra = arg;
|
|
|
|
|
|
|
|
if (bp->blk_birth > sra->mintxg && bp->blk_birth <= sra->maxtxg) {
|
2011-11-17 22:14:36 +04:00
|
|
|
if (dsl_pool_sync_context(spa_get_dsl(sra->spa)))
|
|
|
|
sra->used += bp_get_dsize_sync(sra->spa, bp);
|
|
|
|
else
|
|
|
|
sra->used += bp_get_dsize(sra->spa, bp);
|
2010-05-29 00:45:14 +04:00
|
|
|
sra->comp += BP_GET_PSIZE(bp);
|
|
|
|
sra->uncomp += BP_GET_UCSIZE(bp);
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
bpobj_space(bpobj_t *bpo, uint64_t *usedp, uint64_t *compp, uint64_t *uncompp)
|
|
|
|
{
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
ASSERT(bpobj_is_open(bpo));
|
2010-05-29 00:45:14 +04:00
|
|
|
mutex_enter(&bpo->bpo_lock);
|
|
|
|
|
|
|
|
*usedp = bpo->bpo_phys->bpo_bytes;
|
|
|
|
if (bpo->bpo_havecomp) {
|
|
|
|
*compp = bpo->bpo_phys->bpo_comp;
|
|
|
|
*uncompp = bpo->bpo_phys->bpo_uncomp;
|
|
|
|
mutex_exit(&bpo->bpo_lock);
|
|
|
|
return (0);
|
|
|
|
} else {
|
|
|
|
mutex_exit(&bpo->bpo_lock);
|
|
|
|
return (bpobj_space_range(bpo, 0, UINT64_MAX,
|
|
|
|
usedp, compp, uncompp));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the amount of space in the bpobj which is:
|
|
|
|
* mintxg < blk_birth <= maxtxg
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
bpobj_space_range(bpobj_t *bpo, uint64_t mintxg, uint64_t maxtxg,
|
|
|
|
uint64_t *usedp, uint64_t *compp, uint64_t *uncompp)
|
|
|
|
{
|
|
|
|
struct space_range_arg sra = { 0 };
|
|
|
|
int err;
|
|
|
|
|
OpenZFS 7614, 9064 - zfs device evacuation/removal
OpenZFS 7614 - zfs device evacuation/removal
OpenZFS 9064 - remove_mirror should wait for device removal to complete
This project allows top-level vdevs to be removed from the storage pool
with "zpool remove", reducing the total amount of storage in the pool.
This operation copies all allocated regions of the device to be removed
onto other devices, recording the mapping from old to new location.
After the removal is complete, read and free operations to the removed
(now "indirect") vdev must be remapped and performed at the new location
on disk. The indirect mapping table is kept in memory whenever the pool
is loaded, so there is minimal performance overhead when doing operations
on the indirect vdev.
The size of the in-memory mapping table will be reduced when its entries
become "obsolete" because they are no longer used by any block pointers
in the pool. An entry becomes obsolete when all the blocks that use
it are freed. An entry can also become obsolete when all the snapshots
that reference it are deleted, and the block pointers that reference it
have been "remapped" in all filesystems/zvols (and clones). Whenever an
indirect block is written, all the block pointers in it will be "remapped"
to their new (concrete) locations if possible. This process can be
accelerated by using the "zfs remap" command to proactively rewrite all
indirect blocks that reference indirect (removed) vdevs.
Note that when a device is removed, we do not verify the checksum of
the data that is copied. This makes the process much faster, but if it
were used on redundant vdevs (i.e. mirror or raidz vdevs), it would be
possible to copy the wrong data, when we have the correct data on e.g.
the other side of the mirror.
At the moment, only mirrors and simple top-level vdevs can be removed
and no removal is allowed if any of the top-level vdevs are raidz.
Porting Notes:
* Avoid zero-sized kmem_alloc() in vdev_compact_children().
The device evacuation code adds a dependency that
vdev_compact_children() be able to properly empty the vdev_child
array by setting it to NULL and zeroing vdev_children. Under Linux,
kmem_alloc() and related functions return a sentinel pointer rather
than NULL for zero-sized allocations.
* Remove comment regarding "mpt" driver where zfs_remove_max_segment
is initialized to SPA_MAXBLOCKSIZE.
Change zfs_condense_indirect_commit_entry_delay_ticks to
zfs_condense_indirect_commit_entry_delay_ms for consistency with
most other tunables in which delays are specified in ms.
* ZTS changes:
Use set_tunable rather than mdb
Use zpool sync as appropriate
Use sync_pool instead of sync
Kill jobs during test_removal_with_operation to allow unmount/export
Don't add non-disk names such as "mirror" or "raidz" to $DISKS
Use $TEST_BASE_DIR instead of /tmp
Increase HZ from 100 to 1000 which is more common on Linux
removal_multiple_indirection.ksh
Reduce iterations in order to not time out on the code
coverage builders.
removal_resume_export:
Functionally, the test case is correct but there exists a race
where the kernel thread hasn't been fully started yet and is
not visible. Wait for up to 1 second for the removal thread
to be started before giving up on it. Also, increase the
amount of data copied in order that the removal not finish
before the export has a chance to fail.
* MMP compatibility, the concept of concrete versus non-concrete devices
has slightly changed the semantics of vdev_writeable(). Update
mmp_random_leaf_impl() accordingly.
* Updated dbuf_remap() to handle the org.zfsonlinux:large_dnode pool
feature which is not supported by OpenZFS.
* Added support for new vdev removal tracepoints.
* Test cases removal_with_zdb and removal_condense_export have been
intentionally disabled. When run manually they pass as intended,
but when running in the automated test environment they produce
unreliable results on the latest Fedora release.
They may work better once the upstream pool import refectoring is
merged into ZoL at which point they will be re-enabled.
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: Alex Reece <alex@delphix.com>
Reviewed-by: George Wilson <george.wilson@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Reviewed by: Tim Chase <tim@chase2k.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Garrett D'Amore <garrett@damore.org>
Ported-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Tim Chase <tim@chase2k.com>
OpenZFS-issue: https://www.illumos.org/issues/7614
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/f539f1eb
Closes #6900
2016-09-22 19:30:13 +03:00
|
|
|
ASSERT(bpobj_is_open(bpo));
|
|
|
|
|
2010-05-29 00:45:14 +04:00
|
|
|
/*
|
|
|
|
* As an optimization, if they want the whole txg range, just
|
|
|
|
* get bpo_bytes rather than iterating over the bps.
|
|
|
|
*/
|
|
|
|
if (mintxg < TXG_INITIAL && maxtxg == UINT64_MAX && bpo->bpo_havecomp)
|
|
|
|
return (bpobj_space(bpo, usedp, compp, uncompp));
|
|
|
|
|
|
|
|
sra.spa = dmu_objset_spa(bpo->bpo_os);
|
|
|
|
sra.mintxg = mintxg;
|
|
|
|
sra.maxtxg = maxtxg;
|
|
|
|
|
|
|
|
err = bpobj_iterate_nofree(bpo, space_range_cb, &sra, NULL);
|
|
|
|
*usedp = sra.used;
|
|
|
|
*compp = sra.comp;
|
|
|
|
*uncompp = sra.uncomp;
|
|
|
|
return (err);
|
|
|
|
}
|