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

Add new --sysinit option for vgchange and lvchange.

Browse Source 
A shortcut for --ignorelockingfailure, --ignoremonitoring, --poll n options
and LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES environment variable used all at
once in initialisation scripts (e.g. rc.sysinit or initrd).
This commit is contained in:
Peter Rajnoha 2010-05-06 11:15:55 +00:00
parent 3283f817eb
commit d50c6d4bf5
12 changed files with 61 additions and 20 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.65 -
=================================
Add new --sysinit option for vgchange and lvchange.
Suppress duplicate error messages about read failures and missing devices.
Install plugins to $(libdir)/device-mapper and $(libdir)/lvm2.
Add dm_list_splice() function to join two lists together.

4
lib/locking/locking.c
View File

@ -217,10 +217,8 @@ static void _update_vg_lock_count(const char *resource, uint32_t flags)
* Select a locking type
* type: locking type; if < 0, then read config tree value
*/
int init_locking(int type, struct cmd_context *cmd)
int init_locking(int type, struct cmd_context *cmd, int suppress_messages)
{
int suppress_messages = 0;
if (ignorelockingfailure() && getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES"))
suppress_messages = 1;

2
lib/locking/locking.h
View File

@ -19,7 +19,7 @@
#include "uuid.h"
#include "config.h"
int init_locking(int type, struct cmd_context *cmd);
int init_locking(int type, struct cmd_context *cmd, int suppress_messages);
void fin_locking(void);
void reset_locking(void);
int vg_write_lock_held(void);

2
liblvm/lvm_base.c
View File

@ -50,7 +50,7 @@ lvm_t lvm_init(const char *system_dir)
/* FIXME: locking_type config option needed? */
/* initialize locking */
if (!init_locking(-1, cmd)) {
if (!init_locking(-1, cmd, 0)) {
/* FIXME: use EAGAIN as error code here */
lvm_quit((lvm_t) cmd);
return NULL;

10
man/lvchange.8.in
View File

@ -13,6 +13,7 @@ lvchange \- change attributes of a logical volume
[\-\-ignoremonitoring]
[\-\-monitor {y|n}]
[\-\-poll {y|n}]
[\-\-sysinit]
[\-\-noudevsync]
[\-M|\-\-persistent y|n] [\-\-minor minor]
[\-P|\-\-partial]
@ -71,6 +72,15 @@ process from its last checkpoint. However, it may not be appropriate to
immediately poll a logical volume when it is activated, use \fB--poll
n\fP to defer and then \fB--poll y\fP to restart the process.
.TP
.I \-\-sysinit
Indicates that lvchange(8) is being invoked from early system initialisation
scripts (e.g. rc.sysinit or an initrd), before writeable filesystems are
available. As such, some functionality needs to be disabled and this option
acts as a shortcut which selects an appropriate set of options. Currently
this is equivalent to using \fB--ignorelockingfailure\fP, \fB--ignoremonitoring\fP,
\fB--poll n\fP and setting \fBLVM_SUPPRESS_LOCKING_FAILURE_MESSAGES\fP
environment variable.
.TP
.I \-\-noudevsync
Disable udev synchronisation. The
process will not wait for notification from udev.

10
man/vgchange.8.in
View File

@ -19,6 +19,7 @@ vgchange \- change attributes of a volume group
.RB [ \-h | \-\-help]
.RB [ \-\-ignorelockingfailure]
.RB [ \-\-ignoremonitoring]
.RB [ \-\-sysinit]
.RB [ \-\-noudevsync ]
.RB [ \-l | \-\-logicalvolume
.IR MaxLogicalVolumes ]
@ -96,6 +97,15 @@ process from its last checkpoint. However, it may not be appropriate to
immediately poll a logical volume when it is activated, use \fB--poll
n\fP to defer and then \fB--poll y\fP to restart the process.
.TP
.BR \-\-sysinit
Indicates that vgchange(8) is being invoked from early system initialisation
scripts (e.g. rc.sysinit or an initrd), before writeable filesystems are
available. As such, some functionality needs to be disabled and this option
acts as a shortcut which selects an appropriate set of options. Currently
this is equivalent to using \fB--ignorelockingfailure\fP, \fB--ignoremonitoring\fP,
\fB--poll n\fP and setting \fBLVM_SUPPRESS_LOCKING_FAILURE_MESSAGES\fP
environment variable.
.TP
.BR \-\-noudevsync
Disable udev synchronisation. The
process will not wait for notification from udev.

1
tools/args.h
View File

@ -66,6 +66,7 @@ arg(virtualsize_ARG, '\0', "virtualsize", size_mb_arg, 0)
arg(noudevsync_ARG, '\0', "noudevsync", NULL, 0)
arg(poll_ARG, '\0', "poll", yes_no_arg, 0)
arg(stripes_long_ARG, '\0', "stripes", int_arg, 0)
arg(sysinit_ARG, '\0', "sysinit", NULL, 0)
/* Allow some variations */
arg(resizable_ARG, '\0', "resizable", yes_no_arg, 0)

6
tools/commands.h
View File

@ -80,6 +80,7 @@ xx(lvchange,
"\t[-r|--readahead ReadAheadSectors|auto|none]\n"
"\t[--refresh]\n"
"\t[--resync]\n"
"\t[--sysinit]\n"
"\t[-t|--test]\n"
"\t[-v|--verbose]\n"
"\t[-y|--yes]\n"
@ -90,7 +91,7 @@ xx(lvchange,
ignorelockingfailure_ARG, ignoremonitoring_ARG, major_ARG, minor_ARG,
monitor_ARG, noudevsync_ARG, partial_ARG, permission_ARG, persistent_ARG,
poll_ARG, readahead_ARG, resync_ARG, refresh_ARG, addtag_ARG, deltag_ARG,
test_ARG, yes_ARG)
sysinit_ARG, test_ARG, yes_ARG)
xx(lvconvert,
"Change logical volume layout",
@ -711,6 +712,7 @@ xx(vgchange,
"\t[--poll {y|n}]\n"
"\t[--noudevsync]\n"
"\t[--refresh]\n"
"\t[--sysinit]\n"
"\t[-t|--test]" "\n"
"\t[-u|--uuid] " "\n"
"\t[-v|--verbose] " "\n"
@ -729,7 +731,7 @@ xx(vgchange,
clustered_ARG, deltag_ARG, ignorelockingfailure_ARG, ignoremonitoring_ARG,
logicalvolume_ARG, maxphysicalvolumes_ARG, monitor_ARG, noudevsync_ARG,
partial_ARG, physicalextentsize_ARG, poll_ARG, refresh_ARG, resizeable_ARG,
resizable_ARG, test_ARG, uuid_ARG)
resizable_ARG, sysinit_ARG, test_ARG, uuid_ARG)
xx(vgck,
"Check the consistency of volume group(s)",

17
tools/lvchange.c
View File

@ -586,9 +586,12 @@ static int lvchange_single(struct cmd_context *cmd, struct logical_volume *lv,
* should only be started if the LV is not already active. So:
* 1) change the activation code to say if the LV was actually activated
* 2) make polling of an LV tightly coupled with LV activation
*
* Do not initiate any polling if --sysinit option is used.
*/
init_background_polling(arg_int_value(cmd, poll_ARG,
DEFAULT_BACKGROUND_POLLING));
init_background_polling(arg_count(cmd, sysinit_ARG) ? 0 :
arg_int_value(cmd, poll_ARG,
DEFAULT_BACKGROUND_POLLING));
/* access permission change */
if (arg_count(cmd, permission_ARG)) {
@ -730,8 +733,9 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv)
arg_count(cmd, addtag_ARG) || arg_count(cmd, deltag_ARG) ||
arg_count(cmd, resync_ARG) || arg_count(cmd, alloc_ARG));
if (arg_count(cmd, ignorelockingfailure_ARG) && !avail_only) {
log_error("Only -a permitted with --ignorelockingfailure");
if ((arg_count(cmd, ignorelockingfailure_ARG) ||
arg_count(cmd, sysinit_ARG)) && !avail_only) {
log_error("Only -a permitted with --ignorelockingfailure and --sysinit");
return EINVALID_CMD_LINE;
}
@ -759,6 +763,11 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE;
}
if (arg_count(cmd, poll_ARG) && arg_count(cmd, sysinit_ARG)) {
log_error("Only one of --poll and --sysinit permitted");
return EINVALID_CMD_LINE;
}
return process_each_lv(cmd, argc, argv,
avail_only ? 0 : READ_FOR_UPDATE, NULL,
&lvchange_single);

4
tools/lvmcmdline.c
View File

@ -793,7 +793,7 @@ static int _get_settings(struct cmd_context *cmd)
"be activated read-only.");
}
if (arg_count(cmd, ignorelockingfailure_ARG))
if (arg_count(cmd, ignorelockingfailure_ARG) || arg_count(cmd, sysinit_ARG))
init_ignorelockingfailure(1);
else
init_ignorelockingfailure(0);
@ -1049,7 +1049,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
else
locking_type = -1;
if (!init_locking(locking_type, cmd)) {
if (!init_locking(locking_type, cmd, arg_count(cmd, sysinit_ARG))) {
ret = ECMD_FAILED;
goto out;
}

6
tools/toollib.c
View File

@ -1372,8 +1372,9 @@ int get_activation_monitoring_mode(struct cmd_context *cmd,
*monitoring_mode = DEFAULT_DMEVENTD_MONITOR;
if (arg_count(cmd, monitor_ARG) &&
arg_count(cmd, ignoremonitoring_ARG)) {
log_error("Conflicting monitor and ignoremonitoring options");
(arg_count(cmd, ignoremonitoring_ARG) ||
arg_count(cmd, sysinit_ARG))) {
log_error("--ignoremonitoring or --sysinit option not allowed with --monitor option");
return 0;
}
@ -1381,6 +1382,7 @@ int get_activation_monitoring_mode(struct cmd_context *cmd,
*monitoring_mode = arg_int_value(cmd, monitor_ARG,
DEFAULT_DMEVENTD_MONITOR);
else if (is_static() || arg_count(cmd, ignoremonitoring_ARG) ||
arg_count(cmd, sysinit_ARG) ||
!find_config_tree_bool(cmd, "activation/monitoring",
DEFAULT_DMEVENTD_MONITOR))
*monitoring_mode = DMEVENTD_MONITOR_IGNORE;

18
tools/vgchange.c
View File

@ -540,9 +540,12 @@ static int vgchange_single(struct cmd_context *cmd, const char *vg_name,
* should only be started if the LV is not already active. So:
* 1) change the activation code to say if the LV was actually activated
* 2) make polling of an LV tightly coupled with LV activation
*
* Do not initiate any polling if --sysinit option is used.
*/
init_background_polling(arg_int_value(cmd, poll_ARG,
DEFAULT_BACKGROUND_POLLING));
init_background_polling(arg_count(cmd, sysinit_ARG) ? 0 :
arg_int_value(cmd, poll_ARG,
DEFAULT_BACKGROUND_POLLING));
if (arg_count(cmd, available_ARG))
r = _vgchange_available(cmd, vg);
@ -615,9 +618,14 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE;
}
if (arg_count(cmd, ignorelockingfailure_ARG) &&
!arg_count(cmd, available_ARG)) {
log_error("--ignorelockingfailure only available with -a");
if ((arg_count(cmd, ignorelockingfailure_ARG) ||
arg_count(cmd, sysinit_ARG)) && !arg_count(cmd, available_ARG)) {
log_error("Only -a premitted with --ignorelockingfailure and --sysinit");
return EINVALID_CMD_LINE;
}
if (arg_count(cmd, poll_ARG) && arg_count(cmd, sysinit_ARG)) {
log_error("Only one of --poll and --sysinit permitted.");
return EINVALID_CMD_LINE;
}