shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Refactor pvcreate - divide parameter parsing & validation from create logic.

Browse Source 
Move size (setphysicalvolumesize option), metadatacopies and metadatasize
validation.
This commit is contained in:
Dave Wysochanski 2008-07-21 19:27:22 +00:00
parent 57376069bd
commit 7d400bc787
1 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
tools/pvcreate.c
View File

@ -18,6 +18,9 @@
struct pvcreate_params { struct pvcreate_params {
int zero; int zero;
uint64_t size;
int pvmetadatacopies;
uint64_t pvmetadatasize;
}; };
const char _really_init[] = const char _really_init[] =
@ -142,11 +145,8 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
void *existing_pv; void *existing_pv;
struct id id, *idp = NULL; struct id id, *idp = NULL;
const char *uuid = NULL; const char *uuid = NULL;
uint64_t size = 0;
struct device *dev; struct device *dev;
struct list mdas; struct list mdas;
int pvmetadatacopies;
uint64_t pvmetadatasize;
struct volume_group *vg; struct volume_group *vg;
const char *restorefile; const char *restorefile;
uint64_t pe_start = 0; uint64_t pe_start = 0;
@ -196,28 +196,6 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
if (sigint_caught()) if (sigint_caught())
goto error; goto error;
if (arg_sign_value(cmd, physicalvolumesize_ARG, 0) == SIGN_MINUS) {
log_error("Physical volume size may not be negative");
goto error;
}
size = arg_uint64_value(cmd, physicalvolumesize_ARG, UINT64_C(0));
if (arg_sign_value(cmd, metadatasize_ARG, 0) == SIGN_MINUS) {
log_error("Metadata size may not be negative");
goto error;
}
pvmetadatasize = arg_uint64_value(cmd, metadatasize_ARG, UINT64_C(0));
if (!pvmetadatasize)
pvmetadatasize = find_config_tree_int(cmd,
"metadata/pvmetadatasize",
DEFAULT_PVMETADATASIZE);
pvmetadatacopies = arg_int_value(cmd, metadatacopies_ARG, -1);
if (pvmetadatacopies < 0)
pvmetadatacopies = find_config_tree_int(cmd,
"metadata/pvmetadatacopies",
DEFAULT_PVMETADATACOPIES);
if (!(dev = dev_cache_get(pv_name, cmd->filter))) { if (!(dev = dev_cache_get(pv_name, cmd->filter))) {
log_error("%s: Couldn't find device. Check your filters?", log_error("%s: Couldn't find device. Check your filters?",
pv_name); pv_name);
@ -225,9 +203,9 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
} }
list_init(&mdas); list_init(&mdas);
if (!(pv = pv_create(cmd, dev, idp, size, pe_start, if (!(pv = pv_create(cmd, dev, idp, pp->size, pe_start,
extent_count, extent_size, extent_count, extent_size, pp->pvmetadatacopies,
pvmetadatacopies, pvmetadatasize, &mdas))) { pp->pvmetadatasize,&mdas))) {
log_error("Failed to setup physical volume \"%s\"", pv_name); log_error("Failed to setup physical volume \"%s\"", pv_name);
goto error; goto error;
} }
@ -276,13 +254,17 @@ static int pvcreate_single(struct cmd_context *cmd, const char *pv_name,
} }
/* /*
* Intial sanity checking of command-line arguments and fill in parameters * Intial sanity checking of command-line arguments and fill in 'pp' fields.
* for pvcreate command. More comprehensive validation is done in *
* pvcreate_validate_params(). * Input arguments:
* cmd, argc, argv
*
* Output arguments:
* pp: structure allocated by caller, fields written / validated here
*/ */
static int pvcreate_fill_params(struct cmd_context *cmd, static int pvcreate_validate_params(struct cmd_context *cmd,
int argc, char **argv, int argc, char **argv,
struct pvcreate_params *pp) struct pvcreate_params *pp)
{ {
if (!argc) { if (!argc) {
log_error("Please enter a physical volume path"); log_error("Please enter a physical volume path");
@ -330,30 +312,43 @@ static int pvcreate_fill_params(struct cmd_context *cmd,
else else
pp->zero = 1; pp->zero = 1;
if (arg_sign_value(cmd, physicalvolumesize_ARG, 0) == 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_sign_value(cmd, metadatasize_ARG, 0) == SIGN_MINUS) {
log_error("Metadata size may not be negative");
return 0;
}
pp->pvmetadatasize = arg_uint64_value(cmd, metadatasize_ARG, UINT64_C(0));
if (!pp->pvmetadatasize)
pp->pvmetadatasize = find_config_tree_int(cmd,
"metadata/pvmetadatasize",
DEFAULT_PVMETADATASIZE);
pp->pvmetadatacopies = arg_int_value(cmd, metadatacopies_ARG, -1);
if (pp->pvmetadatacopies < 0)
pp->pvmetadatacopies = find_config_tree_int(cmd,
"metadata/pvmetadatacopies",
DEFAULT_PVMETADATACOPIES);
return 1; return 1;
} }
static int pvcreate_validate_params(struct cmd_context *cmd,
struct pvcreate_params *pp)
{
return 1;
}
int pvcreate(struct cmd_context *cmd, int argc, char **argv) int pvcreate(struct cmd_context *cmd, int argc, char **argv)
{ {
int i, r; int i, r;
int ret = ECMD_PROCESSED; int ret = ECMD_PROCESSED;
struct pvcreate_params pp; struct pvcreate_params pp;
if (!pvcreate_fill_params(cmd, argc, argv, &pp)) { if (!pvcreate_validate_params(cmd, argc, argv, &pp)) {
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
if (!pvcreate_validate_params(cmd, &pp)) {
return EINVALID_CMD_LINE;
}
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
r = pvcreate_single(cmd, argv[i], &pp); r = pvcreate_single(cmd, argv[i], &pp);
if (r > ret) if (r > ret)