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

Clarify error messages when activation fails due to activation filter use.

Browse Source
This commit is contained in:
Peter Rajnoha 2010-11-05 18:18:11 +00:00
parent e40d44be8d
commit f7e3a19f75
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.76 -
===================================
Clarify error messages when activation fails due to activation filter use.
Add initial script VolumeGroup.ocf for pacemaker support.
Fix regex optimiser not to ignore RHS of OR nodes in _find_leftmost_common.
Fix handling of online filesystem resize (using new fsadm return code).

13
lib/activate/activate.c
View File

@ -285,12 +285,12 @@ static int _passes_activation_filter(struct cmd_context *cmd,
/* Don't activate */
return 0;
}
for (cv = cn->v; cv; cv = cv->next) {
else
log_verbose("activation/volume_list configuration setting "
"defined, checking the list to match %s/%s",
lv->vg->name, lv->name);
for (cv = cn->v; cv; cv = cv->next) {
if (cv->type != CFG_STRING) {
log_error("Ignoring invalid string in config file "
"activation/volume_list");
@ -303,6 +303,7 @@ static int _passes_activation_filter(struct cmd_context *cmd,
continue;
}
/* Tag? */
if (*str == '@') {
str++;
@ -1239,8 +1240,8 @@ int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s,
goto out;
if (!_passes_activation_filter(cmd, lv)) {
log_verbose("Not activating %s/%s due to config file settings",
lv->vg->name, lv->name);
log_verbose("Not activating %s/%s since it does not pass "
"activation filter.", lv->vg->name, lv->name);
*activate_lv = 0;
} else
*activate_lv = 1;
@ -1266,8 +1267,8 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
goto out;
if (filter && !_passes_activation_filter(cmd, lv)) {
log_verbose("Not activating %s/%s due to config file settings",
lv->vg->name, lv->name);
log_error("Not activating %s/%s since it does not pass "
"activation filter.", lv->vg->name, lv->name);
goto out;
}

7
lib/metadata/lv_manip.c
View File

@ -3240,12 +3240,9 @@ int lv_create_single(struct volume_group *vg,
goto revert_new_lv;
}
} else if (!activate_lv(cmd, lv)) {
if (lp->zero) {
log_error("Aborting. Failed to activate new LV to wipe "
"the start of it.");
goto deactivate_and_revert_new_lv;
}
log_error("Failed to activate new LV.");
if (lp->zero)
goto deactivate_and_revert_new_lv;
return 0;
}