pvscan: only add device args to dev cache

Optimize the common pvscan --cache command by only adding the necessary devs to dev-cache.
hints: new pvs_online type
2025-10-26 07:33:16 +03:00 · 2021-10-18 16:24:24 -05:00 · 2021-10-15 16:27:04 -05:00 · 2021-10-15 16:25:01 -05:00 · 2021-10-15 12:59:03 -05:00
38 changed files with 794 additions and 181 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.03.14(2) (2021-10-20)
+2.03.14(2)-git (2021-08-11)
--- a/2
+++ b/2
@@ -1 +1 @@
-1.02.181 (2021-10-20)
+1.02.181-git (2021-08-11)
--- a/7
+++ b/7
@@ -1,6 +1,5 @@
-Version 2.03.14 - 20th October 2021
-===================================
-  Device scanning is skipping directories on different filesystems.
+Version 2.03.14 - 
+==================================
  Print info message with too many or too large archived files.
  Reduce metadata readings during scanning phase.
  Optimize computation of crc32 check sum with multiple PVs.
@@ -8,7 +7,7 @@ Version 2.03.14 - 20th October 2021
  Filter out unsupported MQ/SMQ cache policy setting.
  Fix memleak in mpath filter.
  Support newer location for VDO statistics.
-  Add support for VDO async-unsafe write policy.
+  Add support for VDO async-unsage write policy.
  Improve lvm_import_vdo script.
  Support VDO LV with lvcreate -ky.
  Fix lvconvert for VDO LV bigger then 2T.
--- a/4
+++ b/4
@@ -1,5 +1,5 @@
-Version 1.02.181 - 20th October 2021
-====================================
+Version 1.02.181 - 
+===================================
  Add IMA support with 'dmsetup measure' command.
  Add defines DM_NAME_LIST_FLAG_HAS_UUID, DM_NAME_LIST_FLAG_DOESNT_HAVE_UUID.
  Enhance tracking of activated devices when preloading dm tree.
--- a/117
+++ b/117
@@ -773,10 +773,10 @@ PYTHON
 LVM2CMD_LIB
 UDEV_LIBS
 UDEV_CFLAGS
-BLKID_LIBS
-BLKID_CFLAGS
 SYSTEMD_LIBS
 SYSTEMD_CFLAGS
+BLKID_LIBS
+BLKID_CFLAGS
 LOCKD_IDM_LIBS
 LOCKD_IDM_CFLAGS
 LOCKD_DLM_CONTROL_LIBS
@@ -964,6 +964,7 @@ enable_udev_systemd_background_jobs
 enable_udev_sync
 enable_udev_rules
 enable_udev_rule_exec_detection
+enable_compat
 enable_units_compat
 enable_ioctl
 enable_o_direct
@@ -1028,10 +1029,10 @@ LOCKD_DLM_CONTROL_CFLAGS
 LOCKD_DLM_CONTROL_LIBS
 LOCKD_IDM_CFLAGS
 LOCKD_IDM_LIBS
-SYSTEMD_CFLAGS
-SYSTEMD_LIBS
 BLKID_CFLAGS
 BLKID_LIBS
+SYSTEMD_CFLAGS
+SYSTEMD_LIBS
 UDEV_CFLAGS
 UDEV_LIBS
 PYTHON
@@ -1704,6 +1705,7 @@ Optional Features:
  --enable-udev_rules     install rule files needed for udev synchronisation
  --enable-udev-rule-exec-detection
                          enable executable path detection in udev rules
+  --enable-compat         enable support for old device-mapper versions
  --enable-units-compat   enable output compatibility with old versions that
                          that do not use KiB-style unit suffixes
  --disable-ioctl         disable ioctl calls to device-mapper in the kernel
@@ -1851,13 +1853,13 @@ Some influential environment variables:
              C compiler flags for LOCKD_IDM, overriding pkg-config
  LOCKD_IDM_LIBS
              linker flags for LOCKD_IDM, overriding pkg-config
+  BLKID_CFLAGS
+              C compiler flags for BLKID, overriding pkg-config
+  BLKID_LIBS  linker flags for BLKID, overriding pkg-config
  SYSTEMD_CFLAGS
              C compiler flags for SYSTEMD, overriding pkg-config
  SYSTEMD_LIBS
              linker flags for SYSTEMD, overriding pkg-config
-  BLKID_CFLAGS
-              C compiler flags for BLKID, overriding pkg-config
-  BLKID_LIBS  linker flags for BLKID, overriding pkg-config
  UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
  UDEV_LIBS   linker flags for UDEV, overriding pkg-config
  PYTHON      the Python interpreter
@@ -3140,6 +3142,10 @@ case "$host_os" in
 		LIB_SUFFIX=so
 		DEVMAPPER=yes
 		BUILD_LVMPOLLD=no
+		LOCKDSANLOCK=no
+		LOCKDDLM=no
+		LOCKDDLM_CONTROL=no
+		LOCKDIDM=no
 		ODIRECT=yes
 		DM_IOCTLS=yes
 		SELINUX=yes
@@ -8461,7 +8467,7 @@ $as_echo_n "checking default for use_devicesfile... " >&6; }

 # Check whether --with-default-use-devices-file was given.
 if test "${with_default_use_devices_file+set}" = set; then :
-  withval=$with_default_use_devices_file; DEFAULT_USE_DEVICES_FILE=$withval
+  withval=$with_default_use_devices_file; DEFAULT_USE_DEVICES_FILE=$enableval
 else
  DEFAULT_USE_DEVICES_FILE=0
 fi
@@ -10995,8 +11001,6 @@ $as_echo_n "checking whether to build lvmpolld... " >&6; }
 # Check whether --enable-lvmpolld was given.
 if test "${enable_lvmpolld+set}" = set; then :
  enableval=$enable_lvmpolld; LVMPOLLD=$enableval
-else
-  LVMPOLLD=no
 fi

 test -n "$LVMPOLLD" && BUILD_LVMPOLLD=$LVMPOLLD
@@ -11011,8 +11015,6 @@ $as_echo_n "checking whether to build lvmlockdsanlock... " >&6; }
 # Check whether --enable-lvmlockd-sanlock was given.
 if test "${enable_lvmlockd_sanlock+set}" = set; then :
  enableval=$enable_lvmlockd_sanlock; LOCKDSANLOCK=$enableval
-else
-  LOCKDSANLOCK=no
 fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDSANLOCK" >&5
@@ -11104,8 +11106,6 @@ $as_echo_n "checking whether to build lvmlockddlm... " >&6; }
 # Check whether --enable-lvmlockd-dlm was given.
 if test "${enable_lvmlockd_dlm+set}" = set; then :
  enableval=$enable_lvmlockd_dlm; LOCKDDLM=$enableval
-else
-  LOCKDDLM=no
 fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM" >&5
@@ -11197,8 +11197,6 @@ $as_echo_n "checking whether to build lvmlockddlmcontrol... " >&6; }
 # Check whether --enable-lvmlockd-dlmcontrol was given.
 if test "${enable_lvmlockd_dlmcontrol+set}" = set; then :
  enableval=$enable_lvmlockd_dlmcontrol; LOCKDDLM_CONTROL=$enableval
-else
-  LOCKDDLM_CONTROL=no
 fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDDLM_CONTROL" >&5
@@ -11290,8 +11288,6 @@ $as_echo_n "checking whether to build lvmlockdidm... " >&6; }
 # Check whether --enable-lvmlockd-idm was given.
 if test "${enable_lvmlockd_idm+set}" = set; then :
  enableval=$enable_lvmlockd_idm; LOCKDIDM=$enableval
-else
-  LOCKDIDM=no
 fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCKDIDM" >&5
@@ -11371,15 +11367,76 @@ else
 $as_echo "yes" >&6; }
 	HAVE_LOCKD_IDM=yes
 fi
-	if test -n "$PKG_CONFIG" && \
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BLKID" >&5
+$as_echo_n "checking for BLKID... " >&6; }
+
+if test -n "$BLKID_CFLAGS"; then
+    pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
  ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
  ac_status=$?
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  test $ac_status = 0; }; then
-  HAVE_LOCKD_IDM=yes
+  pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.24" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
-  $bailout
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$BLKID_LIBS"; then
+    pkg_cv_BLKID_LIBS="$BLKID_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.24" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
+        else
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$BLKID_PKG_ERRORS" >&5
+
+	$bailout
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	$bailout
+else
+	BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
+	BLKID_LIBS=$pkg_cv_BLKID_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_LOCKD_IDM=yes
 fi

 $as_echo "#define LOCKDIDM_SUPPORT 1" >>confdefs.h
@@ -12029,6 +12086,24 @@ $as_echo_n "checking whether udev supports built-in blkid... " >&6; }
 $as_echo "$UDEV_HAS_BUILTIN_BLKID" >&6; }
 fi

+################################################################################
+# Check whether --enable-compat was given.
+if test "${enable_compat+set}" = set; then :
+  enableval=$enable_compat; DM_COMPAT=$enableval
+else
+  DM_COMPAT=no
+fi
+
+
+if test "$DM_COMPAT" = yes; then :
+
+$as_echo "#define DM_COMPAT 1" >>confdefs.h
+
+      as_fn_error $? "--enable-compat is not currently supported.
+Since device-mapper version 1.02.66, only one version (4) of the device-mapper
+ioctl protocol is supported." "$LINENO" 5
+fi
+
 ################################################################################
 # Check whether --enable-units-compat was given.
 if test "${enable_units_compat+set}" = set; then :
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,10 @@ case "$host_os" in
 		LIB_SUFFIX=so
 		DEVMAPPER=yes
 		BUILD_LVMPOLLD=no
+		LOCKDSANLOCK=no
+		LOCKDDLM=no
+		LOCKDDLM_CONTROL=no
+		LOCKDIDM=no
 		ODIRECT=yes
 		DM_IOCTLS=yes
 		SELINUX=yes
@@ -286,7 +290,7 @@ dnl -- Default settings for lvm.conf { devices/use_devicesfile }
 AC_MSG_CHECKING(default for use_devicesfile)
 AC_ARG_WITH(default-use-devices-file,
 	      AS_HELP_STRING([--with-default-use-devices-file], [default for lvm.conf devices/use_devicesfile = [0]]),
-	      DEFAULT_USE_DEVICES_FILE=$withval, DEFAULT_USE_DEVICES_FILE=0)
+	      DEFAULT_USE_DEVICES_FILE=$enableval, DEFAULT_USE_DEVICES_FILE=0)
 case "$DEFAULT_USE_DEVICES_FILE" in
 0|1);;
 *) AC_MSG_ERROR([--with-default-use-devices-file parameter invalid]);;
@@ -781,39 +785,6 @@ AC_ARG_WITH(default-run-dir,
 AC_DEFINE_UNQUOTED(DEFAULT_RUN_DIR, ["$DEFAULT_RUN_DIR"],
 		   [Default LVM run directory.])

-################################################################################
-dnl -- Build cluster mirror log daemon
-AC_MSG_CHECKING(whether to build cluster mirror log daemon)
-AC_ARG_ENABLE(cmirrord,
-	      AS_HELP_STRING([--enable-cmirrord],
-			     [enable the cluster mirror log daemon]),
-	      CMIRRORD=$enableval, CMIRRORD=no)
-AC_MSG_RESULT($CMIRRORD)
-
-BUILD_CMIRRORD=$CMIRRORD
-
-################################################################################
-dnl -- cmirrord pidfile
-if test "$BUILD_CMIRRORD" = yes; then
-	AC_ARG_WITH(cmirrord-pidfile,
-		    AS_HELP_STRING([--with-cmirrord-pidfile=PATH],
-				   [cmirrord pidfile [PID_DIR/cmirrord.pid]]),
-		    CMIRRORD_PIDFILE=$withval,
-		    CMIRRORD_PIDFILE="$DEFAULT_PID_DIR/cmirrord.pid")
-	AC_DEFINE_UNQUOTED(CMIRRORD_PIDFILE, ["$CMIRRORD_PIDFILE"],
-			   [Path to cmirrord pidfile.])
-fi
-
-################################################################################
-dnl -- Look for corosync libraries if required.
-if [[ "$BUILD_CMIRRORD" = yes ]]; then
-	pkg_config_init
-
-	if test "$HAVE_CPG" != yes; then
-		PKG_CHECK_MODULES(CPG, libcpg)
-	fi
-fi
-
 ################################################################################
 dnl -- Enable debugging
 AC_MSG_CHECKING(whether to enable debugging)
@@ -942,7 +913,7 @@ AC_MSG_CHECKING(whether to build lvmpolld)
 AC_ARG_ENABLE(lvmpolld,
 	      AS_HELP_STRING([--enable-lvmpolld],
 			     [enable the LVM Polling Daemon]),
-	      LVMPOLLD=$enableval, LVMPOLLD=no)
+	      LVMPOLLD=$enableval)
 test -n "$LVMPOLLD" && BUILD_LVMPOLLD=$LVMPOLLD
 AC_MSG_RESULT($BUILD_LVMPOLLD)

@@ -954,7 +925,7 @@ AC_MSG_CHECKING(whether to build lvmlockdsanlock)
 AC_ARG_ENABLE(lvmlockd-sanlock,
 	      AS_HELP_STRING([--enable-lvmlockd-sanlock],
 			     [enable the LVM lock daemon using sanlock]),
-	      LOCKDSANLOCK=$enableval, LOCKDSANLOCK=no)
+	      LOCKDSANLOCK=$enableval)
 AC_MSG_RESULT($LOCKDSANLOCK)

 BUILD_LOCKDSANLOCK=$LOCKDSANLOCK
@@ -972,7 +943,7 @@ AC_MSG_CHECKING(whether to build lvmlockddlm)
 AC_ARG_ENABLE(lvmlockd-dlm,
 	      AS_HELP_STRING([--enable-lvmlockd-dlm],
 			     [enable the LVM lock daemon using dlm]),
-	      LOCKDDLM=$enableval, LOCKDDLM=no)
+	      LOCKDDLM=$enableval)
 AC_MSG_RESULT($LOCKDDLM)

 BUILD_LOCKDDLM=$LOCKDDLM
@@ -990,7 +961,7 @@ AC_MSG_CHECKING(whether to build lvmlockddlmcontrol)
 AC_ARG_ENABLE(lvmlockd-dlmcontrol,
 	      AS_HELP_STRING([--enable-lvmlockd-dlmcontrol],
 			     [enable lvmlockd remote refresh using libdlmcontrol]),
-	      LOCKDDLM_CONTROL=$enableval, LOCKDDLM_CONTROL=no)
+	      LOCKDDLM_CONTROL=$enableval)
 AC_MSG_RESULT($LOCKDDLM_CONTROL)

 BUILD_LOCKDDLM_CONTROL=$LOCKDDLM_CONTROL
@@ -1008,7 +979,7 @@ AC_MSG_CHECKING(whether to build lvmlockdidm)
 AC_ARG_ENABLE(lvmlockd-idm,
 	      AS_HELP_STRING([--enable-lvmlockd-idm],
 			     [enable the LVM lock daemon using idm]),
-	      LOCKDIDM=$enableval, LOCKDIDM=no)
+	      LOCKDIDM=$enableval)
 AC_MSG_RESULT($LOCKDIDM)

 BUILD_LOCKDIDM=$LOCKDIDM
@@ -1016,7 +987,7 @@ BUILD_LOCKDIDM=$LOCKDIDM
 dnl -- Look for Seagate IDM libraries
 if test "$BUILD_LOCKDIDM" = yes; then
 	PKG_CHECK_MODULES(LOCKD_IDM, libseagate_ilm >= 0.1.0, [HAVE_LOCKD_IDM=yes], $bailout)
-	PKG_CHECK_EXISTS(blkid >= 2.24, [HAVE_LOCKD_IDM=yes], $bailout)
+	PKG_CHECK_MODULES(BLKID, blkid >= 2.24, [HAVE_LOCKD_IDM=yes], $bailout)
 	AC_DEFINE([LOCKDIDM_SUPPORT], 1, [Define to 1 to include code that uses lvmlockd IDM option.])
 	BUILD_LVMLOCKD=yes
 fi
@@ -1247,6 +1218,19 @@ if test "$UDEV_RULE" != no ; then
 	AC_MSG_RESULT($UDEV_HAS_BUILTIN_BLKID)
 fi

+################################################################################
+dnl -- Compatibility mode
+AC_ARG_ENABLE(compat,
+	      AS_HELP_STRING([--enable-compat],
+			     [enable support for old device-mapper versions]),
+	      DM_COMPAT=$enableval, DM_COMPAT=no)
+
+AS_IF([test "$DM_COMPAT" = yes],
+      [AC_DEFINE([DM_COMPAT], 1, [Define to enable compat protocol])
+      AC_MSG_ERROR([--enable-compat is not currently supported.
+Since device-mapper version 1.02.66, only one version (4) of the device-mapper
+ioctl protocol is supported.])])
+
 ################################################################################
 dnl -- Compatible units suffix mode
 AC_ARG_ENABLE(units-compat,
@@ -1655,10 +1639,6 @@ fi
 AC_MSG_CHECKING(whether to enable editline)
 AC_MSG_RESULT($EDITLINE)

-if test "$BUILD_CMIRRORD" = yes; then
-	AC_CHECK_FUNCS(atexit,,hard_bailout)
-fi
-
 if test "$BUILD_LVMLOCKD" = yes; then
 	AS_IF([test "$HAVE_REALTIME" != yes], [AC_MSG_ERROR([Realtime clock support is mandatory for lvmlockd.])])
 	AC_CHECK_FUNCS(strtoull,,hard_bailout)
@@ -1834,7 +1814,6 @@ AC_ARG_VAR([UDEV_LIBS], [linker flags for udev])
 ################################################################################
 AC_SUBST(AWK)
 AC_SUBST(BLKID_PC)
-AC_SUBST(BUILD_CMIRRORD)
 AC_SUBST(BUILD_DMEVENTD)
 AC_SUBST(BUILD_LVMDBUSD)
 AC_SUBST(BUILD_LVMPOLLD)
@@ -1967,7 +1946,6 @@ AC_SUBST(WRITE_INSTALL)
 AC_SUBST(DMEVENTD_PIDFILE)
 AC_SUBST(LVMPOLLD_PIDFILE)
 AC_SUBST(LVMLOCKD_PIDFILE)
-AC_SUBST(CMIRRORD_PIDFILE)
 AC_SUBST(interface)
 AC_SUBST(kerneldir)
 AC_SUBST(missingkernel)
@@ -1989,7 +1967,6 @@ Makefile
 make.tmpl
 libdm/make.tmpl
 daemons/Makefile
-daemons/cmirrord/Makefile
 daemons/dmeventd/Makefile
 daemons/dmeventd/libdevmapper-event.pc
 daemons/dmeventd/plugins/Makefile
@@ -2023,14 +2000,14 @@ libdm/libdevmapper.pc
 man/Makefile
 po/Makefile
 scripts/lvm2-pvscan.service
+scripts/lvm-activate-vgs-main.service
+scripts/lvm-activate-vgs-last.service
 scripts/blkdeactivate.sh
 scripts/blk_availability_init_red_hat
 scripts/blk_availability_systemd_red_hat.service
-scripts/cmirrord_init_red_hat
 scripts/com.redhat.lvmdbus1.service
 scripts/dm_event_systemd_red_hat.service
 scripts/dm_event_systemd_red_hat.socket
-scripts/lvm2_cmirrord_systemd_red_hat.service
 scripts/lvm2_lvmdbusd_systemd_red_hat.service
 scripts/lvm2_lvmpolld_init_red_hat
 scripts/lvm2_lvmpolld_systemd_red_hat.service
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -3016,7 +3016,9 @@ static int add_lockspace_thread(const char *ls_name,
 				!alloc_and_copy_pvs_path(&ls2->pvs, &ls->pvs)) {
 			log_debug("add_lockspace_thread %s fails to allocate pvs", ls->name);
 			rv = -ENOMEM;
-		} else if (ls2->thread_stop) {
+		}
+
+		if (ls2->thread_stop) {
 			log_debug("add_lockspace_thread %s exists and stopping", ls->name);
 			rv = -EAGAIN;
 		} else if (!ls2->create_fail && !ls2->create_done) {
--- a/include/configure.h.in
+++ b/include/configure.h.in
@@ -114,6 +114,9 @@
 /* Define to 1 to enable the device-mapper filemap daemon. */
 #undef DMFILEMAPD

+/* Define to enable compat protocol */
+#undef DM_COMPAT
+
 /* Define default group for device node */
 #undef DM_DEVICE_GID

--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -159,11 +159,9 @@ static const char *_system_id_from_source(struct cmd_context *cmd, const char *s

 #ifdef APP_MACHINEID_SUPPORT
 	if (!strcasecmp(source, "appmachineid")) {
-		sd_id128_t id = { 0 };
+		sd_id128_t id;

-		if (sd_id128_get_machine_app_specific(LVM_APPLICATION_ID, &id) != 0)
-			log_warn("WARNING: sd_id128_get_machine_app_specific() failed %s (%d).",
-				 strerror(errno), errno);
+		sd_id128_get_machine_app_specific(LVM_APPLICATION_ID, &id);

 		if (dm_snprintf(buf, PATH_MAX, SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(id)) < 0)
 			stack;
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -183,6 +183,7 @@ struct cmd_context {
 	unsigned enable_hints:1;		/* hints are enabled for cmds in general */
 	unsigned use_hints:1;			/* if hints are enabled this cmd can use them */
 	unsigned pvscan_recreate_hints:1;	/* enable special case hint handling for pvscan --cache */
+	unsigned hints_pvs_online:1;		/* hints="pvs_online" */
 	unsigned scan_lvs:1;
 	unsigned wipe_outdated_pvs:1;
 	unsigned enable_devices_list:1;		/* command is using --devices option */
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -1130,6 +1130,18 @@ cfg(global_event_activation_CFG, "event_activation", global_CFG_SECTION, CFG_DEF
 	"See the --setautoactivation option or the auto_activation_volume_list\n"
 	"setting to configure autoactivation for specific VGs or LVs.\n")

+cfg_array(global_event_activation_options_CFG, "event_activation_options", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_EVENT_ACTIVATION_OPTIONS, vsn(2, 3, 14), NULL, 0, NULL,
+	"Set event activation options.\n"
+	"service_to_event: begin with fixed activation services,\n"
+	"then switch to event based activation.\n"
+	"event_only: only use event based activation.\n"
+	"service_only: only use fixed activation services.\n"
+	"(This is equivalent to event_activation=0.)\n"
+	"Autoactivation commands should set --eventactivation service|event\n"
+	"to indicate if they are performing service or event activation.\n"
+	"An autoactivation command may then be skipped according to the\n"
+	"value of this setting.\n")
+
 cfg(global_use_lvmetad_CFG, "use_lvmetad", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, 0, vsn(2, 2, 93), 0, vsn(2, 3, 0), NULL,
 	NULL)

--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -328,4 +328,11 @@

 #define DEFAULT_WWIDS_FILE "/etc/multipath/wwids"

+#define DEFAULT_EVENT_ACTIVATION_OPTION1 "service_to_event"
+#define DEFAULT_EVENT_ACTIVATION_OPTIONS "#S" DEFAULT_EVENT_ACTIVATION_OPTION1
+
+#define PVS_ONLINE_DIR DEFAULT_RUN_DIR "/pvs_online"
+#define VGS_ONLINE_DIR DEFAULT_RUN_DIR "/vgs_online"
+#define PVS_LOOKUP_DIR DEFAULT_RUN_DIR "/pvs_lookup"
+
 #endif				/* _LVM_DEFAULTS_H */
--- a/lib/device/dev-cache.c
+++ b/lib/device/dev-cache.c
@@ -53,7 +53,6 @@ static struct {
 	const char *dev_dir;

 	int has_scanned;
-	long st_dev;
 	struct dm_list dirs;
 	struct dm_list files;

@@ -1065,18 +1064,11 @@ static void _insert_dirs(struct dm_list *dirs)
 	struct dir_list *dl;
 	struct udev *udev = NULL;
 	int with_udev;
-	struct stat tinfo;

 	with_udev = obtain_device_list_from_udev() &&
 		    (udev = udev_get_library_context());

 	dm_list_iterate_items(dl, &_cache.dirs) {
-		if (stat(dl->dir, &tinfo) < 0) {
-			log_warn("WARNING: Cannot use dir %s, %s.",
-				 dl->dir, strerror(errno));
-			continue;
-		}
-		_cache.st_dev = tinfo.st_dev;
 		if (with_udev) {
 			if (!_insert_udev_dir(udev, dl->dir))
 				log_debug_devs("%s: Failed to insert devices from "
@@ -1099,17 +1091,9 @@ static int _device_in_udev_db(const dev_t d)
 static void _insert_dirs(struct dm_list *dirs)
 {
 	struct dir_list *dl;
-	struct stat tinfo;

-	dm_list_iterate_items(dl, &_cache.dirs) {
-		if (stat(dl->dir, &tinfo) < 0) {
-			log_warn("WARNING: Cannot use dir %s, %s.",
-				 dl->dir, strerror(errno));
-			continue;
-		}
-		_cache.st_dev = tinfo.st_dev;
+	dm_list_iterate_items(dl, &_cache.dirs)
 		_insert_dir(dl->dir);
-	}
 }

 #endif	/* UDEV_SYNC_SUPPORT */
@@ -1144,11 +1128,6 @@ static int _insert(const char *path, const struct stat *info,
 			return 1;
 		}

-		if (info->st_dev != _cache.st_dev) {
-			log_debug_devs("%s: Different filesystem in directory", path);
-			return 1;
-		}
-
 		if (rec && !_insert_dir(path))
 			return 0;
 	} else {		/* add a device */
--- a/lib/device/device_id.c
+++ b/lib/device/device_id.c
@@ -1351,9 +1351,8 @@ void device_id_update_vg_uuid(struct cmd_context *cmd, struct volume_group *vg,
 		}
 	}

-	if (update &&
-	    !device_ids_write(cmd))
-		stack;
+	if (update)
+		device_ids_write(cmd);
 out:
 	unlock_devices_file(cmd);
 }
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -465,7 +465,7 @@ static struct volume_group *_vg_read_raw(struct cmd_context *cmd,

 	vg = _vg_read_raw_area(cmd, fid, vgname, &mdac->area, vg_fmtdata, use_previous_vg, 0, mda_is_primary(mda));

-	if (!vg && use_previous_vg && !*use_previous_vg) {
+	if (!vg && !*use_previous_vg) {
 		/*
 		 * This condition (corrupt metadata text) is often seen in the
 		 * label_scan()/_text_read() phase, where this code corresponds to
@@ -477,12 +477,8 @@ static struct volume_group *_vg_read_raw(struct cmd_context *cmd,
 		struct lvmcache_info *info = lvmcache_info_from_pvid(dev->pvid, dev, 0);
 		log_warn("WARNING: reading %s mda%d failed to read metadata.", dev_name(dev), mda_is_primary(mda)?1:2);
 		log_warn("WARNING: repair VG metadata on %s with vgck --updatemetadata.", dev_name(dev));
-		if (info)
-			/* remove mda from lvmcache, saving it in info->bad_mdas for possible repair with updatemetadata */
-			lvmcache_del_save_bad_mda(info, mda->mda_num, BAD_MDA_TEXT);
-		else
-			log_warn("WARNING: No cache info for %s", dev_name(dev));
-
+		/* remove mda from lvmcache, saving it in info->bad_mdas for possible repair with updatemetadata */
+		lvmcache_del_save_bad_mda(info, mda->mda_num, BAD_MDA_TEXT);
 		/* remove mda from fid */
 		fid_remove_mda(fid, mda, NULL, 0, 0);
 	}
--- a/lib/label/hints.c
+++ b/lib/label/hints.c
@@ -150,11 +150,14 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <dirent.h>
 #include <time.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/sysmacros.h>

+int online_pvid_file_read(char *path, int *major, int *minor, char *vgname);
+
 static const char *_hints_file = DEFAULT_RUN_DIR "/hints";
 static const char *_nohints_file = DEFAULT_RUN_DIR "/nohints";
 static const char *_newhints_file = DEFAULT_RUN_DIR "/newhints";
@@ -1279,6 +1282,109 @@ check:
 	free(name);
 }

+static int _get_hints_from_pvs_online(struct cmd_context *cmd, struct dm_list *hints_out,
+				      struct dm_list *devs_in, struct dm_list *devs_out)
+{
+	char path[PATH_MAX];
+	char file_vgname[NAME_LEN];
+	struct dm_list hints_list;
+	struct hint file_hint;
+	struct hint *alloc_hint;
+	struct hint *hint, *hint2;
+	struct device_list *devl, *devl2;
+	int file_major, file_minor;
+	int found = 0;
+	DIR *dir;
+	struct dirent *de;
+	char *vgname = NULL;
+	char *pvid;
+
+	dm_list_init(&hints_list);
+
+	if (!(dir = opendir(PVS_ONLINE_DIR)))
+		return 0;
+
+	while ((de = readdir(dir))) {
+		if (de->d_name[0] == '.')
+			continue;
+
+		pvid = de->d_name;
+
+		if (strlen(pvid) != ID_LEN) /* 32 */
+			continue;
+
+		memset(path, 0, sizeof(path));
+		snprintf(path, sizeof(path), "%s/%s", PVS_ONLINE_DIR, pvid);
+
+		memset(&file_hint, 0, sizeof(file_hint));
+		memset(file_vgname, 0, sizeof(file_vgname));
+		file_major = 0;
+		file_minor = 0;
+
+		if (!online_pvid_file_read(path, &file_major, &file_minor, file_vgname))
+			continue;
+
+		if (!dm_strncpy(file_hint.pvid, pvid, sizeof(file_hint.pvid)))
+			continue;
+
+		file_hint.devt = makedev(file_major, file_minor);
+
+		if (file_vgname[0] && validate_name(file_vgname)) {
+			if (!dm_strncpy(file_hint.vgname, file_vgname, sizeof(file_hint.vgname)))
+				continue;
+		}
+
+		if (!(alloc_hint = malloc(sizeof(struct hint))))
+			continue;
+
+		memcpy(alloc_hint, &file_hint, sizeof(struct hint));
+
+		log_debug("add hint %s %d:%d %s from pvs_online", file_hint.pvid, file_major, file_minor, file_vgname);
+		dm_list_add(&hints_list, &alloc_hint->list);
+		found++;
+	}
+
+	if (closedir(dir))
+		stack;
+
+	log_debug("accept hints found %d from pvs_online", found);
+
+	_get_single_vgname_cmd_arg(cmd, &hints_list, &vgname);
+
+	/*
+	 * apply_hints equivalent, move devs from devs_in to devs_out if
+	 * their devno matches the devno of a hint (and if the hint matches
+	 * the vgname when a vgname is present.)
+	 */
+	dm_list_iterate_items_safe(devl, devl2, devs_in) {
+		dm_list_iterate_items_safe(hint, hint2, &hints_list) {
+			if ((MAJOR(devl->dev->dev) == MAJOR(hint->devt)) &&
+			    (MINOR(devl->dev->dev) == MINOR(hint->devt))) {
+
+				if (vgname && hint->vgname[0] && strcmp(vgname, hint->vgname))
+					goto next_dev;
+
+				snprintf(hint->name, sizeof(hint->name), "%s", dev_name(devl->dev));
+				hint->chosen = 1;
+
+				dm_list_del(&devl->list);
+				dm_list_add(devs_out, &devl->list);
+			}
+		}
+ next_dev:
+		;
+	}
+
+	log_debug("applied hints using %d other %d vgname %s from pvs_online",
+		  dm_list_size(devs_out), dm_list_size(devs_in), vgname ?: "");
+
+	dm_list_splice(hints_out, &hints_list);
+
+	free(vgname);
+
+	return 1;
+}
+
 /*
 * Returns 0: no hints are used.
 *  . newhints is set if this command should create new hints after scan
@@ -1320,6 +1426,15 @@ int get_hints(struct cmd_context *cmd, struct dm_list *hints_out, int *newhints,
 	if (!cmd->use_hints)
 		return 0;

+	/* hints = "pvs_online" */
+	if (cmd->hints_pvs_online) {
+		if (!_get_hints_from_pvs_online(cmd, &hints_list, devs_in, devs_out)) {
+			log_debug("get_hints: pvs_online failed");
+			return 0;
+		}
+		return 1;
+	}
+
 	/*
 	 * Check if another command created the nohints file to prevent us from
 	 * using hints.
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -1130,6 +1130,9 @@ int label_scan(struct cmd_context *cmd)
 			}
 		}
 	}
+
+	log_debug_devs("Filtering devices to scan done (nodata)");
+
 	cmd->filter_nodata_only = 0;

 	dm_list_iterate_items(devl, &all_devs)
--- a/lib/locking/lvmlockd.c
+++ b/lib/locking/lvmlockd.c
@@ -503,7 +503,7 @@ static int _create_sanlock_lv(struct cmd_context *cmd, struct volume_group *vg,
 		.read_ahead = DM_READ_AHEAD_NONE,
 		.stripes = 1,
 		.vg_name = vg->name,
-		.lv_name = lock_lv_name,
+		.lv_name = dm_pool_strdup(cmd->mem, lock_lv_name),
 		.zero = 1,
 	};

--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -2354,7 +2354,7 @@ static int _match_pv_tags(const struct dm_config_node *cling_tag_list_cn,
 	const struct dm_config_value *cv;
 	const char *str;
 	const char *tag_matched;
-	struct dm_list *tags_to_match = mem ? NULL : pv_tags ? : ((pv2) ? &pv2->tags : NULL);
+	struct dm_list *tags_to_match = mem ? NULL : pv_tags ? : &pv2->tags;
 	struct dm_str_list *sl;
 	unsigned first_tag = 1;

@@ -2409,7 +2409,7 @@ static int _match_pv_tags(const struct dm_config_node *cling_tag_list_cn,
 				continue;
 			}

-			if (tags_to_match && !str_list_match_list(&pv1->tags, tags_to_match, &tag_matched))
+			if (!str_list_match_list(&pv1->tags, tags_to_match, &tag_matched))
 				continue;

 			if (!pv_tags) {
--- a/libdm/dm-tools/dmsetup.c
+++ b/libdm/dm-tools/dmsetup.c
@@ -5846,12 +5846,12 @@ static int _stats_report(CMD_ARGS)
 	if (_switches[ALL_PROGRAMS_ARG])
 		_program_id = "";

-	if (_switches[VERBOSE_ARG] && subcommand && !strcmp(subcommand, "list"))
+	if (_switches[VERBOSE_ARG] && !strcmp(subcommand, "list"))
 		_statstype |= (DM_STATS_WALK_ALL
 			       | DM_STATS_WALK_SKIP_SINGLE_AREA);

 	/* suppress duplicates unless the user has requested all regions */
-	if (subcommand && !objtype_args && !strcmp(subcommand, "report"))
+	if (!strcmp(subcommand, "report") && !objtype_args)
 		/* suppress duplicate rows of output */
 		_statstype |= (DM_STATS_WALK_ALL
 			       | DM_STATS_WALK_SKIP_SINGLE_AREA);
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -15,9 +15,6 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@

-SOURCES = lvm2_activation_generator_systemd_red_hat.c
-TARGETS = lvm2_activation_generator_systemd_red_hat
-
 include $(top_builddir)/make.tmpl

 ifeq ("@BUILD_DMEVENTD@", "yes")
@@ -66,7 +63,7 @@ install_initscripts:
 	@echo "    [INSTALL] initscripts"
 	$(Q) $(INSTALL_DIR) $(initdir)
 ifeq ("@BUILD_DMEVENTD@", "yes")
-	$(Q) $(INSTALL_SCRIPT) lvm2_monitoring_init_red_hat $(initdir)/lvm2-monitor
+	$(Q) $(INSTALL_SCRIPT) lvm2_monitoring_init_red_hat $(initdir)/lvm-monitor
 endif
 ifeq ("@BUILD_LVMPOLLD@", "yes")
 	$(Q) $(INSTALL_SCRIPT) lvm2_lvmpolld_init_red_hat $(initdir)/lvm2-lvmpolld
@@ -78,24 +75,15 @@ ifeq ("@BLKDEACTIVATE@", "yes")
 	$(Q) $(INSTALL_SCRIPT) blk_availability_init_red_hat $(initdir)/blk-availability
 endif

-CFLAGS_lvm2_activation_generator_systemd_red_hat.o += $(EXTRA_EXEC_CFLAGS)
-
-lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(LVMINTERNAL_LIBS)
-	@echo "    [CC] $@"
-	$(Q) $(CC) -o $@ $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) $(LVMINTERNAL_LIBS) $(LIBS)
-
-install_systemd_generators:
-	@echo "    [INSTALL] systemd_generators"
-	$(Q) $(INSTALL_DIR) $(systemd_generator_dir)
-	$(Q) $(INSTALL_PROGRAM) lvm2_activation_generator_systemd_red_hat $(systemd_generator_dir)/lvm2-activation-generator
-
 install_systemd_units:	install_dbus_service
 	@echo "    [INSTALL] systemd_units"
 	$(Q) $(INSTALL_DIR) $(systemd_unit_dir)
+	$(Q) $(INSTALL_DATA) lvm-activate-vgs-main.service $(systemd_unit_dir)/lvm-activate-vgs-main.service
+	$(Q) $(INSTALL_DATA) lvm-activate-vgs-last.service $(systemd_unit_dir)/lvm-activate-vgs-last.service
 ifeq ("@BUILD_DMEVENTD@", "yes")
 	$(Q) $(INSTALL_DATA) dm_event_systemd_red_hat.socket $(systemd_unit_dir)/dm-event.socket
 	$(Q) $(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_unit_dir)/dm-event.service
-	$(Q) $(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_unit_dir)/lvm2-monitor.service
+	$(Q) $(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_unit_dir)/lvm-monitor.service
 endif
 ifeq ("@BLKDEACTIVATE@", "yes")
 	$(Q) $(INSTALL_DATA) blk_availability_systemd_red_hat.service $(systemd_unit_dir)/blk-availability.service
@@ -155,7 +143,9 @@ DISTCLEAN_TARGETS += \
 	lvm2_monitoring_init_red_hat \
 	lvm2_monitoring_systemd_red_hat.service \
 	lvm2_pvscan_systemd_red_hat@.service \
-	lvm2_tmpfiles_red_hat.conf
+	lvm2_tmpfiles_red_hat.conf \
+	lvm-activate-vgs-main.service \
+	lvm-activate-vgs-last.service

 # Remove ancient files
 DISTCLEAN_TARGETS += \
--- a/scripts/blk_availability_systemd_red_hat.service.in
+++ b/scripts/blk_availability_systemd_red_hat.service.in
@@ -1,7 +1,7 @@
 [Unit]
 Description=Availability of block devices
 Before=shutdown.target
-After=lvm2-activation.service iscsi-shutdown.service iscsi.service iscsid.service fcoe.service rbdmap.service
+After=lvm-activate-vgs-main.service lvm-activate-vgs-last.service iscsi-shutdown.service iscsi.service iscsid.service fcoe.service rbdmap.service
 DefaultDependencies=no
 Conflicts=shutdown.target

--- a/scripts/lvm-activate-vgs-last.service.in
+++ b/scripts/lvm-activate-vgs-last.service.in
@@ -0,0 +1,22 @@
+[Unit]
+Description=Activate LVM Volume Groups (last)
+Documentation=man:vgchange(8)
+Wants=systemd-udev-settle.service
+After=lvm-activate-vgs-main.service systemd-udev-settle.service multipathd.service cryptsetup.target
+Before=local-fs-pre.target shutdown.target
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+# "--eventactivation service" tells vgchange it is being called
+# from an activation service, so it will do nothing if
+# lvm.conf event_activation_options = "event_only".
+# "--eventactivation on" tells vgchange to enable event-based
+# pvscan activations by creating /run/lvm/event-activation-on.
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/lvm vgchange -aay --nohints --vgonline --eventactivation service,on
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
--- a/scripts/lvm-activate-vgs-main.service.in
+++ b/scripts/lvm-activate-vgs-main.service.in
@@ -0,0 +1,19 @@
+[Unit]
+Description=Activate LVM Volume Groups
+Documentation=man:vgchange(8)
+After=dm-event.socket dm-event.service
+Before=local-fs-pre.target shutdown.target
+DefaultDependencies=no
+Conflicts=shutdown.target
+
+# "--eventactivation service" tells vgchange it is being called 
+# from an activation service, so it will do nothing if
+# lvm.conf event_activation_options = "event_only".
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/lvm vgchange -aay --nohints --vgonline --eventactivation service
+RemainAfterExit=yes
+
+[Install]
+WantedBy=sysinit.target
--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
@@ -1,8 +1,8 @@
 [Unit]
-Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
+Description=Monitor LVM Logical Volumes
 Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
 Requires=dm-event.socket
-After=dm-event.socket dm-event.service lvm2-activation.service
+After=dm-event.socket dm-event.service lvm-activate-vgs-last.service
 Before=local-fs-pre.target shutdown.target
 DefaultDependencies=no
 Conflicts=shutdown.target
--- a/spec/packages.inc
+++ b/spec/packages.inc
@@ -23,10 +23,10 @@ if [ $1 = 0 ]; then
 fi

 %triggerun -- %{name} < 2.02.86-2
-%{_bindir}/systemd-sysv-convert --save lvm2-monitor >/dev/null 2>&1 || :
-/bin/systemctl --no-reload enable lvm2-monitor.service > /dev/null 2>&1 || :
-/sbin/chkconfig --del lvm2-monitor > /dev/null 2>&1 || :
-/bin/systemctl try-restart lvm2-monitor.service > /dev/null 2>&1 || :
+%{_bindir}/systemd-sysv-convert --save lvm-monitor >/dev/null 2>&1 || :
+/bin/systemctl --no-reload enable lvm-monitor.service > /dev/null 2>&1 || :
+/sbin/chkconfig --del lvm-monitor > /dev/null 2>&1 || :
+/bin/systemctl try-restart lvm-monitor.service > /dev/null 2>&1 || :
 # files in the main package

 %files
@@ -100,9 +100,6 @@ fi
 %{_mandir}/man8/lvm-config.8.gz
 %{_mandir}/man8/lvm-dumpconfig.8.gz
 %{_mandir}/man8/lvm.8.gz
-%if %{enable_systemd}
- %{_mandir}/man8/lvm2-activation-generator.8.gz
-%endif
 %{_mandir}/man8/lvmconfig.8.gz
 %{_mandir}/man8/lvmdevices.8.gz
 %{_mandir}/man8/lvmdiskscan.8.gz
@@ -187,16 +184,17 @@ fi
 %dir %{_default_run_dir}
 %if %{enable_systemd}
 %{_tmpfilesdir}/%{name}.conf
+ %{_unitdir}/lvm-activate-vgs-main.service
+ %{_unitdir}/lvm-activate-vgs-last.service
+ %{_unitdir}/lvm-monitor.service
 %{_unitdir}/blk-availability.service
- %{_unitdir}/lvm2-monitor.service
- %attr(555, -, -) %{_prefix}/lib/systemd/system-generators/lvm2-activation-generator
 %if %{have_service lvmpolld}
  %{_unitdir}/lvm2-lvmpolld.service
  %{_unitdir}/lvm2-lvmpolld.socket
 %endif
 %else
 %{_sysconfdir}/rc.d/init.d/blk-availability
- %{_sysconfdir}/rc.d/init.d/lvm2-monitor
+ %{_sysconfdir}/rc.d/init.d/lvm-monitor
 %if %{have_service lvmpolld}
  %{_sysconfdir}/rc.d/init.d/lvm2-lvmpolld
 %endif
--- a/test/shell/devicesfile-basic.sh
+++ b/test/shell/devicesfile-basic.sh
@@ -283,7 +283,7 @@ not ls "$RUNDIR/lvm/pvs_online/$PVID3"
 # arg in devices list
 _clear_online_files
 pvscan --devices "$dev3" --cache -aay "$dev3"
-pvscan --devices "$dev4","$dev3" --cache -aay "$dev4"
+pvscan --devices "$dev4" --cache -aay "$dev4"
 check lv_field $vg2/$lv2 lv_active "active"
 vgchange -an $vg2

--- a/test/unit/bcache_utils_t.c
+++ b/test/unit/bcache_utils_t.c
@@ -86,7 +86,7 @@ static void *_fix_init(struct io_engine *engine)
 	}

 	if (!_runs_is_tmpfs) {
-		(void) close(f->fd);
+		close(f->fd);
 		// reopen with O_DIRECT
 		f->fd = open(f->fname, O_RDWR | O_DIRECT);
 		T_ASSERT(f->fd >= 0);
--- a/tools/args.h
+++ b/tools/args.h
@@ -278,6 +278,11 @@ arg(errorwhenfull_ARG, '\0', "errorwhenfull", bool_VAL, 0, 0,
    "(Also see dm-thin-pool kernel module option no_space_timeout.)\n"
    "See \\fBlvmthin\\fP(7) for more information.\n")

+arg(eventactivation_ARG, '\0', "eventactivation", string_VAL, 0, 0,
+    "Specify if the command is running autoactivation from an event\n"
+    "or a fixed service. The lvm.conf event_activation_options setting\n"
+    "determines if event or service based activation commands are used.\n")
+
 arg(force_long_ARG, '\0', "force", 0, ARG_COUNTABLE, 0,
    "Force metadata restore even with thin pool LVs.\n"
    "Use with extreme caution. Most changes to thin metadata\n"
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -1642,14 +1642,15 @@ DESC: Record that a PV is online or offline.

 pvscan --cache_long --activate ay
 OO: --ignorelockingfailure, --reportformat ReportFmt,
--major Number, --minor Number, --noudevsync
+--major Number, --minor Number, --noudevsync, --eventactivation String
 OP: PV|String ...
 IO: --background
 ID: pvscan_cache
 DESC: Record that a PV is online and autoactivate the VG if complete.

 pvscan --cache_long --listvg PV
-OO: --ignorelockingfailure, --checkcomplete, --vgonline, --udevoutput
+OO: --ignorelockingfailure, --checkcomplete, --vgonline, --udevoutput,
+--eventactivation String
 ID: pvscan_cache
 DESC: Record that a PV is online and list the VG using the PV.

@@ -1747,7 +1748,8 @@ DESC: Start or stop processing LV conversions.

 vgchange --activate Active
 OO: --activationmode ActivationMode, --ignoreactivationskip, --partial, --sysinit,
--readonly, --ignorelockingfailure, --monitor Bool, --poll Bool, OO_VGCHANGE
+--readonly, --ignorelockingfailure, --monitor Bool, --poll Bool,
+--vgonline, --eventactivation String, OO_VGCHANGE
 OP: VG|Tag|Select ...
 IO: --ignoreskippedcluster
 ID: vgchange_activate
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -2540,6 +2540,8 @@ static int _get_current_settings(struct cmd_context *cmd)
 		if (!strcmp(hint_mode, "none")) {
 			cmd->enable_hints = 0;
 			cmd->use_hints = 0;
+		} else if (!strcmp(hint_mode, "pvs_online")) {
+			cmd->hints_pvs_online = 1;
 		}
 	}

--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -21,6 +21,8 @@

 #include <dirent.h>

+int online_pvid_file_read(char *path, int *major, int *minor, char *vgname);
+
 struct pvscan_params {
 	int new_pvs_found;
 	int pvs_found;
@@ -46,6 +48,8 @@ static const char *_pvs_online_dir = DEFAULT_RUN_DIR "/pvs_online";
 static const char *_vgs_online_dir = DEFAULT_RUN_DIR "/vgs_online";
 static const char *_pvs_lookup_dir = DEFAULT_RUN_DIR "/pvs_lookup";

+static const char *_event_activation_file = DEFAULT_RUN_DIR "/event-activation-on";
+
 static int _pvscan_display_pv(struct cmd_context *cmd,
 				  struct physical_volume *pv,
 				  struct pvscan_params *params)
@@ -179,6 +183,84 @@ out:
 	return ret;
 }

+/*
+ * Event based activation
+ * lvm.conf event_activation_options = "event_only"
+ * . all events are used for activation
+ * . no fixed services are used for activation
+ * . lvm.conf event_activation=1 required
+ *
+ * vgchange -aay --eventactivation service
+ * . does nothing
+ * vgchange -aay --eventactivation event
+ * . does activation
+ * pvscan --eventactivation event
+ * . does activation
+ *
+ * ---
+ *
+ * Non-event based activation
+ * lvm.conf event_activation_options = "service_only"
+ * . fixed services are used for activation
+ * . no events are used for activation
+ * . lvm.conf event_activation=0 is equivalent to
+ *   event_activation=1 event_activation_options="service_only"
+ *
+ * vgchange -aay --eventactivation service
+ * . does activation
+ * vgchange -aay --eventactivation event
+ * . does nothing
+ * pvscan --eventactivation event
+ * . does nothing
+ *
+ * ---
+ *
+ * Mix of event and non-event based activation
+ * lvm.conf event_activation_options = "service_to_event"
+ * . both services and events are used for activation
+ * . fixed services are used for activation initially,
+ *   and last service enables event based activation
+ *   by creating the event-activation-on file
+ *
+ * vgchange -aay --eventactivation service
+ * . does activation only if event-activation-on does not exist
+ * vgchange -aay --eventactivation event
+ * . does activation only if event-activation-on exists
+ * vgchange -aay --eventactivation service,on
+ * . does activation only if event-activation-on does not exist
+ * . creates event-activation-on to enable event-based activation
+ * vgchange --eventactivation on|off
+ * . create or remove event-activation-on to enable|disable
+ *   event-based activation
+ * pvscan --eventactivation event
+ * . does activation only if event-activation-on exists
+ *
+ */
+
+int event_activation_enable(struct cmd_context *cmd)
+{
+	FILE *fp;
+
+	if (!(fp = fopen(_event_activation_file, "w")))
+		return_0;
+	if (fclose(fp))
+                stack;
+	return 1;
+}
+
+int event_activation_is_on(struct cmd_context *cmd)
+{
+	struct stat buf;
+
+	if (!stat(_event_activation_file, &buf))
+		return 1;
+
+	if (errno != ENOENT)
+		log_debug("event_activation_is_on errno %d", errno);
+
+	return 0;
+}
+
 /*
 * Avoid a duplicate pvscan[%d] prefix when logging to the journal.
 * FIXME: this should probably replace if (udevoutput) with
@@ -225,7 +307,7 @@ static char *_vgname_in_pvid_file_buf(char *buf)

 #define MAX_PVID_FILE_SIZE 512

-static int _online_pvid_file_read(char *path, int *major, int *minor, char *vgname)
+int online_pvid_file_read(char *path, int *major, int *minor, char *vgname)
 {
 	char buf[MAX_PVID_FILE_SIZE] = { 0 };
 	char *name;
@@ -328,7 +410,7 @@ static void _online_pvid_file_remove_devno(int major, int minor)
 		file_minor = 0;
 		memset(file_vgname, 0, sizeof(file_vgname));

-		_online_pvid_file_read(path, &file_major, &file_minor, file_vgname);
+		online_pvid_file_read(path, &file_major, &file_minor, file_vgname);

 		if ((file_major == major) && (file_minor == minor)) {
 			log_debug("Unlink pv online %s", path);
@@ -367,7 +449,7 @@ static void _online_files_remove(const char *dirpath)
 		log_sys_debug("closedir", dirpath);
 }

-static int _online_pvid_file_create(struct cmd_context *cmd, struct device *dev, const char *vgname)
+int online_pvid_file_create(struct cmd_context *cmd, struct device *dev, const char *vgname, int ignore_existing, int *exists)
 {
 	char path[PATH_MAX];
 	char buf[MAX_PVID_FILE_SIZE] = { 0 };
@@ -407,8 +489,13 @@ static int _online_pvid_file_create(struct cmd_context *cmd, struct device *dev,

 	fd = open(path, O_CREAT | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR);
 	if (fd < 0) {
-		if (errno == EEXIST)
+		if (errno == EEXIST) {
+			if (exists)
+				*exists = 1;
+			if (ignore_existing)
+				return 1;
 			goto check_duplicate;
+		}
 		log_error_pvscan(cmd, "Failed to create online file for %s path %s error %d", dev_name(dev), path, errno);
 		return 0;
 	}
@@ -427,7 +514,6 @@ static int _online_pvid_file_create(struct cmd_context *cmd, struct device *dev,
 	}

 	/* We don't care about syncing, these files are not even persistent. */
-
 	if (close(fd))
 		log_sys_debug("close", path);

@@ -447,7 +533,7 @@ check_duplicate:

 	memset(file_vgname, 0, sizeof(file_vgname));

-	_online_pvid_file_read(path, &file_major, &file_minor, file_vgname);
+	online_pvid_file_read(path, &file_major, &file_minor, file_vgname);

 	if ((file_major == major) && (file_minor == minor)) {
 		log_debug("Existing online file for %d:%d", major, minor);
@@ -660,7 +746,7 @@ static int _count_pvid_files_from_lookup_file(struct cmd_context *cmd, struct de
 	return (vgname) ? 1 : 0;
 }

-static void _online_dir_setup(struct cmd_context *cmd)
+void online_dir_setup(struct cmd_context *cmd)
 {
 	struct stat st;
 	int rv;
@@ -748,7 +834,7 @@ static int _pvscan_aa_single(struct cmd_context *cmd, const char *vg_name,

 	log_debug("pvscan autoactivating VG %s.", vg_name);

-	if (!vgchange_activate(cmd, vg, CHANGE_AAY)) {
+	if (!vgchange_activate(cmd, vg, CHANGE_AAY, 1)) {
 		log_error_pvscan(cmd, "%s: autoactivation failed.", vg->name);
 		pp->activate_errors++;
 	}
@@ -756,7 +842,7 @@ static int _pvscan_aa_single(struct cmd_context *cmd, const char *vg_name,
 	return ECMD_PROCESSED;
 }

-static int _online_vg_file_create(struct cmd_context *cmd, const char *vgname)
+int online_vg_file_create(struct cmd_context *cmd, const char *vgname)
 {
 	char path[PATH_MAX];
 	int fd;
@@ -847,7 +933,7 @@ static int _get_devs_from_saved_vg(struct cmd_context *cmd, const char *vgname,
 		file_minor = 0;
 		memset(file_vgname, 0, sizeof(file_vgname));

-		_online_pvid_file_read(path, &file_major, &file_minor, file_vgname);
+		online_pvid_file_read(path, &file_major, &file_minor, file_vgname);

 		if (file_vgname[0] && strcmp(vgname, file_vgname)) {
 			log_error_pvscan(cmd, "Wrong VG found for %d:%d PVID %s: %s vs %s",
@@ -1036,7 +1122,7 @@ static int _pvscan_aa_quick(struct cmd_context *cmd, struct pvscan_aa_params *pp

 	log_debug("pvscan autoactivating VG %s.", vgname);

-	if (!vgchange_activate(cmd, vg, CHANGE_AAY)) {
+	if (!vgchange_activate(cmd, vg, CHANGE_AAY, 1)) {
 		log_error_pvscan(cmd, "%s: autoactivation failed.", vg->name);
 		pp->activate_errors++;
 	}
@@ -1070,7 +1156,7 @@ static int _pvscan_aa(struct cmd_context *cmd, struct pvscan_aa_params *pp,
 	 * to run the activation.  The first to create the file will do it.
 	 */
 	dm_list_iterate_items_safe(sl, sl2, vgnames) {
-		if (!_online_vg_file_create(cmd, sl->str)) {
+		if (!online_vg_file_create(cmd, sl->str)) {
 			log_print_pvscan(cmd, "VG %s skip autoactivation.", sl->str);
 			str_list_del(vgnames, sl->str);
 			continue;
@@ -1109,11 +1195,17 @@ static int _pvscan_aa(struct cmd_context *cmd, struct pvscan_aa_params *pp,
 		 * PROCESS_SKIP_SCAN: we have already done lvmcache_label_scan
 		 * so tell process_each to skip it.
 		 */
+		if (do_all)
+			read_flags |= PROCESS_SKIP_SCAN;

+		/*
+		 * When the command is processing specific devs (not all), it
+		 * has done setup_devices_no_file_match() to avoid matching ids
+		 * fo all devs unnecessarily, but now that we're falling back
+		 * to process_each_vg() we need to complete the id matching.
+		 */
 		if (!do_all)
-			lvmcache_label_scan(cmd);
-
-		read_flags |= PROCESS_SKIP_SCAN;
+			device_ids_match(cmd);

 		ret = process_each_vg(cmd, 0, NULL, NULL, vgnames, read_flags, 0, handle, _pvscan_aa_single);
 	}
@@ -1254,7 +1346,7 @@ static void _set_pv_devices_online(struct cmd_context *cmd, struct volume_group
 		minor = 0;
 		file_vgname[0] = '\0';

-		_online_pvid_file_read(path, &major, &minor, file_vgname);
+		online_pvid_file_read(path, &major, &minor, file_vgname);

 		if (file_vgname[0] && strcmp(vg->name, file_vgname)) {
 			log_warn("WARNING: VG %s PV %s wrong vgname in online file %s",
@@ -1420,7 +1512,7 @@ static int _online_devs(struct cmd_context *cmd, int do_all, struct dm_list *pvs
 		 * Create file named for pvid to record this PV is online.
 		 * The command creates/checks online files only when --cache is used.
 		 */
-		if (do_cache && !_online_pvid_file_create(cmd, dev, vg ? vg->name : NULL)) {
+		if (do_cache && !online_pvid_file_create(cmd, dev, vg ? vg->name : NULL, 0, NULL)) {
 			log_error_pvscan(cmd, "PV %s failed to create online file.", dev_name(dev));
 			release_vg(vg);
 			ret = 0;
@@ -1505,7 +1597,7 @@ static int _online_devs(struct cmd_context *cmd, int do_all, struct dm_list *pvs
 			} else if (!do_check_complete) {
 				log_print("VG %s", vgname);
 			} else if (vg_complete) {
-				if (do_vgonline && !_online_vg_file_create(cmd, vgname)) {
+				if (do_vgonline && !online_vg_file_create(cmd, vgname)) {
 					log_print("VG %s finished", vgname);
 				} else {
 					/*
@@ -1871,6 +1963,7 @@ int pvscan_cache_cmd(struct cmd_context *cmd, int argc, char **argv)
 {
 	struct pvscan_aa_params pp = { 0 };
 	struct dm_list complete_vgnames;
+	const char *ea;
 	int do_activate = arg_is_set(cmd, activate_ARG);
 	int event_activation;
 	int devno_args = 0;
@@ -1933,7 +2026,7 @@ int pvscan_cache_cmd(struct cmd_context *cmd, int argc, char **argv)

 	do_all = !argc && !devno_args;

-	_online_dir_setup(cmd);
+	online_dir_setup(cmd);

 	if (do_all) {
 		if (!_pvscan_cache_all(cmd, argc, argv, &complete_vgnames))
@@ -1944,6 +2037,36 @@ int pvscan_cache_cmd(struct cmd_context *cmd, int argc, char **argv)
 			log_verbose("Ignoring pvscan --cache because event_activation is disabled.");
 			return ECMD_PROCESSED;
 		}
+
+
+		if ((ea = arg_str_value(cmd, eventactivation_ARG, NULL))) {
+			int service_only = 0, event_only = 0, service_to_event = 0;
+			int ea_service = 0, ea_event = 0, ea_on = 0;
+
+			if (!get_event_activation_config_settings(cmd, &service_only, &event_only, &service_to_event))
+				return ECMD_FAILED;
+			if (!get_event_activation_command_options(cmd, ea, &ea_service, &ea_event, &ea_on))
+				return ECMD_FAILED;
+
+			if (ea_event) {
+				if (!event_activation) {
+					log_print("Skip pvscan for event and event_activation=0.");
+					return ECMD_PROCESSED;
+				}
+				if (service_only) {
+					log_print("Skip pvscan for event and event_activation_options service_only.");
+					return ECMD_PROCESSED;
+				}
+				if (service_to_event && !event_activation_is_on(cmd)) {
+					log_print("Skip pvscan for event and no event-activation-on.");
+					return ECMD_PROCESSED;
+				}
+			} else {
+				log_error("Option --eventactivation %s is not used by pvscan.", ea);
+				return ECMD_FAILED;
+			}
+		}
+
 		if (!_pvscan_cache_args(cmd, argc, argv, &complete_vgnames))
 			return ECMD_FAILED;
 	}
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -5714,3 +5714,90 @@ bad:
 out:
 	return 0;
 }
+
+int get_event_activation_config_settings(struct cmd_context *cmd,
+				  int *service_only, int *event_only, int *service_to_event)
+{
+	const struct dm_config_node *cn;
+	const struct dm_config_value *cv;
+	int eo = 0, so = 0, se = 0;
+
+	if (!(cn = find_config_tree_array(cmd, global_event_activation_options_CFG, NULL)))
+                return 1;
+
+	for (cv = cn->v; cv; cv = cv->next) {
+		if (cv->type != DM_CFG_STRING)
+			continue;
+		if (!strcmp(cv->v.str, "service_only"))
+			so = 1;
+		else if (!strcmp(cv->v.str, "event_only"))
+			eo = 1;
+		else if (!strcmp(cv->v.str, "service_to_event"))
+			se = 1;
+		else if (strlen(cv->v.str) > 0)
+			log_warn("WARNING: ignoring unrecognized event_activation_options value %s.", cv->v.str);
+	}
+
+	if (se && (so || eo)) {
+		log_warn("WARNING: ignoring incompatible event_activation_options, using service_to_event.");
+		*service_to_event = 1;
+	} else if (so && eo) {
+		log_warn("WARNING: ignoring incompatible event_activation_options, using event_only.");
+		*event_only = 1;
+	} else if (se) {
+		*service_to_event = 1;
+	} else if (so) {
+		*service_only = 1;
+	} else if (eo) {
+		*event_only = 1;
+	} else {
+		*service_to_event = 1;
+	}
+	return 1;
+}
+
+static int _ea_option_value(const char *val, int *ea_service, int *ea_event, int *ea_on)
+{
+	if (!strcmp(val, "service"))
+		*ea_service = 1;
+	else if (!strcmp(val, "event"))
+		*ea_event = 1;
+	else if (!strcmp(val, "on"))
+		*ea_on = 1;
+	else {
+		log_error("Unknown --eventactivation value.");
+		return 0;
+	}
+	return 1;
+}
+
+int get_event_activation_command_options(struct cmd_context *cmd, const char *ea, int *ea_service, int *ea_event, int *ea_on)
+{
+	char ea_vals[128] = {0};
+	char *val1, *val2;
+
+	strncpy(ea_vals, ea, 127);
+
+	/* Currently only two values can be used together. */
+
+	val1 = ea_vals;
+
+	if ((val2 = strchr(ea_vals, ','))) {
+		*val2 = '\0';
+		val2++;
+	}
+
+	if (val1 && !_ea_option_value(val1, ea_service, ea_event, ea_on))
+		return 0;
+
+	if (val2 && !_ea_option_value(val2, ea_service, ea_event, ea_on))
+		return 0;
+
+	if (*ea_service && *ea_event) {
+		log_error("Invalid --eventactivation options, service and event are incompatible.");
+		return 0;
+	}
+
+	return 1;
+}
+
--- a/tools/toollib.h
+++ b/tools/toollib.h
@@ -237,4 +237,9 @@ int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv,

 int get_lvt_enum(struct logical_volume *lv);

+int get_event_activation_config_settings(struct cmd_context *cmd,
+		int *service_only, int *event_only, int *service_to_event);
+int get_event_activation_command_options(struct cmd_context *cmd,
+		const char *ea, int *ea_service, int *ea_event, int *ea_on);
+
 #endif
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -226,9 +226,8 @@ int lvconvert_poll(struct cmd_context *cmd, struct logical_volume *lv, unsigned
 int mirror_remove_missing(struct cmd_context *cmd,
 			  struct logical_volume *lv, int force);

-
 int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg,
-		       activation_change_t activate);
+                      activation_change_t activate, int vg_complete_to_activate);

 int vgchange_background_polling(struct cmd_context *cmd, struct volume_group *vg);

@@ -295,6 +294,11 @@ int lvconvert_cachevol_attach_single(struct cmd_context *cmd,
                                     struct logical_volume *lv,
                                     struct processing_handle *handle);

+int online_pvid_file_create(struct cmd_context *cmd, struct device *dev, const char *vgname, int ignore_existing, int *exists);
 void online_vg_file_remove(const char *vgname);
+int online_vg_file_create(struct cmd_context *cmd, const char *vgname);
+void online_dir_setup(struct cmd_context *cmd);
+int event_activation_enable(struct cmd_context *cmd);
+int event_activation_is_on(struct cmd_context *cmd);

 #endif
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -19,6 +19,7 @@
 struct vgchange_params {
 	int lock_start_count;
 	unsigned int lock_start_sanlock : 1;
+	unsigned int vg_complete_to_activate : 1;
 };

 /*
@@ -194,11 +195,47 @@ int vgchange_background_polling(struct cmd_context *cmd, struct volume_group *vg
 	return 1;
 }

+static int _online_pvid_file_create_all(struct cmd_context *cmd)
+{
+	struct lvmcache_info *info;
+	struct dev_iter *iter;
+	struct device *dev;
+	const char *vgname;
+	int exists;
+	int exist_count = 0;
+	int create_count = 0;
+
+	if (!(iter = dev_iter_create(NULL, 0)))
+		return 0;
+	while ((dev = dev_iter_get(cmd, iter))) {
+		if (dev->pvid[0] &&
+		    (info = lvmcache_info_from_pvid(dev->pvid, dev, 0))) {
+			vgname = lvmcache_vgname_from_info(info);
+			if (vgname && !is_orphan_vg(vgname)) {
+				/*
+				 * Ignore exsting pvid file because a pvscan may be creating
+				 * the same file as the same time we are, which is expected.
+				 */
+				exists = 0;
+				online_pvid_file_create(cmd, dev, vgname, 1, &exists);
+				if (exists)
+					exist_count++;
+				else
+					create_count++;
+			}
+		}
+	}
+	dev_iter_destroy(iter);
+	log_debug("PV online files created %d exist %d", create_count, exist_count);
+	return 1;
+}
+
 int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg,
-		      activation_change_t activate)
+		      activation_change_t activate, int vg_complete_to_activate)
 {
 	int lv_open, active, monitored = 0, r = 1;
 	const struct lv_list *lvl;
+	struct pv_list *pvl;
 	int do_activate = is_change_activating(activate);

 	/*
@@ -219,6 +256,20 @@ int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg,
 		return 1;
 	}

+	if (arg_is_set(cmd, vgonline_ARG) && !online_vg_file_create(cmd, vg->name)) {
+		log_print("VG %s already online", vg->name);
+		return 1;
+	}
+
+	if (do_activate && vg_complete_to_activate) {
+		dm_list_iterate_items(pvl, &vg->pvs) {
+			if (!pvl->pv->dev) {
+				log_print("VG %s is incomplete.", vg->name);
+				return 1;
+			}
+		}
+	}
+
 	/*
 	 * Safe, since we never write out new metadata here. Required for
 	 * partial activation to work.
@@ -647,6 +698,7 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
 			    struct volume_group *vg,
 			    struct processing_handle *handle)
 {
+	struct vgchange_params *vp = (struct vgchange_params *)handle->custom_handle;
 	int ret = ECMD_PROCESSED;
 	unsigned i;
 	activation_change_t activate;
@@ -699,9 +751,12 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
 		log_print_unless_silent("Volume group \"%s\" successfully changed", vg->name);
 	}

+	if (arg_is_set(cmd, vgonline_ARG))
+		online_dir_setup(cmd);
+
 	if (arg_is_set(cmd, activate_ARG)) {
 		activate = (activation_change_t) arg_uint_value(cmd, activate_ARG, 0);
-		if (!vgchange_activate(cmd, vg, activate))
+		if (!vgchange_activate(cmd, vg, activate, vp->vg_complete_to_activate))
 			return_ECMD_FAILED;
 	} else if (arg_is_set(cmd, refresh_ARG)) {
 		/* refreshes the visible LVs (which starts polling) */
@@ -722,8 +777,113 @@ static int _vgchange_single(struct cmd_context *cmd, const char *vg_name,
 	return ret;
 }

+static int _check_event_activation(struct cmd_context *cmd, struct vgchange_params *vp, int *skip_command, int *enable_events)
+{
+	const char *ea;
+	int service_only = 0, event_only = 0, service_to_event = 0;
+	int ea_service = 0, ea_event = 0, ea_on = 0;
+	int on_file_exists;
+	int event_activation;
+
+	if (!(ea = arg_str_value(cmd, eventactivation_ARG, NULL))) {
+		log_error("No eventactivation value.");
+		return 0;
+	}
+
+	/* lvm.conf event_activation_options */
+	if (!get_event_activation_config_settings(cmd, &service_only, &event_only, &service_to_event))
+		return_0;
+
+	/* --eventactivation values */
+	if (!get_event_activation_command_options(cmd, ea, &ea_service, &ea_event, &ea_on))
+		return_0;
+
+	event_activation = find_config_tree_bool(cmd, global_event_activation_CFG, NULL);
+
+	/*
+	 * The combination of lvm.conf event_activation/event_activation_options
+	 * and the --eventactivation service|event value determines if this
+	 * command should do anything or be skipped, along with the existence of
+	 * the /run/lvm/event-activation-on file in case of service_to_event.
+	 */
+	if (!event_activation) {
+		if (ea_event) {
+			log_print("Skip vgchange for event and event_activation=0.");
+			*skip_command = 1;
+			return 1;
+		}
+	} else {
+		if (event_only && ea_service) {
+			log_print("Skip vgchange for service and event_activation_options event_only.");
+			*skip_command = 1;
+			return 1;
+		}
+		if (service_only && ea_event) {
+			log_print("Skip vgchange for event and event_activation_options service_only.");
+			*skip_command = 1;
+			return 1;
+		}
+
+		on_file_exists = event_activation_is_on(cmd);
+
+		if (service_to_event && ea_service && on_file_exists) {
+			log_print("Skip vgchange for service and event-activation-on.");
+			*skip_command = 1;
+			return 1;
+		}
+		if (service_to_event && ea_event && !on_file_exists) {
+			log_print("Skip vgchange for event and no event-activation-on.");
+			*skip_command = 1;
+			return 1;
+		}
+	}
+
+	/*
+	 * Switch from service activation to event activation when:
+	 * lvm.conf event_activation=1,
+	 * event_activation_options=service_to_event,
+	 * and --eventactivation service,on.
+	 *
+	 * When enabling event-based activation, first create the
+	 * /run/lvm/event-activation-on file to tell other commands
+	 * to begin responding to PV events and doing activation
+	 * for newly completed VGs.  It also needs to create online
+	 * files for existing PVs because some VGs may be incomplete
+	 * at this point, and future pvscan commands need to
+	 * find online files for PVs that have already appeared.
+	 * The label scan provides info to know which PVs are
+	 * present and should have pvid online files created.
+	 *
+	 * process_each_vg() usually begins with lock_global() and
+	 * lvmcache_label_scan(), and then processes each VG.
+	 * In this case, lock_global/lvmcache_label_scan are done
+	 * before calling process_each_vg. This allows a special
+	 * step to be inserted between the label scan and processing
+	 * vgs. That step creates the pvid online files, which
+	 * requires label scan info.  The lock_global and
+	 * lvmcache_label_scan will be skipped by process_each_vg
+	 * since they are already done here.
+	 */
+	if (event_activation && service_to_event && ea_service && ea_on) {
+		if (!event_activation_enable(cmd))
+			log_warn("WARNING: Failed to create event-activation-on.");
+		*enable_events = 1;
+	}
+
+	/*
+	 * lvm.conf service_to_event, and vgchange -aay --eventactivation service,
+	 * then only activate LVs if the VG is complete.
+	 * A later event will complete the VG and activate it.
+	 */
+	if (event_activation && service_to_event && ea_service)
+		vp->vg_complete_to_activate = 1;
+
+	return 1;
+}
+
 int vgchange(struct cmd_context *cmd, int argc, char **argv)
 {
+	struct vgchange_params vp = { 0 };
 	struct processing_handle *handle;
 	uint32_t flags = 0;
 	int ret;
@@ -837,6 +997,24 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv)
 			cmd->lockd_vg_enforce_sh = 1;
 	}

+	if (arg_is_set(cmd, eventactivation_ARG)) {
+		int skip_command = 0, enable_events = 0;
+		if (!_check_event_activation(cmd, &vp, &skip_command, &enable_events))
+			return ECMD_FAILED;
+		if (skip_command)
+			return ECMD_PROCESSED;
+		if (enable_events) {
+			if (!event_activation_enable(cmd))
+				log_warn("WARNING: Failed to create event-activation-on.");
+			/* The process_each_vg lock_global/lvmcache_label_scan will be skipped. */
+			if (!lock_global(cmd, "sh"))
+				return ECMD_FAILED;
+			lvmcache_label_scan(cmd);
+			_online_pvid_file_create_all(cmd);
+			flags |= PROCESS_SKIP_SCAN;
+		}
+	}
+
 	if (update)
 		flags |= READ_FOR_UPDATE;
 	else if (arg_is_set(cmd, activate_ARG))
@@ -847,6 +1025,8 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv)
 		return ECMD_FAILED;
 	}

+	handle->custom_handle = &vp;
+
 	ret = process_each_vg(cmd, argc, argv, NULL, NULL, flags, 0, handle, &_vgchange_single);

 	destroy_processing_handle(cmd, handle);
--- a/udev/69-dm-lvm-metad.rules.in
+++ b/udev/69-dm-lvm-metad.rules.in
@@ -121,6 +121,6 @@ LABEL="direct_pvscan"
 #  MD    |          |      X      |       X*       |                   |
 #  loop  |          |      X      |       X*       |                   |
 #  other |    X     |             |       X        |                   |   X
-RUN+="(LVM_EXEC)/lvm pvscan --background --cache --activate ay --major $major --minor $minor", ENV{LVM_SCANNED}="1"
+RUN+="(LVM_EXEC)/lvm pvscan --cache -aay --eventactivation event --major $major --minor $minor", ENV{LVM_SCANNED}="1"

 LABEL="lvm_end"
--- a/udev/69-dm-lvm.rules.in
+++ b/udev/69-dm-lvm.rules.in
@@ -78,9 +78,19 @@ ENV{SYSTEMD_READY}="1"
 #
 # TODO: adjust the output of vgchange -aay so that
 # it's better suited to appearing in the journal.
+#
+# "--eventactivation event" used with pvscan or vgchange
+# tells the command that it is being run from an event.
+# The command does nothing if lvm.conf event_activation=0.
+# The command does nothing if lvm.conf event_activation=1,
+# and lvm.conf event_activation_options="service_only".
+# The command goes ahead if event_activation_options="event_only",
+# or if event_activation_options="service_to_event" and the
+# event-activation-on file exists.
+#

-IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --udevoutput --journal=output $env{DEVNAME}"
-ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="/usr/bin/systemd-run -r --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}"
+IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --eventactivation event --udevoutput --journal=output $env{DEVNAME}"
+ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="/usr/bin/systemd-run -r --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} lvm vgchange -aay --config devices/hints=pvs_online --eventactivation event $env{LVM_VG_NAME_COMPLETE}"
 GOTO="lvm_end"

 LABEL="lvm_end"
Author	SHA1	Message	Date
David Teigland	5e48b04561	pvscan: only add device args to dev cache Optimize the common pvscan --cache command by only adding the necessary devs to dev-cache.	2021-10-18 16:24:24 -05:00
David Teigland	3e893b9b09	hints: new pvs_online type Use a new form of hints to reduce device scanning in vgchange -aay run by the udev rule for event based autoactivation. Standard hints allow a command with a named VG arg to scan only the PVs in the named VG, rather than scanning all available PVs. Standard hints are useful with a stable set of system devices. When new devices are arriving, as occurs during system startup, the hints are repeatedly invalidated, which makes standard hints unhelpful while devices are regularly appearing. This is the situation in which vgchange -aay is used, so standard hints are not generally helpful for autoactivation. In the context of system startup, pvscan --cache is keeping track of available PVs using the pvs_online files, similar to what the hints file does for a running system. Given this, a new hint mode, hints = "pvs_online", is added which derives an equivalent to standard hints, based on pvs_online files that are being created by udev-run pvscans. This hint mode is useful while devices are appearing, e.g. during system startup, and vgchange -aay can benefit from it. pvscan --cache -aay autoactivation already has a similar optimization (the "quick" activation case) that is based on the pvs_online file, but it is not implemented as a form of hints. This new form of hints is mainly useful in the context of event based autoactivation, during which standard hints are not useful. Once the system is in a steady state after startup (devices are not regularly appearing), the standard hints are most useful. The pvs_online hint method could be used on a running system, but would be no better than standard hints, and may be inferior because pvs_online files are not rigidly updated after system startup.	2021-10-15 16:27:04 -05:00
David Teigland	c06d5fe28e	add fixed event activation services Add two new fixed activation services for startup: lvm-activate-vgs-main and lvm-activate-vgs-last. The -main service runs early, without service dependencies. The -last service runs later, after other services have started (other services that may set up devices for PVs, like mulitpathd.) The lvm-activate-vgs services both run "vgchange -aay" to activate all VGs that are preset and complete at the time of system startup. When there are many VGs, these two vgchange commands will replace many per-VG vgchange commands. The last service enables event activation by creating the file /run/lvm/event-activation-on. After that, new devices that appear will be processed by event based autoactivation commands. Prior to the existence of the event-activation-on file, event-based commands do nothing. lvm.conf event_activation_options can be used to configure service-based activation only, or event-based activation only, or the approach described above which begins with service based activation and then switches to event-based. service_only: only the -main and -last services will activate VGs. VGs on devices that appear later will not be autoactivated. event_only: the -main and -last services will not activate any VGs, and all VGs will be activated from per-VG event-based activation commands. service_to_event: the -main and -last services will activate VGs that are complete at the time the services run, and VGs that appear later will be activated from per-VG event-based activation commands.	2021-10-15 16:25:01 -05:00
David Teigland	4f1957ee50	vgchange: add vgonline option Using --vgonline with vgchange -aay makes vgchange use /run/lvm/vgs_online/ files in the same way as pvscan. If the online file for the vg does not exist and the command is able to exclusively create it, then it will activate the VG. If the online file exists or the create fails, then the VG will not be activated.	2021-10-15 12:59:03 -05:00