mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
bf78e55ef3
_pvcreate_check() has two missing requirements:
After refreshing filters there must be a rescan.
(Otherwise the persistent filter may remain empty.)
After wiping a signature, the filters must be refreshed.
(A device that was previously excluded by the filter due to
its signature might now need to be included.)
If several devices are added at once, the repeated scanning isn't
strictly needed, but we can address that later as part of the command
processing restructuring (by grouping the devices).
Replace the new pvcreate code added by commit
54685c20fc "filters: fix regression caused
by commit e80884cd080cad7e10be4588e3493b9000649426"
with this change to _pvcreate_check().
The filter refresh problem dates back to commit
acb4b5e4de "Fix pvcreate device check."
120 lines
3.4 KiB
C
120 lines
3.4 KiB
C
/*
|
|
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
|
|
* Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved.
|
|
*
|
|
* This file is part of LVM2.
|
|
*
|
|
* This copyrighted material is made available to anyone wishing to use,
|
|
* modify, copy, or redistribute it subject to the terms and conditions
|
|
* of the GNU Lesser General Public License v.2.1.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include "tools.h"
|
|
|
|
/*
|
|
* Intial sanity checking of recovery-related command-line arguments.
|
|
* These args are: --restorefile, --uuid, and --physicalvolumesize
|
|
*
|
|
* Output arguments:
|
|
* pp: structure allocated by caller, fields written / validated here
|
|
*/
|
|
static int pvcreate_restore_params_validate(struct cmd_context *cmd,
|
|
int argc, char **argv,
|
|
struct pvcreate_params *pp)
|
|
{
|
|
const char *uuid = NULL;
|
|
struct volume_group *vg;
|
|
struct pv_list *existing_pvl;
|
|
|
|
if (arg_count(cmd, restorefile_ARG) && !arg_count(cmd, uuidstr_ARG)) {
|
|
log_error("--uuid is required with --restorefile");
|
|
return 0;
|
|
}
|
|
|
|
if (!arg_count(cmd, restorefile_ARG) && arg_count(cmd, uuidstr_ARG)) {
|
|
if (!arg_count(cmd, norestorefile_ARG) &&
|
|
find_config_tree_bool(cmd, devices_require_restorefile_with_uuid_CFG, NULL)) {
|
|
log_error("--restorefile is required with --uuid");
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
if (arg_count(cmd, uuidstr_ARG) && argc != 1) {
|
|
log_error("Can only set uuid on one volume at once");
|
|
return 0;
|
|
}
|
|
|
|
if (arg_count(cmd, uuidstr_ARG)) {
|
|
uuid = arg_str_value(cmd, uuidstr_ARG, "");
|
|
if (!id_read_format(&pp->rp.id, uuid))
|
|
return 0;
|
|
pp->rp.idp = &pp->rp.id;
|
|
lvmcache_seed_infos_from_lvmetad(cmd); /* need to check for UUID dups */
|
|
}
|
|
|
|
if (arg_count(cmd, restorefile_ARG)) {
|
|
pp->rp.restorefile = arg_str_value(cmd, restorefile_ARG, "");
|
|
/* The uuid won't already exist */
|
|
if (!(vg = backup_read_vg(cmd, NULL, pp->rp.restorefile))) {
|
|
log_error("Unable to read volume group from %s",
|
|
pp->rp.restorefile);
|
|
return 0;
|
|
}
|
|
if (!(existing_pvl = find_pv_in_vg_by_uuid(vg, pp->rp.idp))) {
|
|
release_vg(vg);
|
|
log_error("Can't find uuid %s in backup file %s",
|
|
uuid, pp->rp.restorefile);
|
|
return 0;
|
|
}
|
|
pp->rp.ba_start = pv_ba_start(existing_pvl->pv);
|
|
pp->rp.ba_size = pv_ba_size(existing_pvl->pv);
|
|
pp->rp.pe_start = pv_pe_start(existing_pvl->pv);
|
|
pp->rp.extent_size = pv_pe_size(existing_pvl->pv);
|
|
pp->rp.extent_count = pv_pe_count(existing_pvl->pv);
|
|
|
|
release_vg(vg);
|
|
}
|
|
|
|
if (arg_sign_value(cmd, physicalvolumesize_ARG, SIGN_NONE) == SIGN_MINUS) {
|
|
log_error("Physical volume size may not be negative");
|
|
return 0;
|
|
}
|
|
pp->size = arg_uint64_value(cmd, physicalvolumesize_ARG, UINT64_C(0));
|
|
|
|
if (arg_count(cmd, restorefile_ARG) || arg_count(cmd, uuidstr_ARG))
|
|
pp->zero = 0;
|
|
return 1;
|
|
}
|
|
|
|
int pvcreate(struct cmd_context *cmd, int argc, char **argv)
|
|
{
|
|
int i;
|
|
int ret = ECMD_PROCESSED;
|
|
struct pvcreate_params pp;
|
|
|
|
pvcreate_params_set_defaults(&pp);
|
|
|
|
if (!pvcreate_restore_params_validate(cmd, argc, argv, &pp)) {
|
|
return EINVALID_CMD_LINE;
|
|
}
|
|
if (!pvcreate_params_validate(cmd, argc, argv, &pp)) {
|
|
return EINVALID_CMD_LINE;
|
|
}
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
if (sigint_caught())
|
|
return_ECMD_FAILED;
|
|
|
|
dm_unescape_colons_and_at_signs(argv[i], NULL, NULL);
|
|
|
|
if (!pvcreate_single(cmd, argv[i], &pp))
|
|
ret = ECMD_FAILED;
|
|
}
|
|
|
|
return ret;
|
|
}
|