mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
reinstate: commit 82d83a01ce
It now works as supposed. The source of the problem is fixed by previous commit d2d6a9da52e04f28e1916bcea3f9fda356b6df29.
This commit is contained in:
parent
008c33a21b
commit
3b51f298bb
@ -1,5 +1,6 @@
|
||||
Version 2.02.101 -
|
||||
===================================
|
||||
Refresh existing VG before autoactivation (event retrigger/device reappeared).
|
||||
Use pvscan -b in udev rules to avoid a deadlock on udev process count limit.
|
||||
Add pvscan -b/--background for the command to be processed in the background.
|
||||
Don't assume stdin file descriptor is readable.
|
||||
|
@ -98,6 +98,7 @@ static int _auto_activation_handler(struct cmd_context *cmd,
|
||||
struct volume_group *vg;
|
||||
int consistent = 0;
|
||||
struct id vgid_raw;
|
||||
int r = 0;
|
||||
|
||||
/* TODO: add support for partial and clustered VGs */
|
||||
if (partial)
|
||||
@ -106,24 +107,29 @@ static int _auto_activation_handler(struct cmd_context *cmd,
|
||||
if (!id_read_format(&vgid_raw, vgid))
|
||||
return_0;
|
||||
|
||||
/* NB. This is safe because we know lvmetad is running and we won't hit
|
||||
* disk. */
|
||||
/* NB. This is safe because we know lvmetad is running and we won't hit disk. */
|
||||
if (!(vg = vg_read_internal(cmd, NULL, (const char *) &vgid_raw, 0, &consistent)))
|
||||
return 1;
|
||||
|
||||
if (vg_is_clustered(vg)) {
|
||||
release_vg(vg);
|
||||
return 1;
|
||||
r = 1; goto out;
|
||||
}
|
||||
|
||||
if (!vg_refresh_visible(vg->cmd, vg)) {
|
||||
log_error("%s: refresh before autoactivation failed.", vg->name);
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!vgchange_activate(vg->cmd, vg, activate)) {
|
||||
log_error("%s: autoactivation failed.", vg->name);
|
||||
release_vg(vg);
|
||||
return 0;
|
||||
goto out;
|
||||
}
|
||||
|
||||
r = 1;
|
||||
|
||||
out:
|
||||
release_vg(vg);
|
||||
return 1;
|
||||
return r;
|
||||
}
|
||||
|
||||
static int _pvscan_lvmetad(struct cmd_context *cmd, int argc, char **argv)
|
||||
|
Loading…
Reference in New Issue
Block a user