Do not merge old device cache after we run full scan.
PATCH 1/1 Do not merge old device cache after we run full scan.
Courrently if clvmd is running and user issues vgscan, the device cache file is dumped both in vgscan and clvmd process.
Unfortunately, clvmd calls lvmcache_label_scan, it properly destroys persistent filter, but during persistent_filter_dump it merges old cache content back!
This causes that change in filters is not properly propagated into device cache after vgscan on cluster.
(Only new devices are added.)
https://bugzilla.redhat.com/show_bug.cgi?id=591861
Signed-off-by Milan Broz <[email protected]>
--- lib/cache/lvmcache.c | 2 +- lib/commands/toolcontext.c | 2 +- lib/filters/filter-persistent.c | 4 ++-- lib/filters/filter-persistent.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
lib/cache/lvmcache.c +1 -1
@@ -567,7 +567,7 @@ int lvmcache_label_scan(struct cmd_context *cmd, int full_scan)* device cache for the benefit of short-lived processes. */ if (full_scan ==2 && cmd->is_long_lived && cmd->dump_filter) -persistent_filter_dump (cmd->filter); +persistent_filter_dump (cmd->filter,0 ); r =1 ;
lib/commands/toolcontext.c +1 -1
@@ -1341,7 +1341,7 @@ int refresh_toolcontext(struct cmd_context *cmd)void destroy_toolcontext (struct cmd_context *cmd) {if (cmd->dump_filter) -persistent_filter_dump (cmd->filter); +persistent_filter_dump (cmd->filter,1 );archive_exit (cmd);backup_exit (cmd);
lib/filters/filter-persistent.c +2 -2
@@ -168,7 +168,7 @@ static void _write_array(struct pfilter *pf, FILE *fp, const char *path,fprintf (fp,"\n\t]\n" ); } -int persistent_filter_dump (struct dev_filter *f) +int persistent_filter_dump (struct dev_filter *f,int merge_existing) {struct pfilter *pf;char *tmp_file;
@@ -220,7 +220,7 @@ int persistent_filter_dump(struct dev_filter *f)/* * If file contents changed since we loaded it, merge new contents */ -if (info.st_ctime != pf->ctime) +if (merge_existing && info.st_ctime != pf->ctime)/* Keep cft open to avoid losing lock */ persistent_filter_load (f, &cft);
lib/filters/filter-persistent.h +1 -1
@@ -23,6 +23,6 @@ struct dev_filter *persistent_filter_create(struct dev_filter *f,int persistent_filter_wipe (struct dev_filter *f);int persistent_filter_load (struct dev_filter *f,struct config_tree **cft_out); -int persistent_filter_dump (struct dev_filter *f); +int persistent_filter_dump (struct dev_filter *f,int merge_existing);#endif
Signature · 1 line
1.7.1
PATCH 1/1 Do not merge old device cache after we run full scan.
Ack - it's worth a try...
Alasdair