pvscan, vgscan: include foreign vgs with --cache

pvscan --cache and vgscan --cache scan devices to refresh lvmetad,
and they should also refresh the lvmetad copy of foreign vgs.

diff --git a/tools/commands.h b/tools/commands.h
index 5cd7c2d151c8b99b2830d48510c4a2f4d2d6984f..719c507b7500744d25c0d1e615fa70220cc712ab 100644 (file)
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -616,7 +616,7 @@ xx(lvs,
 
 xx(lvscan,
    "List all logical volumes in all volume groups",
-   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT | ENABLE_FOREIGN_VGS,
+   PERMITTED_READ_ONLY | ALL_VGS_IS_DEFAULT,
    "lvscan\n"
    "\t[-a|--all]\n"
    "\t[-b|--blockdevice]\n"

diff --git a/tools/pvscan.c b/tools/pvscan.c
index 4ab2ff7964c6885ef18e71fe569b9545aa39bbb4..a04a4b2826ef97b8c2c3307180f49de69ce45b7a 100644 (file)
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -189,6 +189,8 @@ static int _pvscan_lvmetad(struct cmd_context *cmd, int argc, char **argv)
        dev_t devno;
        activation_handler handler = NULL;
 
+       cmd->include_foreign_vgs = 1;
+
        /*
         * Return here immediately if lvmetad is not used.
         * Also return if locking_type=3 (clustered) as we

diff --git a/tools/vgscan.c b/tools/vgscan.c
index b3af9bca0cdf54564ea558f6aabfaf63b439e614..7328a096d8544f63f83082b7b29b05ad2150b058 100644 (file)
--- a/tools/vgscan.c
+++ b/tools/vgscan.c
@@ -47,6 +47,8 @@ int vgscan(struct cmd_context *cmd, int argc, char **argv)
        lvmcache_destroy(cmd, 1, 0);
 
        if (arg_count(cmd, cache_long_ARG)) {
+               cmd->include_foreign_vgs = 1;
+
                if (lvmetad_active()) {
                        if (!lvmetad_pvscan_all_devs(cmd, NULL))
                                return ECMD_FAILED;