From bebe60b70c82ed23740726d817219d287a1ebb62 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 17 Jun 2011 14:39:10 +0000 Subject: [PATCH] Code move of vg_mark_partial() up in stack It's useful to keep the partial flag cached - so just move the call for vg_mark_partil_lvs() into import_vg_from_config_tree() so it gets evaluated before it goes through the lvmcache. This patch should not present any functional change. Note: It is rather temporal solution - proper place is probably inside the 'read' call back - but needs some more discussion. For now using this minor hack. --- WHATS_NEW | 1 + lib/format_text/import.c | 7 +++++++ lib/metadata/metadata.c | 5 ----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index e350b1b01..c10474987 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.86 - ================================= + Call vg_mark_partial_lvs() before VG structure is returned from the cache. Remove unused internal flag ACTIVATE_EXCL from the code. Remove useless test of ACTIVATE_EXCL in lv_add_mirrors() clustered code path. Use lv_activate_opts struct instead of MERGING status flag. diff --git a/lib/format_text/import.c b/lib/format_text/import.c index aa8c80744..2297164f8 100644 --- a/lib/format_text/import.c +++ b/lib/format_text/import.c @@ -136,6 +136,7 @@ struct volume_group *import_vg_from_config_tree(const struct config_tree *cft, { struct volume_group *vg = NULL; struct text_vg_version_ops **vsn; + int vg_missing; _init_text_import(); @@ -148,6 +149,12 @@ struct volume_group *import_vg_from_config_tree(const struct config_tree *cft, */ if (!(vg = (*vsn)->read_vg(fid, cft, 1))) stack; + else if ((vg_missing = vg_missing_pv_count(vg))) { + log_verbose("There are %d physical volumes missing.", + vg_missing); + vg_mark_partial_lvs(vg, 1); + /* FIXME: move this code inside read_vg() */ + } break; } diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 5387a3ed2..f720fd5c0 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -2868,11 +2868,6 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, else /* Inconsistent but we can't repair it */ correct_vg->status &= ~INCONSISTENT_VG; - if (vg_missing_pv_count(correct_vg)) { - log_verbose("There are %d physical volumes missing.", - vg_missing_pv_count(correct_vg)); - vg_mark_partial_lvs(correct_vg, 1); - } return correct_vg; } else { free_vg(correct_vg); -- 2.43.5