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

metadata: vg_validate lock_args

Browse Source
This commit is contained in:
David Teigland 2015-07-09 13:24:28 -05:00
parent 6294509cc6
commit 841c3478fd
1 changed files with 84 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
lib/metadata/metadata.c
View File

@ -2484,6 +2484,75 @@ static int _lv_validate_references_single(struct logical_volume *lv, void *data)
return r; return r;
} }
/*
* Format is <version>:<info>
*/
static int _validate_lock_args_chars(const char *lock_args)
{
int i;
char c;
int found_colon = 0;
int r = 1;
for (i = 0; i < strlen(lock_args); i++) {
c = lock_args[i];
if (!isalnum(c) && c != '.' && c != '_' && c != '-' && c != '+' && c != ':') {
log_error(INTERNAL_ERROR "Invalid character at index %d of lock_args \"%s\"",
i, lock_args);
r = 0;
}
if (c == ':' && found_colon) {
log_error(INTERNAL_ERROR "Invalid colon at index %d of lock_args \"%s\"",
i, lock_args);
r = 0;
}
if (c == ':')
found_colon = 1;
}
return r;
}
static int _validate_vg_lock_args(struct volume_group *vg)
{
if (!_validate_lock_args_chars(vg->lock_args)) {
log_error(INTERNAL_ERROR "VG %s has invalid lock_args chars", vg->name);
return 0;
}
return 1;
}
/*
* For lock_type sanlock, LV lock_args are <version>:<info>
* For lock_type dlm, LV lock_args are not used, and lock_args is
* just set to "dlm".
*/
static int _validate_lv_lock_args(struct logical_volume *lv)
{
int r = 1;
if (!strcmp(lv->vg->lock_type, "sanlock")) {
if (!_validate_lock_args_chars(lv->lock_args)) {
log_error(INTERNAL_ERROR "LV %s/%s has invalid lock_args chars",
lv->vg->name, display_lvname(lv));
return 0;
}
} else if (!strcmp(lv->vg->lock_type, "dlm")) {
if (strcmp(lv->lock_args, "dlm")) {
log_error(INTERNAL_ERROR "LV %s/%s has invalid lock_args \"%s\"",
lv->vg->name, display_lvname(lv), lv->lock_args);
r = 0;
}
}
return r;
}
int vg_validate(struct volume_group *vg) int vg_validate(struct volume_group *vg)
{ {
struct pv_list *pvl; struct pv_list *pvl;
@ -2829,6 +2898,9 @@ int vg_validate(struct volume_group *vg)
vg->name, vg->lock_type); vg->name, vg->lock_type);
r = 0; r = 0;
} }
if (!vg->skip_validate_lock_args && !_validate_vg_lock_args(vg))
r = 0;
} else { } else {
if (vg->lock_args) { if (vg->lock_args) {
log_error(INTERNAL_ERROR "VG %s has lock_args %s without lock_type", log_error(INTERNAL_ERROR "VG %s has lock_args %s without lock_type",
@ -2840,13 +2912,22 @@ int vg_validate(struct volume_group *vg)
dm_list_iterate_items(lvl, &vg->lvs) { dm_list_iterate_items(lvl, &vg->lvs) {
if (is_lockd_type(vg->lock_type)) { if (is_lockd_type(vg->lock_type)) {
if (lockd_lv_uses_lock(lvl->lv)) { if (lockd_lv_uses_lock(lvl->lv)) {
if (vg->skip_validate_lock_args) { if (vg->skip_validate_lock_args)
continue; continue;
} else if (!lvl->lv->lock_args) {
if (!lvl->lv->lock_args) {
log_error(INTERNAL_ERROR "LV %s/%s missing lock_args", log_error(INTERNAL_ERROR "LV %s/%s missing lock_args",
vg->name, lvl->lv->name); vg->name, lvl->lv->name);
r = 0; r = 0;
} else if (!strcmp(vg->lock_type, "sanlock")) { continue;
}
if (!_validate_lv_lock_args(lvl->lv)) {
r = 0;
continue;
}
if (!strcmp(vg->lock_type, "sanlock")) {
if (dm_hash_lookup(vhash.lv_lock_args, lvl->lv->lock_args)) { if (dm_hash_lookup(vhash.lv_lock_args, lvl->lv->lock_args)) {
log_error(INTERNAL_ERROR "LV %s/%s has duplicate lock_args %s.", log_error(INTERNAL_ERROR "LV %s/%s has duplicate lock_args %s.",
vg->name, lvl->lv->name, lvl->lv->lock_args); vg->name, lvl->lv->name, lvl->lv->lock_args);
@ -2858,10 +2939,6 @@ int vg_validate(struct volume_group *vg)
r = 0; r = 0;
} }
} else if (!strcmp(vg->lock_type, "dlm") && strcmp(lvl->lv->lock_args, "dlm")) {
log_error(INTERNAL_ERROR "LV %s/%s bad dlm lock_args %s",
vg->name, lvl->lv->name, lvl->lv->lock_args);
r = 0;
} }
} else { } else {
if (lvl->lv->lock_args) { if (lvl->lv->lock_args) {