shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Refactor pvcreate - move uuid and restorefile options.

Browse Source
This commit is contained in:
Dave Wysochanski 2008-07-25 00:30:57 +00:00
parent 495a551e06
commit 1a02e2e43b
2 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/t-pvcreate-operation.sh
View File

@ -91,8 +91,8 @@ test_expect_failure \
test_expect_success \
'pvcreate rejects uuid already in use' \
'pvcreate --uuid freddy-fred-fred-fred-fred-fred-freddy $d1 &&
pvcreate --uuid freddy-fred-fred-fred-fred-fred-freddy $d2;
'pvcreate --uuid $uuid1 $d1 &&
pvcreate --uuid $uuid1 $d2;
status=$?; echo status=$status; test $status != 0'
test_expect_success \

83
tools/pvcreate.c
View File

@ -22,6 +22,12 @@ struct pvcreate_params {
int pvmetadatacopies;
uint64_t pvmetadatasize;
int64_t labelsector;
struct id id; /* FIXME: redundant */
struct id *idp;
uint64_t pe_start;
uint32_t extent_count;
uint32_t extent_size;
const char *restorefile;
};
const char _really_init[] =
@ -138,47 +144,16 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
{
struct pvcreate_params *pp = (struct pvcreate_params *) handle;
void *pv;
void *existing_pv;
struct id id, *idp = NULL;
const char *uuid = NULL;
struct device *dev;
struct list mdas;
struct volume_group *vg;
const char *restorefile;
uint64_t pe_start = 0;
uint32_t extent_count = 0, extent_size = 0;
if (arg_count(cmd, uuidstr_ARG)) {
uuid = arg_str_value(cmd, uuidstr_ARG, "");
if (!id_read_format(&id, uuid))
return EINVALID_CMD_LINE;
if ((dev = device_from_pvid(cmd, &id)) &&
if (pp->idp) {
if ((dev = device_from_pvid(cmd, pp->idp)) &&
(dev != dev_cache_get(pv_name, cmd->filter))) {
log_error("uuid %s already in use on \"%s\"", uuid,
dev_name(dev));
log_error("uuid %s already in use on \"%s\"",
pp->idp->uuid, dev_name(dev));
return ECMD_FAILED;
}
idp = &id;
}
if (arg_count(cmd, restorefile_ARG)) {
restorefile = arg_str_value(cmd, restorefile_ARG, "");
/* The uuid won't already exist */
init_partial(1);
if (!(vg = backup_read_vg(cmd, NULL, restorefile))) {
log_error("Unable to read volume group from %s",
restorefile);
return ECMD_FAILED;
}
init_partial(0);
if (!(existing_pv = find_pv_in_vg_by_uuid(vg, idp))) {
log_error("Can't find uuid %s in backup file %s",
uuid, restorefile);
return ECMD_FAILED;
}
pe_start = pv_pe_start(existing_pv);
extent_size = pv_pe_size(existing_pv);
extent_count = pv_pe_count(existing_pv);
}
if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) {
@ -199,8 +174,9 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
}
list_init(&mdas);
if (!(pv = pv_create(cmd, dev, idp, pp->size, pe_start,
extent_count, extent_size, pp->pvmetadatacopies,
if (!(pv = pv_create(cmd, dev, pp->idp, pp->size, pp->pe_start,
pp->extent_count, pp->extent_size,
pp->pvmetadatacopies,
pp->pvmetadatasize,&mdas))) {
log_error("Failed to setup physical volume \"%s\"", pv_name);
goto error;
@ -261,6 +237,12 @@ static int pvcreate_validate_params(struct cmd_context *cmd,
int argc, char **argv,
struct pvcreate_params *pp)
{
const char *uuid = NULL;
void *existing_pv;
struct volume_group *vg;
memset(pp, 0, sizeof(*pp));
if (!argc) {
log_error("Please enter a physical volume path");
return 0;
@ -276,6 +258,33 @@ static int pvcreate_validate_params(struct cmd_context *cmd,
return 0;
}
if (arg_count(cmd, uuidstr_ARG)) {
uuid = arg_str_value(cmd, uuidstr_ARG, "");
if (!id_read_format(&pp->id, uuid))
return 0;
pp->idp = &pp->id;
}
if (arg_count(cmd, restorefile_ARG)) {
pp->restorefile = arg_str_value(cmd, restorefile_ARG, "");
/* The uuid won't already exist */
init_partial(1);
if (!(vg = backup_read_vg(cmd, NULL, pp->restorefile))) {
log_error("Unable to read volume group from %s",
pp->restorefile);
return 0;
}
init_partial(0);
if (!(existing_pv = find_pv_in_vg_by_uuid(vg, pp->idp))) {
log_error("Can't find uuid %s in backup file %s",
uuid, pp->restorefile);
return 0;
}
pp->pe_start = pv_pe_start(existing_pv);
pp->extent_size = pv_pe_size(existing_pv);
pp->extent_count = pv_pe_count(existing_pv);
}
if (arg_count(cmd, yes_ARG) && !arg_count(cmd, force_ARG)) {
log_error("Option y can only be given with option f");
return 0;