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

diff --git a/WHATS_NEW b/WHATS_NEW
index 4d59e27f1c9b4977e71500aff80b09ac49e8b86c..e92d1129d6c9a85828c3db533d741321ad8d0651 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -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).

diff --git a/doc/example.conf b/doc/example.conf
index 89e13edbbf29dc895e7db36c674f3f4b427a9117..3bc86fa3ac70db2c67d59685ffd8110655c8439f 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -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
 }
 
 

diff --git a/tools/polldaemon.c b/tools/polldaemon.c
index 427a9c6b0296b88311f2c85544f8a36927934003..3c9fdb705333dbbc750413bd001192a87e63bb22 100644 (file)
--- a/tools/polldaemon.c
+++ b/tools/polldaemon.c
@@ -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) {