Tweak detection of invalid fid after changes to PVs in VG in _vg_read.

diff --git a/WHATS_NEW b/WHATS_NEW
index d11832dfd8d73290dc29718da3cbe38a5d1a8cb7..597192b50c1a19360cbe844edcaa511b64e83734 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.38 - 
 =================================
+  Tweak detection of invalid fid after changes to PVs in VG in _vg_read.
   Revert assuming precommitted metadata is live when activating (unnecessary).
   Drop cached metadata for disappearing VG in vgmerge.
   In script-processing mode, stop if any command fails.

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index d385814a8eef010ad61ee7bcbf32d243d6bfb2aa..4e60b7472664df2ac19131a6584888203dacd1eb 100644 (file)
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1531,16 +1531,16 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
        if (use_precommitted && !(fmt->features & FMT_PRECOMMIT))
                use_precommitted = 0;
 
-       /* Store pvids for later so we can check if any are missing */
-       if (!(pvids = lvmcache_get_pvids(cmd, vgname, vgid)))
-               return_NULL;
-
        /* create format instance with appropriate metadata area */
        if (!(fid = fmt->ops->create_instance(fmt, vgname, vgid, NULL))) {
                log_error("Failed to create format instance");
                return NULL;
        }
 
+       /* Store pvids for later so we can check if any are missing */
+       if (!(pvids = lvmcache_get_pvids(cmd, vgname, vgid)))
+               return_NULL;
+
        /* Ensure contents of all metadata areas match - else do recovery */
        list_iterate_items(mda, &fid->metadata_areas) {
                if ((use_precommitted &&