Config tree cache
cover Config tree cache
Second version of the config tree caching.
Look into the patch header for description of new functionality.
Zdenek Kabelac (1):
Extend lvm cache with config tree
lib/cache/lvmcache.c | 16 +++++++++++++++- lib/cache/lvmcache.h | 2 ++ lib/format_text/import.c | 23 +++++++++++++++++++++++ lib/metadata/metadata.h | 3 +++ 4 files changed, 43 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.3.3
PATCH 1/1 Extend lvm cache with config tree
Idea of this patch - it's easy to handle cached config tree inside struct lvmcache_vginfo.
Unlide the first version of this patch, that tried to optimize creation of config_tree from the same string - this version moves config_tree creation to lvmcache and when the first parsing of cached metadata should be done - config_tree is stored for the buffer.
So when metadata are droped and same string need to be parsed - tree will be created - however we do not need to compare string buffers or do any other time consuming extra hashing - so it's probably faster (at least on my test set)
As there is no other user of the function import_vg_from_buffer() it could be removed with another patch unless someone needs that?
--- lib/cache/lvmcache.c | 16 +++++++++++++++- lib/cache/lvmcache.h | 2 ++ lib/format_text/import.c | 23 +++++++++++++++++++++++ lib/metadata/metadata.h | 3 +++ 4 files changed, 43 insertions(+), 1 deletions(-)
lib/cache/lvmcache.c +15 -1
@@ -26,6 +26,7 @@#include "format-text.h" #include "format_pool.h" #include "format1.h" +#include "config.h" static struct dm_hash_table *_pvid_hash =NULL ;static struct dm_hash_table *_vgid_hash =NULL ;
@@ -82,6 +83,11 @@ static void _free_cached_vgmetadata(struct lvmcache_vginfo *vginfo) vginfo->vgmetadata =NULL ; +if (vginfo->cft) { +destroy_config_tree (vginfo->cft); + vginfo->cft =NULL ; + } +log_debug ("Metadata cache: VG %s wiped." , vginfo->vgname); }
@@ -650,7 +656,15 @@ struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted) vgid, NULL))) return_NULL; -if (!(vg =import_vg_from_buffer (vginfo->vgmetadata, fid))) { +if (!vginfo->cft && + !(vginfo->cft = +create_config_tree_from_string (fid->fmt->cmd, + vginfo->vgmetadata))) { +_free_cached_vgmetadata (vginfo); + return_NULL; + } + +if (!(vg =import_vg_from_config_tree (vginfo->cft, fid))) {_free_cached_vgmetadata (vginfo);free_vg (vg); return_NULL;
lib/cache/lvmcache.h +2 -0
@@ -33,6 +33,7 @@struct cmd_context ;struct format_type ;struct volume_group ; +struct config_tree ;/* One per VG */ struct lvmcache_vginfo {
@@ -46,6 +47,7 @@ struct lvmcache_vginfo {struct lvmcache_vginfo *next;/* Another VG with same name? */ char *creation_host;char *vgmetadata;/* Copy of VG metadata as format_text string */ +struct config_tree *cft;/* Config tree created from text metadata */ unsigned precommitted;/* Is vgmetadata live or precommitted? */ };
lib/format_text/import.c +23 -0
@@ -158,3 +158,26 @@ struct volume_group *import_vg_from_buffer(char *buf,destroy_config_tree (cft);return vg; } + +struct volume_group *import_vg_from_config_tree (const struct config_tree *cft, +struct format_instance *fid) +{ +struct volume_group *vg =NULL ; +struct text_vg_version_ops **vsn; + +_init_text_import (); + +for (vsn = &_text_vsn_list[0 ]; *vsn; vsn++) { +if (!(*vsn)->check_version (cft)) +continue ; +/* +* The only path to this point uses cached vgmetadata, +* so it can use cached PV state too. +*/ +if (!(vg = (*vsn)->read_vg (fid, cft,1 ))) + stack; +break ; + } + +return vg; +}
lib/metadata/metadata.h +3 -0
@@ -100,6 +100,7 @@//#define FMT_RESIZE_PV 0x00000080U /* Supports pvresize? */ //#define FMT_UNLIMITED_STRIPESIZE 0x00000100U /* Unlimited stripe size? */ +struct config_tree ;struct metadata_area ;/* Per-format per-metadata area operations */
@@ -388,6 +389,8 @@ void lv_calculate_readahead(const struct logical_volume *lv, uint32_t *read_aheaint export_vg_to_buffer (struct volume_group *vg,char **buf);struct volume_group *import_vg_from_buffer (char *buf,struct format_instance *fid); +struct volume_group *import_vg_from_config_tree (const struct config_tree *cft, +struct format_instance *fid);/* * Mirroring functions
Signature · 1 line
1.7.3.3