cleanup: snapshots of snapshots message

VERSION

@@ -1 +1 @@
-2.02.134(2)-git (2015-10-30)
+2.02.133(2)-git (2015-09-22)

VERSION_DM

@@ -1 +1 @@
-1.02.111-git (2015-10-30)
+1.02.110-git (2015-09-22)

WHATS_NEW

@@ -1,17 +1,5 @@
-Version 2.02.134 - 
-====================================
-
-Version 2.02.133 - 30th October 2015
-====================================
-  Support repeated -o|--options for reporting commands.
-  Support -o- and -o# for reporting commands to remove and compact fields.
-  Fix missing PVs from pvs output if vgremove is run concurrently.
-  Remove unwanted error message when running pvs/vgs/lvs and vgremove at once.
-  Check newly created VG's metadata do not overlap in metadata ring buffer.
-  Check metadata area size is at least the minimum size defined for the format.
-  Thin pool targets uses low_water_mark from profile.
-  Dropping 'yet' from error of unsupported thick snapshot of snapshots.
-  Do not support unpartitioned DASD devices with CDL formatted with pvcreate.
+Version 2.02.133 - 
+======================================
   For thins use flush for suspend only when volume size is reduced.
   Enable code which detects the need of flush during suspend.
   Ensure --use-policy will resize volume to fit below threshold.

WHATS_NEW_DM

@@ -1,10 +1,5 @@
-Version 1.02.111 - 
-====================================
-
-Version 1.02.110 - 30th October 2015
-====================================
-  Disable thin monitoring plugin when it fails too often (>10 times).
-  Fix/restore parsing of empty field '-' when processing dmeventd event.
+Version 1.02.110 - 
+======================================
   Enhance dm_tree_node_size_changed() to recognize size reduction.
   Support exit on idle for dmenventd (1 hour).
   Add support to allow unmonitor device from plugin itself.

daemons/dmeventd/dmeventd.c

@@ -473,48 +473,34 @@ static int _pthread_create_smallstack(pthread_t *t, void *(*fun)(void *), void *
 
 /*
  * Fetch a string off src and duplicate it into *ptr.
- * Pay attention to zero-length and 'empty' strings ('-').
+ * Pay attention to zero-length strings.
  */
 /* FIXME? move to libdevmapper to share with the client lib (need to
    make delimiter a parameter then) */
 static int _fetch_string(char **ptr, char **src, const int delimiter)
 {
-	int ret = 1;
+	int ret = 0;
 	char *p;
 	size_t len;
-	*ptr = NULL; /* Empty field returns NULL pointer */
 
-	if ((*src)[0] == '-') {
-		/* Could be empty field '-', handle without allocation */
-		if ((*src)[1] == '\0') {
-			(*src)++;
-			goto out;
-		} else if ((*src)[1] == delimiter) {
-			(*src) += 2;
-			goto out;
+	if ((p = strchr(*src, delimiter)))
+		*p = 0;
+
+	if ((*ptr = dm_strdup(*src))) {
+		if ((len = strlen(*ptr)))
+			*src += len;
+		else {
+			dm_free(*ptr);
+			*ptr = NULL;
 		}
+
+		(*src)++;
+		ret = 1;
 	}
 
-	if ((p = strchr(*src, delimiter))) {
-		if (*src < p) {
-			*p = 0; /* Temporary exit with \0 */
-			if (!(*ptr = dm_strdup(*src))) {
-				log_error("Failed to fetch item %s.", *src);
-				ret = 0; /* Allocation fail */
-			}
-			*p = delimiter;
-			*src = p;
-		}
-		(*src)++; /* Skip delmiter, next field */
-	} else if ((len = strlen(*src))) {
-		/* No delimiter, item ends with '\0' */
-		if (!(*ptr = dm_strdup(*src))) {
-			log_error("Failed to fetch last item %s.", *src);
-			ret = 0; /* Fail */
-		}
-		*src += len + 1;
-	}
-out:
+	if (p)
+		*p = delimiter;
+
 	return ret;
 }
 

daemons/dmeventd/plugins/thin/dmeventd_thin.c

@@ -18,7 +18,6 @@
 
 #include <sys/wait.h>
 #include <stdarg.h>
-#include <pthread.h>
 
 /* TODO - move this mountinfo code into library to be reusable */
 #ifdef __linux__
@@ -37,8 +36,6 @@
 
 #define UMOUNT_COMMAND "/bin/umount"
 
-#define MAX_FAILS	(10)
-
 #define THIN_DEBUG 0
 
 struct dso_state {
@@ -47,7 +44,6 @@ struct dso_state {
 	int data_percent_check;
 	uint64_t known_metadata_size;
 	uint64_t known_data_size;
-	unsigned fails;
 	char cmd_str[1024];
 };
 
@@ -161,7 +157,7 @@ static int _run(const char *cmd, ...)
 		argv = alloca(sizeof(const char *) * (argc + 1));
 
 		argv[0] = cmd;
-		va_start(ap, cmd);
+                va_start(ap, cmd);
 		while ((argv[++i] = va_arg(ap, const char *)));
 		va_end(ap);
 
@@ -249,9 +245,7 @@ static void _use_policy(struct dm_task *dmt, struct dso_state *state)
 		log_error("Failed to extend thin pool %s.",
 			  dm_task_get_name(dmt));
 		_umount(dmt);
-		state->fails++;
-	} else
-		state->fails = 0;
+	}
 }
 
 void process_event(struct dm_task *dmt,
@@ -276,7 +270,7 @@ void process_event(struct dm_task *dmt,
 	if (event & DM_EVENT_DEVICE_ERROR) {
 		/* Error -> no need to check and do instant resize */
 		_use_policy(dmt, state);
-		goto out;
+		return;
 	}
 
 	dm_get_next_target(dmt, next, &start, &length, &target_type, &params);
@@ -344,13 +338,6 @@ void process_event(struct dm_task *dmt,
 out:
 	if (tps)
 		dm_pool_free(state->mem, tps);
-
-	if (state->fails >= MAX_FAILS) {
-		log_warn("WARNING: Dropping monitoring of %s. "
-			 "lvm2 command fails too often (%u times in raw).",
-			 device, state->fails);
-		pthread_kill(pthread_self(), SIGALRM);
-	}
 }
 
 int register_device(const char *device,

lib/Makefile.in

@@ -62,7 +62,6 @@ SOURCES =\
 	device/dev-swap.c \
 	device/dev-type.c \
 	device/dev-luks.c \
-	device/dev-dasd.c \
 	display/display.c \
 	error/errseg.c \
 	unknown/unknown.c \

lib/cache/lvmetad.c

@@ -1331,7 +1331,7 @@ int lvmetad_pvscan_single(struct cmd_context *cmd, struct device *dev,
 			log_warn("WARNING: Ignoring obsolete format of metadata (%s) on device %s when using lvmetad",
 				  baton.fid->fmt->name, dev_name(dev));
 		else
-			log_error("Ignoring obsolete format of metadata (%s) on device %s when using lvmetad.",
+			log_error("WARNING: Ignoring obsolete format of metadata (%s) on device %s when using lvmetad",
 				  baton.fid->fmt->name, dev_name(dev));
 		lvmcache_fmt(info)->ops->destroy_instance(baton.fid);
 

lib/datastruct/str_list.c

@@ -16,14 +16,11 @@
 #include "lib.h"
 #include "str_list.h"
 
-#include <ctype.h>
-
 struct dm_list *str_list_create(struct dm_pool *mem)
 {
 	struct dm_list *sl;
 
-	if (!(sl = mem ? dm_pool_alloc(mem, sizeof(struct dm_list))
-		       : dm_malloc(sizeof(struct dm_list)))) {
+	if (!(sl = dm_pool_alloc(mem, sizeof(struct dm_list)))) {
 		log_errno(ENOMEM, "str_list allocation failed");
 		return NULL;
 	}
@@ -40,8 +37,7 @@ static int _str_list_add_no_dup_check(struct dm_pool *mem, struct dm_list *sll,
 	if (!str)
 		return_0;
 
-	if (!(sln = mem ? dm_pool_alloc(mem, sizeof(*sln))
-			: dm_malloc(sizeof(*sln))))
+	if (!(sln = dm_pool_alloc(mem, sizeof(*sln))))
 		return_0;
 
 	sln->str = str;
@@ -162,101 +158,3 @@ int str_list_lists_equal(const struct dm_list *sll, const struct dm_list *sll2)
 
 	return 1;
 }
-
-char *str_list_to_str(struct dm_pool *mem, const struct dm_list *list,
-		      const char *delim)
-{
-	size_t delim_len = strlen(delim);
-	unsigned list_size = dm_list_size(list);
-	struct dm_str_list *sl;
-	char *str, *p;
-	size_t len = 0;
-	unsigned i = 0;
-
-	dm_list_iterate_items(sl, list)
-		len += strlen(sl->str);
-	if (list_size > 1)
-		len += ((list_size - 1) * delim_len);
-
-	str = mem ? dm_pool_alloc(mem, len+1) : dm_malloc(len+1);
-	if (!str) {
-		log_error("str_list_to_str: string allocation failed.");
-		return NULL;
-	}
-	str[len] = '\0';
-	p = str;
-
-	dm_list_iterate_items(sl, list) {
-		len = strlen(sl->str);
-		memcpy(p, sl->str, len);
-		p += len;
-
-		if (++i != list_size) {
-			memcpy(p, delim, delim_len);
-			p += delim_len;
-		}
-	}
-
-	return str;
-}
-
-struct dm_list *str_to_str_list(struct dm_pool *mem, const char *str,
-				const char *delim, int ignore_multiple_delim)
-{
-	size_t delim_len = strlen(delim);
-	struct dm_list *list;
-	const char *p1, *p2, *next;
-	char *str_item;
-	size_t len;
-
-	if (!(list = str_list_create(mem))) {
-		log_error("str_to_str_list: string list allocation failed.");
-		return NULL;
-	}
-
-	p1 = p2 = str;
-	while (*p1) {
-		if (!(p2 = strstr(p1, delim)))
-			next = p2 = str + strlen(str);
-		else
-			next = p2 + delim_len;
-
-		len = p2 - p1;
-		str_item = mem ? dm_pool_alloc(mem, len+1) : dm_malloc(len+1);
-		if (!str_item) {
-			log_error("str_to_str_list: string list item allocation failed.");
-			goto bad;
-		}
-		memcpy(str_item, p1, len);
-		str_item[len] = '\0';
-
-		if (!str_list_add_no_dup_check(mem, list, str_item))
-			goto_bad;
-
-		if (ignore_multiple_delim) {
-			while (!strncmp(next, delim, delim_len))
-				next += delim_len;
-		}
-
-		p1 = next;
-	}
-
-	return list;
-bad:
-	if (mem)
-		dm_pool_free(mem, list);
-	return NULL;
-}
-
-void str_list_destroy(struct dm_list *list, int deallocate_strings)
-{
-	struct dm_str_list *sl, *tmp_sl;
-
-	dm_list_iterate_items_safe(sl, tmp_sl, list) {
-		dm_list_del(&sl->list);
-		if (deallocate_strings)
-			dm_free((char *)sl->str);
-		dm_free(sl);
-	}
-	dm_free(list);
-}

lib/datastruct/str_list.h

@@ -30,9 +30,5 @@ int str_list_match_list(const struct dm_list *sll, const struct dm_list *sll2, c
 int str_list_lists_equal(const struct dm_list *sll, const struct dm_list *sll2);
 int str_list_dup(struct dm_pool *mem, struct dm_list *sllnew,
 		 const struct dm_list *sllold);
-char *str_list_to_str(struct dm_pool *mem, const struct dm_list *list, const char *delim);
-struct dm_list *str_to_str_list(struct dm_pool *mem, const char *str, const char *delim, int ignore_multiple_delim);
-/* Only for lists which were *not* allocated from the mem pool! */
-void str_list_destroy(struct dm_list *list, int deallocate_strings);
 
 #endif

lib/device/dev-dasd.c

@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2015 Red Hat, Inc. All rights reserved.
- *
- * This file is part of LVM2.
- *
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License v.2.1.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include "lib.h"
-#include "metadata.h"
-#include "dev-type.h"
-#include <sys/ioctl.h>
-
-#ifdef __linux__
-
-/*
- * Interface taken from kernel header arch/s390/include/uapi/asm/dasd.h
- */
-
-/* 
- * Author(s)......: Holger Smolinski <Holger.Smolinski@de.ibm.com>
- * Copyright IBM Corp. 1999, 2000
- * EMC Symmetrix ioctl Copyright EMC Corporation, 2008
- * Author.........: Nigel Hislop <hislop_nigel@emc.com>
- */
-
-#define DASD_IOCTL_LETTER 'D'
-#define DASD_API_VERSION 6
-
-/* 
- * struct dasd_information2_t
- * represents any data about the device, which is visible to userspace.
- *  including foramt and featueres.
- */
-typedef struct dasd_information2_t {
-	unsigned int devno;		/* S/390 devno */
-	unsigned int real_devno;	/* for aliases */
-	unsigned int schid;		/* S/390 subchannel identifier */
-	unsigned int cu_type  : 16;	/* from SenseID */
-	unsigned int cu_model :  8;	/* from SenseID */
-	unsigned int dev_type : 16;	/* from SenseID */
-	unsigned int dev_model : 8;	/* from SenseID */
-	unsigned int open_count;
-	unsigned int req_queue_len;
-	unsigned int chanq_len;		/* length of chanq */
-	char type[4];			/* from discipline.name, 'none' for unknown */
-	unsigned int status;		/* current device level */
-	unsigned int label_block;	/* where to find the VOLSER */
-	unsigned int FBA_layout;	/* fixed block size (like AIXVOL) */
-	unsigned int characteristics_size;
-	unsigned int confdata_size;
-	char characteristics[64];	/* from read_device_characteristics */
-	char configuration_data[256];	/* from read_configuration_data */
-	unsigned int format;		/* format info like formatted/cdl/ldl/... */
-	unsigned int features;		/* dasd features like 'ro',... */
-	unsigned int reserved0;		/* reserved for further use ,... */
-	unsigned int reserved1;		/* reserved for further use ,... */
-	unsigned int reserved2;		/* reserved for further use ,... */
-	unsigned int reserved3;		/* reserved for further use ,... */
-	unsigned int reserved4;		/* reserved for further use ,... */
-	unsigned int reserved5;		/* reserved for further use ,... */
-	unsigned int reserved6;		/* reserved for further use ,... */
-	unsigned int reserved7;		/* reserved for further use ,... */
-} dasd_information2_t;
-
-#define DASD_FORMAT_CDL  2
-
-/* Get information on a dasd device (enhanced) */
-#define BIODASDINFO2   _IOR(DASD_IOCTL_LETTER,3,dasd_information2_t)
-
-/*
- * End of included interface.
- */
-
-int dasd_is_cdl_formatted(struct device *dev)
-{
-	int ret = 0;
-	dasd_information2_t dasd_info2;
-
-	if (!dev_open_readonly(dev))
-		return_0;
-
-	if (ioctl(dev->fd, BIODASDINFO2, &dasd_info2)) {
-		log_sys_error("ioctl BIODASDINFO2", dev_name(dev));
-		goto out;
-	}
-
-	if (dasd_info2.format == DASD_FORMAT_CDL)
-		ret = 1;
-
-out:
-	if (!dev_close(dev))
-		stack;
-
-	return ret;
-}
-
-#else
-
-int dasd_is_cdl_formatted(struct device *dev)
-{
-	return 0;
-}
-
-#endif

lib/device/dev-type.c

@@ -363,7 +363,7 @@ static int _native_dev_is_partitioned(struct dev_types *dt, struct device *dev)
 		return 0;
 
 	/* Unpartitioned DASD devices are not supported. */
-	if ((MAJOR(dev->dev) == dt->dasd_major) && dasd_is_cdl_formatted(dev))
+	if (MAJOR(dev->dev) == dt->dasd_major)
 		return 1;
 
 	if (!dev_open_readonly_quiet(dev)) {

lib/device/dev-type.h

@@ -59,7 +59,6 @@ int major_is_scsi_device(struct dev_types *dt, int major);
 int dev_is_md(struct device *dev, uint64_t *sb);
 int dev_is_swap(struct device *dev, uint64_t *signature);
 int dev_is_luks(struct device *dev, uint64_t *signature);
-int dasd_is_cdl_formatted(struct device *dev);
 
 /* Signature wiping. */
 #define TYPE_LVM1_MEMBER	0x001

lib/format_text/format-text.c

@@ -654,9 +654,12 @@ static int _vg_write_raw(struct format_instance *fid, struct volume_group *vg,
 
 	if ((new_wrap && old_wrap) ||
 	    (rlocn && (new_wrap || old_wrap) && (new_end > rlocn->offset)) ||
-	    (MDA_HEADER_SIZE + (rlocn ? rlocn->size : 0) + mdac->rlocn.size >= mdah->size)) {
-		log_error("VG %s metadata too large for circular buffer",
-			  vg->name);
+	    (mdac->rlocn.size >= mdah->size)) {
+		log_error("VG %s metadata too large: size of metadata to write "
+			  "is %" PRIu64 " bytes while PV metadata area size "
+			  "on %s is %" PRIu64 " bytes.",
+			   vg->name, mdac->rlocn.size,
+			   dev_name(mdac->area.dev), mdah->size);
 		goto out;
 	}
 
@@ -2146,6 +2149,7 @@ static int _text_pv_add_metadata_area(const struct format_type *fmt,
 					goto bad;
 			}
 			/* Otherwise, give up and take any usable space. */
+			/* FIXME: We should probably check for some minimum MDA size here. */
 			else
 				mda_size = limit - mda_start;
 
@@ -2242,12 +2246,6 @@ static int _text_pv_add_metadata_area(const struct format_type *fmt,
 				  mda_size, limit_name, limit);
 
 	if (mda_size) {
-		if (mda_size < MDA_SIZE_MIN) {
-			log_error("Metadata area size too small: %" PRIu64" bytes. "
-				  "It must be at least %u bytes.", mda_size, MDA_SIZE_MIN);
-			goto bad;
-		}
-
 		/* Wipe metadata area with zeroes. */
 		if (!dev_set((struct device *) pv->dev, mda_start,
 			(size_t) ((mda_size > wipe_size) ?

lib/metadata/lv_manip.c

@@ -7388,6 +7388,8 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
 		first_seg(lv)->chunk_size = lp->chunk_size;
 		first_seg(lv)->zero_new_blocks = lp->zero ? 1 : 0;
 		first_seg(lv)->discards = lp->discards;
+		/* FIXME: use lowwatermark  via lvm.conf global for all thinpools ? */
+		first_seg(lv)->low_water_mark = 0;
 		if (!recalculate_pool_chunk_size_with_dev_hints(lv, lp->passed_args,
 								lp->thin_chunk_size_calc_policy)) {
 			stack;

lib/metadata/metadata-exported.h

@@ -454,6 +454,7 @@ struct lv_segment {
 	struct lv_segment_area *meta_areas;	/* For RAID */
 	struct logical_volume *metadata_lv;	/* For thin_pool */
 	uint64_t transaction_id;		/* For thin_pool, thin */
+	uint64_t low_water_mark;		/* For thin_pool */
 	unsigned zero_new_blocks;		/* For thin_pool */
 	thin_discards_t discards;		/* For thin_pool */
 	struct dm_list thin_messages;		/* For thin_pool */

lib/metadata/thin_manip.c

@@ -216,7 +216,7 @@ int thin_pool_feature_supported(const struct logical_volume *lv, int feature)
 int pool_below_threshold(const struct lv_segment *pool_seg)
 {
 	dm_percent_t percent;
-	dm_percent_t threshold = DM_PERCENT_1 *
+	int threshold = DM_PERCENT_1 *
 		find_config_tree_int(pool_seg->lv->vg->cmd, activation_thin_pool_autoextend_threshold_CFG,
 				     lv_config_profile(pool_seg->lv));
 

lib/report/report.c

@@ -3396,21 +3396,6 @@ void *report_init_for_selection(struct cmd_context *cmd,
 					     cmd);
 }
 
-const char *report_get_field_prefix(report_type_t report_type_id)
-{
-	const struct dm_report_object_type *report_types, *report_type;
-
-	report_types = report_type_id & DEVTYPES ? _devtypes_report_types
-						 : _report_types;
-
-	for (report_type = report_types; report_type->id; report_type++) {
-		if (report_type_id & report_type->id)
-			return report_type->prefix;
-	}
-
-	return "";
-}
-
 /*
  * Create a row of data for an object
  */

lib/report/report.h

@@ -71,7 +71,6 @@ void *report_init(struct cmd_context *cmd, const char *format, const char *keys,
 		  int quoted, int columns_as_rows, const char *selection);
 void *report_init_for_selection(struct cmd_context *cmd, report_type_t *report_type,
 				const char *selection);
-const char *report_get_field_prefix(report_type_t report_type);
 int report_for_selection(struct cmd_context *cmd,
 			 struct selection_handle *sh,
 			 struct physical_volume *pv,

lib/thin/thin.c

@@ -118,6 +118,10 @@ static int _thin_pool_text_import(struct lv_segment *seg,
 	else if (!set_pool_discards(&seg->discards, discards_str))
 		return SEG_LOG_ERROR("Discards option unsupported for");
 
+	if (dm_config_has_node(sn, "low_water_mark") &&
+	    !dm_config_get_uint64(sn, "low_water_mark", &seg->low_water_mark))
+		return SEG_LOG_ERROR("Could not read low_water_mark");
+
 	if ((seg->chunk_size < DM_THIN_MIN_DATA_BLOCK_SIZE) ||
 	    (seg->chunk_size > DM_THIN_MAX_DATA_BLOCK_SIZE))
 		return SEG_LOG_ERROR("Unsupported value %u for chunk_size",
@@ -165,6 +169,9 @@ static int _thin_pool_text_export(const struct lv_segment *seg, struct formatter
 		return 0;
 	}
 
+	if (seg->low_water_mark)
+		outf(f, "low_water_mark = %" PRIu64, seg->low_water_mark);
+
 	if (seg->zero_new_blocks)
 		outf(f, "zero_new_blocks = 1");
 
@@ -259,8 +266,6 @@ static int _thin_pool_add_target_line(struct dev_manager *dm,
 	struct lvinfo info;
 	uint64_t transaction_id = 0;
 	unsigned attr;
-	uint64_t low_water_mark;
-	int threshold;
 
 	if (!_thin_target_present(cmd, NULL, &attr))
 		return_0;
@@ -272,37 +277,27 @@ static int _thin_pool_add_target_line(struct dev_manager *dm,
 
 	if (!(attr & THIN_FEATURE_BLOCK_SIZE) &&
 	    (seg->chunk_size & (seg->chunk_size - 1))) {
-		log_error("Thin pool target does not support %s chunk size (needs"
-			  " kernel >= 3.6).", display_size(cmd, seg->chunk_size));
+		log_error("Thin pool target does not support %uKiB chunk size "
+			  "(needs kernel >= 3.6).", seg->chunk_size / 2);
 		return 0;
 	}
 
 	if (!(metadata_dlid = build_dm_uuid(mem, seg->metadata_lv, NULL))) {
 		log_error("Failed to build uuid for metadata LV %s.",
-			  display_lvname(seg->metadata_lv));
+			  seg->metadata_lv->name);
 		return 0;
 	}
 
 	if (!(pool_dlid = build_dm_uuid(mem, seg_lv(seg, 0), NULL))) {
 		log_error("Failed to build uuid for pool LV %s.",
-			  display_lvname(seg_lv(seg, 0)));
+			  seg_lv(seg, 0)->name);
 		return 0;
 	}
 
-	threshold = find_config_tree_int(seg->lv->vg->cmd,
-					 activation_thin_pool_autoextend_threshold_CFG,
-					 lv_config_profile(seg->lv));
-	if (threshold < 50)
-		threshold = 50;
-	if (threshold < 100)
-		low_water_mark = (len * threshold + 99) / 100;
-	else
-		low_water_mark = len;
-
 	if (!dm_tree_node_add_thin_pool_target(node, len,
 					       seg->transaction_id,
 					       metadata_dlid, pool_dlid,
-					       seg->chunk_size, low_water_mark,
+					       seg->chunk_size, seg->low_water_mark,
 					       seg->zero_new_blocks ? 0 : 1))
 		return_0;
 

man/lvdisplay.8.in

@@ -37,7 +37,7 @@ lvdisplay \(em display attributes of a logical volume
 .RB [ \-\-noheadings ]
 .RB [ \-\-nosuffix ]
 .RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field [ ,Field ...]]
+.RI [ + ] Field [ ,Field ...]]
 .RB [ \-O | \-\-sort
 .RI [ + | \- ] Key1 [ , [ + | \- ] Key2 ...]]
 .RB [ \-P | \-\-partial ]

man/lvs.8.in

@@ -16,7 +16,7 @@ lvs \(em report information about logical volumes
 .RB [ \-\-noheadings ]
 .RB [ \-\-nosuffix ]
 .RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field [, Field ]]
+.RI [ + ] Field [, Field ]]
 .RB [ \-O | \-\-sort
 .RI [ + | \- ] Key1 [,[ + | \- ] Key2 [,...]]]
 .RB [ \-P | \-\-partial ]
@@ -76,13 +76,8 @@ Suppress the suffix on output sizes.  Use with \fB\-\-units\fP
 (except h and H) if processing the output.
 .TP
 .BR \-o ", " \-\-options
-Comma-separated ordered list of columns.
-.IP
-Precede the list with '\fI+\fP' to append to the current list
-of columns, '\fI-\fP' to remove from the current list of columns
-or '\fI#\fP' to compact given columns. The \fI\-o\fP option can
-be repeated, providing several lists. These lists are evaluated
-from left to right.
+Comma-separated ordered list of columns.  Precede the list with '\fI+\fP'
+to append to the default selection of columns instead of replacing it.
 .IP
 Use \fB\-o lv_all\fP to select all logical volume columns,
 and \fB\-o seg_all\fP

man/pvdisplay.8.in

@@ -37,7 +37,7 @@ pvdisplay \- display attributes of a physical volume
 .RB [ \-\-noheadings ]
 .RB [ \-\-nosuffix ]
 .RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field [ ,Field ...]]
+.RI [ + ] Field [ ,Field ...]]
 .RB [ \-O | \-\-sort
 .RI [ + | \- ] Key1 [ , [ + | \- ] Key2 ...
 .RI ]]

man/pvs.8.in

@@ -16,7 +16,7 @@ pvs \(em report information about physical volumes
 .RB [ \-\-noheadings ]
 .RB [ \-\-nosuffix ]
 .RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field [ ,Field ...]]
+.RI [ + ] Field [ ,Field ...]]
 .RB [ \-O | \-\-sort
 .RI [ + | \- ] Key1 [ , [ + | \- ] Key2 ...]]
 .RB [ \-P | \-\-partial ]
@@ -65,13 +65,8 @@ Suppress the suffix on output sizes.  Use with \fB\-\-units\fP
 (except h and H) if processing the output.
 .TP
 .BR \-o ", " \-\-options
-Comma-separated ordered list of columns.
-.IP
-Precede the list with '\fI+\fP' to append to the current list
-of columns, '\fI-\fP' to remove from the current list of columns
-or '\fI#\fP' to compact given columns. The \fI\-o\fP option can
-be repeated, providing several lists. These lists are evaluated
-from left to right.
+Comma-separated ordered list of columns.  Precede the list with '\fI+\fP'
+to append to the default selection of columns.
 .IP
 Use \fB-o pv_all\fP to select all physical volume columns,
 and \fB-o pvseg_all\fP to select all Physical Volume segment columns.

man/vgdisplay.8.in

@@ -37,7 +37,7 @@ vgdisplay \(em display attributes of volume groups
 .RB [ \-\-noheadings ]
 .RB [ \-\-nosuffix ]
 .RB [ \-o|\-\-options
-.RI [ + | \- | # ] Field1 [ ,Field2 ...]]
+.RI [ + ] Field1 [ ,Field2 ...]]
 .RB [ \-O | \-\-sort
 .RI [ + | \- ] Key1 [ , [ + | \- ] Key2 ...]]
 .RB [ \-P | \-\-partial ]

man/vgs.8.in

@@ -16,7 +16,7 @@ vgs \(em report information about volume groups
 .RB [ \-\-noheadings ]
 .RB [ \-\-nosuffix ]
 .RB [ \-o | \-\-options
-.RI [ + | \- | # ] Field1 [ ,Field2 ...]]
+.RI [ + ] Field1 [ ,Field2 ...]]
 .RB [ \-O | \-\-sort
 .RI [ + | \- ] Key1 [ , [ + | \- ] Key2 ...]]
 .RB [ \-P | \-\-partial ]
@@ -63,13 +63,8 @@ Suppress the suffix on output sizes.  Use with \fB\-\-units\fP
 (except h and H) if processing the output.
 .TP
 .BR \-o ", " \-\-options
-Comma-separated ordered list of columns.
-.IP
-Precede the list with '\fI+\fP' to append to the current list
-of columns, '\fI-\fP' to remove from the current list of columns
-or '\fI#\fP' to compact given columns. The \fI\-o\fP option can
-be repeated, providing several lists. These lists are evaluated
-from left to right.
+Comma-separated ordered list of columns.  Precede the list with '+' to append
+to the default selection of columns.
 .IP
 Use \fB\-o vg_all\fP to select all volume group columns.
 .IP

spec/build.inc

@@ -1,22 +1,3 @@
-%with default-dm-run-dir %{_default_dm_run_dir}
-%with default-run-dir %{_default_run_dir}
-%with default-pid-dir %{_default_pid_dir}
-%with default-locking-dir %{_default_locking_dir}
-%with usrlibdir %{_libdir}
-%enableif 1 lvm1_fallback
-%enableif 1 fsadm
-%with pool internal
-%with user
-%with group
-%with device-uid 0
-%with device-gid 6
-%with device-mode 0660
-%enableif 1 pkgconfig
-%enableif 1 applib
-%enableif 1 cmdlib
-%enableif 1 dmeventd
-%enableif 1 write_install
-
 %with udevdir %{_udevdir}
 %enableif %{enable_cmirror} cmirrord
 %enableif %{enable_udev} udev_sync
@@ -30,22 +11,28 @@
 %enableif %{enable_lockd_dlm} lockd-dlm
 %enableif %{enable_lockd_sanlock} lockd-sanlock
 %endif
-%enableif %{enable_python} python-bindings
-%enableif %{enable_python} applib
 
 %build
-
-%if %{enable_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-pushd %{py3dir}
-%configure %{configure_flags} PYTHON=/usr/bin/python3 PYTHON_CONFIG=/usr/bin/python3-config
-
-make %{?_smp_mflags}
-popd
-%endif
-
-%configure %{configure_flags}
+%configure \
+  --with-default-dm-run-dir=%{_default_dm_run_dir} \
+  --with-default-run-dir=%{_default_run_dir} \
+  --with-default-pid-dir=%{_default_pid_dir} \
+  --with-default-locking-dir=%{_default_locking_dir} \
+  --with-usrlibdir=%{_libdir} \
+  --enable-lvm1_fallback \
+  --enable-fsadm \
+  --with-pool=internal \
+  --with-user= \
+  --with-group= \
+  --with-device-uid=0 \
+  --with-device-gid=6 \
+  --with-device-mode=0660 \
+  --enable-pkgconfig \
+  --enable-applib \
+  --enable-cmdlib \
+  --enable-dmeventd \
+  --enable-write_install \
+  %{configure_flags}
 
 make %{?_smp_mflags}
 %{?extra_build_commands}
@@ -63,11 +50,6 @@ make install_initscripts DESTDIR=$RPM_BUILD_ROOT
 %if %{enable_testsuite}
 make -C test install DESTDIR=$RPM_BUILD_ROOT
 %endif
-%if %{enable_python3}
-pushd %{py3dir}
-make -C python install DESTDIR=$RPM_BUILD_ROOT
-popd
-%endif
 
 # when building an src.rpm from freestanding specfiles
 test -e %{_sourcedir}/source.inc || cp source.inc build.inc packages.inc macros.inc %{_sourcedir}

spec/packages.inc

@@ -410,60 +410,6 @@ fi
 
 %endif
 
-##############################################################################
-# Python bindings
-##############################################################################
-%if %{enable_python}
-%package python-libs
-Summary: Python module to access LVM
-License: LGPLv2
-Group: Development/Libraries
-Provides: python-lvm = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-
-%description python-libs
-Python module to allow the creation and use of LVM
-logical volumes, physical volumes, and volume groups.
-
-%files python-libs
-%{python_sitearch}/*
-%endif
-
-%if %{enable_python3}
-%package python3-libs
-Summary: Python 3 module to access LVM
-License: LGPLv2
-Group: Development/Libraries
-Provides: python3-lvm = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
-
-%description python3-libs
-Python 3 module to allow the creation and use of LVM
-logical volumes, physical volumes, and volume groups.
-
-%files python3-libs
-%{python3_sitearch}/*
-%endif
-
-##############################################################################
-# Testsuite subpackage
-##############################################################################
-%if %{enable_testsuite}
-%package testsuite
-Summary: LVM2 Testsuite
-License: LGPLv2
-Group: Development
-
-%description testsuite
-An extensive functional testsuite for LVM2.
-
-%files testsuite
-%defattr(-,root,root,-)
-%{_datadir}/lvm2-testsuite/
-%{_libexecdir}/lvm2-testsuite/
-%{_bindir}/lvm2-testsuite
-%endif
-
 ##############################################################################
 # Device-mapper subpackages
 ##############################################################################
@@ -625,3 +571,18 @@ the device-mapper event library.
 %{_includedir}/libdevmapper-event.h
 %{_libdir}/pkgconfig/devmapper-event.pc
 
+%if %{enable_testsuite}
+%package testsuite
+Summary: LVM2 Testsuite
+License: LGPLv2
+Group: Development
+
+%description testsuite
+An extensive functional testsuite for LVM2.
+
+%files testsuite
+%defattr(-,root,root,-)
+%{_datadir}/lvm2-testsuite/
+%{_libexecdir}/lvm2-testsuite/
+%{_bindir}/lvm2-testsuite
+%endif

spec/source.inc

@@ -5,9 +5,6 @@
 
 %global enable_profiling 0
 %global enable_testsuite 1
-%global enable_python 1
-# Off by default - <= does not work well with or:
-%global enable_python3 0
 %global enable_udev 1
 %global enable_systemd 1
 %global enable_cmirror 1
@@ -68,25 +65,6 @@
 
 ##############################################################
 
-%if %{rhel} == 5
-%global enable_python 0
-%endif
-
-%if %{rhel} >= 8 || %{fedora} >= 20
-%global enable_python3 1
-%endif
-
-%if %{enable_python}
-  %global buildreq_python2_devel python2-devel
-  %global buildreq_python_setuptools python-setuptools
-%endif
-%if %{enable_python3}
-  %global buildreq_python3_devel python3-devel
-  %global buildreq_python_setuptools python-setuptools
-%endif
-
-##############################################################
-
 %if %{fedora} == 16 || %{rhel} == 6
 %global enable_systemd 0
 
@@ -165,9 +143,6 @@ BuildRequires: pkgconfig
 %maybe BuildRequires: %{?buildreq_cluster}
 %maybe BuildRequires: %{?buildreq_lockd_dlm}
 %maybe BuildRequires: %{?buildreq_lockd_sanlock}
-%maybe BuildRequires: %{?buildreq_python2_devel}
-%maybe BuildRequires: %{?buildreq_python3_devel}
-%maybe BuildRequires: %{?buildreq_python_setuptools}
 
 %description
 LVM2 includes all of the support for handling read/write operations on

test/Makefile.in

@@ -270,7 +270,7 @@ lib/paths-installed: lib/paths-common
 	$(RM) $@-t
 	cat lib/paths-common > $@-t
 	echo 'installed_testsuite=1' >> $@-t
-	echo 'export PATH=@libexecdir@/lvm2-testsuite:@datadir@/lvm2-testsuite/lib:@datadir@/lvm2-testsuite/api:$$PATH' >> $@-t
+	echo 'export PATH=@libexecdir@/lvm2-testsuite:@datadir@/lvm2-testsuite/lib:$$PATH' >> $@-t
 	mv $@-t $@
 
 lib/paths: lib/paths-common

test/api/lvtest.sh

@@ -11,8 +11,6 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
 aux prepare_vg 1

test/api/pe_start.sh

@@ -11,8 +11,6 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
 aux prepare_devs 2

test/api/percent.sh

@@ -11,8 +11,6 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
 aux kernel_at_least 2 6 33 || skip

test/api/pytest.sh

@@ -11,13 +11,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
-SKIP_WITH_LVMETAD=1
-SKIP_WITH_CLVMD=1
-
 . lib/inittest
 
-aux prepare_dmeventd
-
 #
 # TODO:
 # lvm2app is not yet capable to respect many lvm.conf options
@@ -30,21 +25,20 @@ aux prepare_dmeventd
 # gdb -ex r --args python FULL_PATH/lvm2/test/api/python_lvm_unit.py -v TestLvm.test_lv_active_inactive
 
 #Locate the python binding library to use.
-if [[ -n $abs_top_builddir ]]; then
-  python_lib=$(find $abs_top_builddir -name lvm.so)
-  # Unable to test python bindings if library not available
-  test -n "$python_lib" || skip "lvm2-python-libs not built"
+python_lib=$(find $abs_top_builddir -name lvm.so)
+# Unable to test python bindings if library not available
+test -n "$python_lib" || skip
 
-  export PYTHONPATH=$(dirname $python_lib):$PYTHONPATH
-elif rpm -q lvm2-python-libs &>/dev/null; then
-  true
-else
-  skip "lvm2-python-libs neither built nor installed"
-fi
+test -e LOCAL_CLVMD && skip
+test -e LOCAL_LVMETAD && skip
+
+aux prepare_dmeventd
 
 #If you change this change the unit test case too.
 aux prepare_pvs 6
 
+export PYTHONPATH=$(dirname $python_lib):$PYTHONPATH
+
 #Setup which devices the unit test can use.
 export PY_UNIT_PVS=$(cat DEVICES)
 

test/api/thin_percent.sh

@@ -11,8 +11,6 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest

test/api/vglist.sh

@@ -9,8 +9,6 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
 aux prepare_vg 2

test/lib/brick-shelltest.h

@@ -82,7 +82,7 @@
 #include "configure.h"
 
 /*  Timeout for the whole test suite in hours */
-static const time_t TEST_SUITE_TIMEOUT = 4;
+static const unsigned TEST_SUITE_TIMEOUT = 4;
 
 #ifndef BRICK_SHELLTEST_H
 #define BRICK_SHELLTEST_H

test/lib/inittest.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2011-2015 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2011-2012 Red Hat, Inc. All rights reserved.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions
@@ -9,11 +9,6 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-initskip() {
-	test "$#" -eq 0 || echo "TEST SKIPPED: $@"
-	exit 200
-}
-
 # sanitize the environment
 LANG=C
 LC_ALL=C
@@ -25,23 +20,20 @@ TESTNAME=${0##*/}
 PS4='#${BASH_SOURCE[0]##*/}:${LINENO}+ '
 export TESTNAME PS4
 
-if test -n "$LVM_TEST_FLAVOUR"; then
-	. lib/flavour-$LVM_TEST_FLAVOUR
-fi
-
-test -n "$SKIP_WITHOUT_CLVMD" && test "$LVM_TEST_LOCKING" -ne 3 && initskip
-test -n "$SKIP_WITH_CLVMD" && test "$LVM_TEST_LOCKING" -eq 3 && initskip
-
-test -n "$SKIP_WITHOUT_LVMETAD" && test -z "$LVM_TEST_LVMETAD" && initskip
-test -n "$SKIP_WITH_LVMETAD" && test -n "$LVM_TEST_LVMETAD" && initskip
-
-test -n "$SKIP_WITH_LVMPOLLD" && test -n "$LVM_TEST_LVMPOLLD" && initskip
-
 unset CDPATH
 
 # grab some common utilities
 . lib/utils
 
+if test -n "$LVM_TEST_FLAVOUR"; then
+	. lib/flavour-$LVM_TEST_FLAVOUR
+fi
+
+test -n "$SKIP_WITHOUT_CLVMD" && test "$LVM_TEST_LOCKING" -ne 3 && skip
+test -n "$SKIP_WITHOUT_LVMETAD" && test -z "$LVM_TEST_LVMETAD" && skip
+test -n "$SKIP_WITH_LVMPOLLD" && test -n "$LVM_TEST_LVMPOLLD" && skip
+
+
 TESTOLDPWD=$(pwd)
 COMMON_PREFIX="LVMTEST"
 PREFIX="${COMMON_PREFIX}$$"

test/shell/000-basic.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 lvm version
 
 lvm pvmove --version|sed -n "1s/.*: *\([0-9][^ ]*\) .*/\1/p" | tee version

test/shell/covercmd.sh

@@ -14,10 +14,10 @@
 # to improve code coverage
 #
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_pvs 5
 get_devs
 

test/shell/discards-thin.sh

@@ -13,12 +13,12 @@
 # test support of thin discards
 #
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 #
 # Main
 #

test/shell/dmeventd-restart.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_dmeventd
 
 aux prepare_vg 5

test/shell/dumpconfig.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 flatten() {
 	cat > flatten.config
 	for s in `egrep '^[a-z]+ {$' flatten.config | sed -e s,{$,,`; do

test/shell/error-usage.sh

@@ -11,10 +11,10 @@
 
 # Basic usage of zero target
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 which md5sum || skip
 
 aux prepare_pvs 1

test/shell/fsadm.sh

@@ -10,10 +10,11 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 test_description='Exercise fsadm filesystem resize'
-SKIP_WITH_LVMPOLLD=1
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_vg 1 100
 
 # set to "skip" to avoid testing given fs and test warning result

test/shell/inconsistent-metadata.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_vg 3 12
 
 lvcreate -aye --type mirror -m 1 -l 1 -n mirror $vg

test/shell/listings.sh

@@ -13,10 +13,10 @@
 # tests functionality of lvs, pvs, vgs, *display tools
 #
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_devs 5
 get_devs
 

test/shell/lock-blocking.sh

@@ -10,11 +10,12 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 test_description='test some blocking / non-blocking multi-vg operations'
-SKIP_WITH_CLVMD=1
-SKIP_WITH_LVMPOLLD=1
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+test -e LOCAL_CLVMD && skip
+
 aux prepare_devs 3
 pvcreate "$dev1" "$dev2"
 vgcreate $vg "$dev1" "$dev2"

test/shell/lock-parallel.sh

@@ -12,10 +12,10 @@
 # Test parallel use of lvm commands and check locks aren't dropped
 # RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1049296
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 which mkfs.ext3 || skip
 which fsck || skip
 

test/shell/lvchange-cache.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_cache 1 3 0 || skip
 aux prepare_vg 3
 

test/shell/lvchange-mirror.sh

@@ -9,12 +9,13 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+. lib/inittest
+
+test -e LOCAL_LVMPOLLD && skip
+
 # FIXME RESYNC doesn't work in cluster with exclusive activation
 # seriously broken!
-SKIP_WITH_CLVMD=1
-SKIP_WITH_LVMPOLLD=1
-
-. lib/inittest
+test -e LOCAL_CLVMD && skip
 
 aux prepare_dmeventd
 aux prepare_vg 3

test/shell/lvchange-partial-raid10.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_raid 1 3 2 || skip
 
 aux prepare_vg 4

test/shell/lvchange-partial.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_vg 4
 
 TYPE=raid1

test/shell/lvchange-raid.sh

@@ -9,8 +9,6 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
 # Writemostly has been in every version since the begining

test/shell/lvchange-raid10.sh

@@ -13,6 +13,8 @@ TEST_RAID=raid10
 
 . shell/lvchange-raid.sh
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_raid 1 5 2 || skip
 
 run_types raid10 -m 1 -i 2 "$dev1" "$dev2" "$dev3" "$dev4"

test/shell/lvchange-raid456.sh

@@ -13,6 +13,8 @@ TEST_RAID=raid456
 
 . shell/lvchange-raid.sh
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux raid456_replace_works || skip
 aux have_raid 1 5 2 || skip
 

test/shell/lvchange-syncaction-raid.sh

@@ -11,10 +11,10 @@
 
 # test activation race for raid's --syncaction check
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 # Proper mismatch count 1.5.2+ upstream, 1.3.5 < x < 1.4.0 in RHEL6
 aux have_raid 1 3 5 &&
   ! aux have_raid 1 4 0 ||

test/shell/lvchange-thin.sh

@@ -9,12 +9,12 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_thin 1 0 0 || skip
 
 aux prepare_pvs 3

test/shell/lvconvert-cache-raid.sh

@@ -11,10 +11,10 @@
 
 # Exercise usage of stacked cache volume using raid volume
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_cache 1 3 0 || skip
 aux have_raid 1 0 0 || skip
 

test/shell/lvconvert-cache-smq.sh

@@ -11,10 +11,10 @@
 
 # Exercise conversion of cache and cache pool
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_cache 1 8 0 || skip
 
 aux prepare_vg 5 80

test/shell/lvconvert-cache-thin.sh

@@ -11,10 +11,10 @@
 
 # Exercise usage of stacked cache volume used in thin pool volumes
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_cache 1 3 0 || skip
 aux have_thin 1 0 0 || skip
 

test/shell/lvconvert-cache.sh

@@ -11,10 +11,10 @@
 
 # Exercise conversion of cache and cache pool
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_cache 1 3 0 || skip
 
 aux prepare_vg 5 80

test/shell/lvconvert-mirror.sh

@@ -317,7 +317,7 @@ lvremove -ff $vg
 # to get synced
 lvcreate -l2 -n $lv1 $vg
 lvconvert --type mirror -i1 -m1 $vg/$lv1 | tee out
-grep -e "$vg/$lv1: Converted:" out || die "Missing sync info in foreground mode"
+grep -e "$vg/$lv1: Converted:" out || fail "Missing sync info in foreground mode"
 lvremove -ff $vg
 
 vgremove -ff $vg

test/shell/lvconvert-raid-allocation.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_raid 1 3 0 || skip
 
 aux prepare_pvs 5

test/shell/lvconvert-raid.sh

@@ -10,13 +10,12 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 # disable lvmetad logging as it bogs down test systems
-
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_LVMETAD_DEBUG_OPTS=${LVM_TEST_LVMETAD_DEBUG_OPTS-}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 get_image_pvs() {
 	local d
 	local images

test/shell/lvconvert-raid10.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 get_image_pvs() {
 	local d
 	local images

test/shell/lvconvert-raid456.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 get_image_pvs() {
 	local d
 	local images

test/shell/lvconvert-repair-dmeventd.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 which mkfs.ext2 || skip
 aux mirror_recovery_works || skip
 

test/shell/lvconvert-repair-raid-dmeventd.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 which mkfs.ext3 || skip
 aux have_raid 1 3 0 || skip
 

test/shell/lvconvert-repair-raid.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_raid 1 3 0 || skip
 aux raid456_replace_works || skip
 

test/shell/lvconvert-repair-snapshot.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_vg 5
 aux lvmconf 'allocation/maximise_cling = 0' \
 	    'allocation/mirror_logs_require_separate_pvs = 1'

test/shell/lvconvert-repair-thin-raid.sh

@@ -12,10 +12,9 @@
 
 # Test repairing of broken thin pool on raid
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
 aux have_thin 1 0 0 || skip
 aux have_raid 1 4 0 || skip
 

test/shell/lvconvert-repair-thin.sh

@@ -12,10 +12,10 @@
 
 # Test repairing of broken thin pool metadata
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 which mkfs.ext2 || skip
 
 #

test/shell/lvconvert-repair-transient-dmeventd.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_dmeventd
 aux mirror_recovery_works || skip
 aux prepare_vg 5

test/shell/lvconvert-repair-transient.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux mirror_recovery_works || skip
 aux prepare_vg 5
 

test/shell/lvconvert-snapshot.sh

@@ -12,10 +12,10 @@
 
 # Test various supported conversion of snapshot
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_pvs 1
 
 vgcreate -s 1k $vg $(cat DEVICES)

test/shell/lvconvert-thin-external.sh

@@ -12,12 +12,12 @@
 
 # Test conversion to thin external origin
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 which mkfs.ext2 || skip
 which fsck || skip
 

test/shell/lvconvert-thin-raid.sh

@@ -10,12 +10,12 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_thin 1 0 0 || skip
 aux have_raid 1 4 0 || skip
 

test/shell/lvconvert-thin.sh

@@ -10,12 +10,12 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 prepare_lvs() {
 	lvremove -f $vg
 	lvcreate -L10M -n $lv1 $vg

test/shell/lvcreate-cache-raid.sh

@@ -11,10 +11,10 @@
 
 # Exercise creation of cache and raids
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_cache 1 3 0 || skip
 aux have_raid 1 0 0 || skip
 

test/shell/lvcreate-cache.sh

@@ -14,10 +14,10 @@
 # Full CLI uses  --type
 # Shorthand CLI uses -H | --cache
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_cache 1 3 0 || skip
 
 # FIXME: parallel cache metadata allocator is crashing when used value 8000!

test/shell/lvcreate-large-raid.sh

@@ -11,10 +11,10 @@
 
 # 'Exercise some lvcreate diagnostics'
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 # FIXME  update test to make something useful on <16T
 aux can_use_16T || skip
 

test/shell/lvcreate-large-raid10.sh

@@ -11,12 +11,13 @@
 
 # 'Exercise some lvcreate diagnostics'
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 # FIXME  update test to make something useful on <16T
 aux can_use_16T || skip
+
 aux have_raid 1 3 0 || skip
 
 aux prepare_vg 5

test/shell/lvcreate-large.sh

@@ -11,10 +11,10 @@
 
 # 'Exercise some lvcreate diagnostics'
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 # FIXME  update test to make something useful on <16T
 aux can_use_16T || skip
 

test/shell/lvcreate-mirror.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_vg 5 80
 aux lvmconf 'allocation/maximise_cling = 0' \
 	    'allocation/mirror_logs_require_separate_pvs = 1'

test/shell/lvcreate-missing.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_vg 2
 
 aux disable_dev "$dev1"

test/shell/lvcreate-operation.sh

@@ -11,10 +11,10 @@
 
 # 'Exercise some lvcreate diagnostics'
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 cleanup_lvs() {
 	lvremove -ff $vg
 	(dm_table | not grep $vg) || \

test/shell/lvcreate-pvtags.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_pvs 3
 aux lvmconf 'allocation/maximise_cling = 0' \
 	    'allocation/mirror_logs_require_separate_pvs = 1'

test/shell/lvcreate-raid.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 lv_devices() {
 	test $3 -eq $(get lv_devices $1/$2 | wc -w)
 }

test/shell/lvcreate-raid10.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 lv_devices() {
 	test $3 -eq $(get lv_devices $1/$2 | wc -w)
 }

test/shell/lvcreate-repair.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA	02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_vg 3
 
 # fail multiple devices

test/shell/lvcreate-signature-wiping.sh

@@ -11,10 +11,10 @@
 
 # 'Exercise signature wiping during lvcreate'
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 init_lv_() {
 	mkswap "$DM_DEV_DIR/$vg/$lv1"
 }

test/shell/lvcreate-small-snap.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_pvs
 
 vgcreate -s 1k $vg $(cat DEVICES)

test/shell/lvcreate-striped-mirror.sh

@@ -9,10 +9,10 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux prepare_vg 9
 
 lvcreate -aey --nosync -i2 -l2 --type mirror -m1 --mirrorlog core -n $lv1 $vg 2>&1 | tee log

test/shell/lvcreate-thin-big.sh

@@ -13,12 +13,12 @@
 # test currently needs to drop
 # 'return NULL' in _lv_create_an_lv after log_error("Can't create %s without using "
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 aux have_thin 1 0 0 || skip
 
 # Test --poolmetadatasize range

test/shell/lvcreate-thin-external-size.sh

@@ -12,12 +12,12 @@
 
 # Test unaligned size of external origin and thin pool chunk size
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 which cmp || skip
 
 #

test/shell/lvcreate-thin-external.sh

@@ -12,12 +12,12 @@
 
 # Test creation of thin snapshots using external origin
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 which mkfs.ext2 || skip
 which fsck || skip
 

test/shell/lvcreate-thin-power2.sh

@@ -13,12 +13,12 @@
 # test support for non-power-of-2 thin chunk size
 #
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 #
 # Main
 #

test/shell/lvcreate-thin-snap.sh

@@ -10,12 +10,12 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 check_lv_field_modules_()
 {
 	mod=$1

test/shell/lvcreate-thin.sh

@@ -13,12 +13,12 @@
 # test currently needs to drop
 # 'return NULL' in _lv_create_an_lv after log_error("Can't create %s without using "
 
-SKIP_WITH_LVMPOLLD=1
-
 export LVM_TEST_THIN_REPAIR_CMD=${LVM_TEST_THIN_REPAIR_CMD-/bin/false}
 
 . lib/inittest
 
+test -e LOCAL_LVMPOLLD && skip
+
 check_lv_field_modules_()
 {
 	mod=$1