1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

Add activation/polling_interval to lvm.conf as --interval default.

This commit is contained in:
Alasdair Kergon 2010-04-13 01:43:56 +00:00
parent 31f8085a1b
commit 59131572d5
3 changed files with 16 additions and 4 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.63 -
================================
Add activation/polling_interval to lvm.conf as --interval default.
Don't ignore error if resuming any LV fails in resume_lvs.
Skip closing persistent filter cache file if open failed.
Install .a .so links to $(usrlibdir).

View File

@ -427,11 +427,19 @@ activation {
# Set to 1 to revert to the default behaviour prior to version 2.02.62
# which used mlockall() to pin the whole process's memory while activating
# devices.
# use_mlockall = 0
use_mlockall = 0
# Monitoring is enabled by default when activating logical volumes.
# Set to 0 to disable monitoring or use the --ignoremonitoring option.
# monitoring = 1
monitoring = 1
# When pvmove or lvconvert must wait for the kernel to finish
# synchronising or merging data, they check and report progress
# at intervals of this number of seconds. The default is 15 seconds.
# If this is set to 0 and there is only one thing to wait for, there
# are no progress reports, but the process is awoken immediately the
# operation is complete.
polling_interval = 15
}

View File

@ -280,7 +280,9 @@ int poll_daemon(struct cmd_context *cmd, const char *name, const char *uuid,
interval_sign = arg_sign_value(cmd, interval_ARG, 0);
if (interval_sign == SIGN_MINUS)
log_error("Argument to --interval cannot be negative");
parms.interval = arg_uint_value(cmd, interval_ARG, DEFAULT_INTERVAL);
parms.interval = arg_uint_value(cmd, interval_ARG,
find_config_tree_int(cmd, "activation/polling_interval",
DEFAULT_INTERVAL));
parms.wait_before_testing = (interval_sign == SIGN_PLUS);
parms.progress_display = 1;
parms.progress_title = progress_title;
@ -297,7 +299,8 @@ int poll_daemon(struct cmd_context *cmd, const char *name, const char *uuid,
/* FIXME Disabled multiple-copy wait_event */
if (!name)
parms.interval = DEFAULT_INTERVAL;
parms.interval = find_config_tree_int(cmd, "activation/polling_interval",
DEFAULT_INTERVAL);
}
if (parms.background) {