summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Rockai <prockai@redhat.com>2013-05-27 01:55:14 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2013-06-02 00:49:55 +0200
commit1f73e992ef3e233608322cb804b283c3ecdaa72b (patch)
treef3e9fe946afde247cd27b9e48da1eaed5e8673ec
parente7878da9216945c3209a430d8b01038312d911bd (diff)
downloadlvm2-1f73e992ef3e233608322cb804b283c3ecdaa72b.tar.gz
lvmetad: no use of persistent filter with lvmetad
-rw-r--r--WHATS_NEW1
-rw-r--r--lib/commands/toolcontext.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 748c3fb16..ba88915b1 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.99 -
===================================
+ Do not use persistent filter with lvmetad.
Update persistent filter functinality for global filter.
Override system's global_filter settings for vgimportclone.
Detect maximum usable size for snapshot for lvresize.
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index 965ba4a8c..af1aa6344 100644
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -913,9 +913,11 @@ static int _init_filters(struct cmd_context *cmd, unsigned load_persistent_cache
/*
* Only load persistent filter device cache on startup if it is newer
- * than the config file and this is not a long-lived process.
+ * than the config file and this is not a long-lived process. Also avoid
+ * it when lvmetad is enabled.
*/
- if (load_persistent_cache && !cmd->is_long_lived &&
+ if (!find_config_tree_bool(cmd, global_use_lvmetad_CFG) &&
+ load_persistent_cache && !cmd->is_long_lived &&
!stat(dev_cache, &st) &&
(st.st_ctime > config_file_timestamp(cmd->cft)) &&
!persistent_filter_load(f4, NULL))