pvremove: use common toollib processing codedev-dct-pvcreate-16

Use the new pvcreate_each_device() function from
toollib.

3 files changed, 233 insertions, 37 deletions

diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index b2314edb8..eb022f752 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -587,9 +587,11 @@ struct pvcreate_each_params {
 	struct dm_list arg_process;     /* pvcreate_device, used for processing */
 	struct dm_list arg_confirm;     /* pvcreate_device, used for processing */
 	struct dm_list arg_create;      /* pvcreate_device, used for pvcreate */
+	struct dm_list arg_remove;      /* pvcreate_device, used for pvremove */
 	struct dm_list arg_fail;        /* pvcreate_device, failed to create */
 	struct dm_list pvs;             /* pv_list, created and usable for vgcreate/vgextend */
 	const char *orphan_vg_name;
+	unsigned is_remove : 1;         /* is removing PVs, not creating */
 	unsigned preserve_existing : 1;
 	unsigned check_failed : 1;
 };
diff --git a/tools/pvremove.c b/tools/pvremove.c
index 1d42c6ea4..1628ecc4a 100644
--- a/tools/pvremove.c
+++ b/tools/pvremove.c
@@ -17,33 +17,51 @@
 
 int pvremove(struct cmd_context *cmd, int argc, char **argv)
 {
-	int i;
-	unsigned force_count;
-	unsigned prompt;
-	struct dm_list pv_names;
+	struct processing_handle *handle;
+	struct pvcreate_each_params pp;
+	int ret;
 
 	if (!argc) {
 		log_error("Please enter a physical volume path");
 		return EINVALID_CMD_LINE;
 	}
 
-	force_count = arg_count(cmd, force_ARG);
-	prompt = arg_count(cmd, yes_ARG);
+	pvcreate_each_params_set_defaults(&pp);
 
-	dm_list_init(&pv_names);
+	pp.is_remove = 1;
+	pp.force = arg_count(cmd, force_ARG);
+	pp.yes = arg_count(cmd, yes_ARG);
+	pp.pv_count = argc;
+	pp.pv_names = argv;
 
-	/* Needed to change the set of orphan PVs. */
+	/*
+	 * Needed to change the set of orphan PVs.
+	 * (disable afterward to prevent process_each_pv from doing
+	 * a shared global lock since it's already acquired it ex.)
+	 */
 	if (!lockd_gl(cmd, "ex", 0))
 		return_ECMD_FAILED;
+	cmd->lockd_gl_disable = 1;
 
-	for (i = 0; i < argc; i++) {
-		dm_unescape_colons_and_at_signs(argv[i], NULL, NULL);
-		if (!str_list_add(cmd->mem, &pv_names, argv[i]))
-			return_ECMD_FAILED;
+	if (!(handle = init_processing_handle(cmd))) {
+		log_error("Failed to initialize processing handle.");
+		return ECMD_FAILED;
 	}
 
-	if (!pvremove_many(cmd, &pv_names, force_count, prompt))
-		return_ECMD_FAILED;
+	/*
+	 * pvremove uses the same toollib function as pvcreate,
+	 * but sets "is_remove" which changes the check function,
+	 * and the actual create vs remove step.
+	 */
+
+	if (!pvcreate_each_device(cmd, handle, &pp))
+		ret = ECMD_FAILED;
+	else {
+		/* pvcreate_each_device returns with orphans locked */
+		unlock_vg(cmd, VG_ORPHANS);
+		ret = ECMD_PROCESSED;
+	}
 
-	return ECMD_PROCESSED;
+	destroy_processing_handle(cmd, handle);
+	return ret;
 }
diff --git a/tools/toollib.c b/tools/toollib.c
index f88527f2f..a49a3d3f6 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -3439,6 +3439,7 @@ void pvcreate_each_params_set_defaults(struct pvcreate_each_params *pp)
 	dm_list_init(&pp->arg_process);
 	dm_list_init(&pp->arg_confirm);
 	dm_list_init(&pp->arg_create);
+	dm_list_init(&pp->arg_remove);
 	dm_list_init(&pp->arg_fail);
 	dm_list_init(&pp->pvs);
 }
@@ -3553,6 +3554,7 @@ int pvcreate_each_params_from_args(struct cmd_context *cmd, struct pvcreate_each
 
 enum {
 	PROMPT_PVCREATE_PV_IN_VG = 1,
+	PROMPT_PVREMOVE_PV_IN_VG = 2,
 };
 
 enum {
@@ -3620,6 +3622,28 @@ static void _check_pvcreate_prompt(struct cmd_context *cmd,
 					 prompt->pv_name, prompt->vg_name);
 			}
 		}
+
+	} else if (prompt->type == PROMPT_PVREMOVE_PV_IN_VG) {
+		if (pp->force != DONT_PROMPT_OVERRIDE) {
+			prompt->answer = PROMPT_ANSWER_NO;
+
+			log_error("PV %s belongs to Volume Group %s so please use vgreduce first.", prompt->pv_name, prompt->vg_name);
+			log_error("(If you are certain you need pvremove, then confirm by using --force twice.)");
+		} else if (pp->yes) {
+			prompt->answer = PROMPT_ANSWER_YES;
+		} else if (ask) {
+			if (yes_no_prompt("Really WIPE LABELS from physical volume \"%s\" of volume group \"%s\" [y/n]? ",
+					  prompt->pv_name, prompt->vg_name) == 'n') {
+				prompt->answer = PROMPT_ANSWER_NO;
+				log_error("%s: physical volume label not removed", prompt->pv_name);
+			} else {
+				prompt->answer = PROMPT_ANSWER_YES;
+			}
+		}
+
+		if ((prompt->answer == PROMPT_ANSWER_YES) && (pp->force == DONT_PROMPT_OVERRIDE))
+			log_warn("WARNING: Wiping physical volume label from %s of volume group \"%s\"",
+				 prompt->pv_name, prompt->vg_name);
 	}
 }
 
@@ -3653,10 +3677,10 @@ static struct pvcreate_device *_pvcreate_list_find_dev(struct dm_list *devices,
  * and the arg will be reported as not found.
  */
 
-static int _pvcreate_check1_single(struct cmd_context *cmd,
-				   struct volume_group *vg,
-				   struct physical_volume *pv,
-				   struct processing_handle *handle)
+static int _pvcreate_check_single(struct cmd_context *cmd,
+				  struct volume_group *vg,
+				  struct physical_volume *pv,
+				  struct processing_handle *handle)
 {
 	struct pvcreate_each_params *pp = (struct pvcreate_each_params *) handle->custom_handle;
 	struct pvcreate_device *pd;
@@ -3785,10 +3809,10 @@ static int _pvcreate_check1_single(struct cmd_context *cmd,
  * prompts, then it will not be found during this check.
  */
 
-static int _pvcreate_check2_single(struct cmd_context *cmd,
-				   struct volume_group *vg,
-				   struct physical_volume *pv,
-				   struct processing_handle *handle)
+static int _pv_confirm_single(struct cmd_context *cmd,
+			      struct volume_group *vg,
+			      struct physical_volume *pv,
+			      struct processing_handle *handle)
 {
 	struct pvcreate_each_params *pp = (struct pvcreate_each_params *) handle->custom_handle;
 	struct pvcreate_device *pd;
@@ -3804,7 +3828,7 @@ static int _pvcreate_check2_single(struct cmd_context *cmd,
 	if (!found)
 		return 1;
 
-	/* Repeat the same from check1. */
+	/* Repeat the same from check_single. */
 	if (!dev_test_excl(pv->dev)) {
 		/* FIXME Detect whether device-mapper itself is still using it */
 		log_error("Can't open %s exclusively.  Mounted filesystem?",
@@ -3821,12 +3845,12 @@ static int _pvcreate_check2_single(struct cmd_context *cmd,
 		/* Device is a PV used in a VG. */
 
 		if (pd->is_orphan_pv || pd->is_not_pv) {
-			/* In check1 it was an orphan or unused. */
+			/* In check_single it was an orphan or unused. */
 			goto fail;
 		}
 
 		if (pd->is_used_pv && pd->vg_name && strcmp(pd->vg_name, vg->name)) {
-			/* In check1 it was in a different VG. */
+			/* In check_single it was in a different VG. */
 			goto fail;
 		}
 
@@ -3834,12 +3858,12 @@ static int _pvcreate_check2_single(struct cmd_context *cmd,
 		/* Device is an orphan PV. */
 
 		if (pd->is_not_pv) {
-			/* In check1 it was not a PV. */
+			/* In check_single it was not a PV. */
 			goto fail;
 		}
 
 		if (pd->is_used_pv) {
-			/* In check1 it was in a VG. */
+			/* In check_single it was in a VG. */
 			goto fail;
 		}
 
@@ -3847,26 +3871,151 @@ static int _pvcreate_check2_single(struct cmd_context *cmd,
 		/* Device is not a PV. */
 
 		if (pd->is_orphan_pv) {
-			/* In check1 it was an orphan PV. */
+			/* In check_single it was an orphan PV. */
 			goto fail;
 		}
 
 		if (pd->is_used_pv) {
-			/* In check1 it was in a VG. */
+			/* In check_single it was in a VG. */
 			goto fail;
 		}
 	}
 
-	/* Device is unchanged from check1. */
+	/* Device is unchanged from check_single. */
 	dm_list_move(&pp->arg_process, &pd->list);
 	return 1;
 
 fail:
-	log_error("Cannot use device %s: it changed during create.", pd->name);
+	log_error("Cannot use device %s: it changed during prompt.", pd->name);
 	dm_list_move(&pp->arg_fail, &pd->list);
 	return 1;
 }
 
+static int _pvremove_check_single(struct cmd_context *cmd,
+				  struct volume_group *vg,
+				  struct physical_volume *pv,
+				  struct processing_handle *handle)
+{
+	struct pvcreate_each_params *pp = (struct pvcreate_each_params *) handle->custom_handle;
+	struct pvcreate_device *pd;
+	struct pvcreate_prompt *prompt;
+	struct label *label;
+	struct device *dev;
+	int found = 0;
+
+	if (!pv->dev)
+		return 1;
+
+	/*
+	 * Check if one of the command args in arg_devices
+	 * matches this device.
+	 */
+	dm_list_iterate_items(pd, &pp->arg_devices) {
+		dev = dev_cache_get(pd->name, cmd->full_filter);
+		if (dev != pv->dev)
+			continue;
+
+		pd->dev = pv->dev;
+		if (pv->dev->pvid[0])
+			strncpy(pd->pvid, pv->dev->pvid, ID_LEN);
+		found = 1;
+		break;
+	}
+
+	if (!found)
+		return 1;
+
+	log_debug("Checking device %s for pvremove %.32s",
+		  pv_dev_name(pv), pv->dev->pvid[0] ? pv->dev->pvid : "");
+
+	/*
+	 * This test will fail if the device belongs to an MD array.
+	 */
+	if (!dev_test_excl(pv->dev)) {
+		/* FIXME Detect whether device-mapper itself is still using it */
+		log_error("Can't open %s exclusively.  Mounted filesystem?",
+			  pv_dev_name(pv));
+		dm_list_move(&pp->arg_fail, &pd->list);
+		return 1;
+	}
+
+	/*
+	 * Is there a pv here already?
+	 * If not, this is an error unless you used -f.
+	 */
+	if (!label_read(pd->dev, &label, 0)) {
+		if (pp->force) {
+			dm_list_move(&pp->arg_process, &pd->list);
+			return 1;
+		} else {
+			log_error("No PV label found on %s.", pd->name);
+			dm_list_move(&pp->arg_fail, &pd->list);
+			return 1;
+		}
+	}
+
+	/*
+	 * What kind of device is this: an orphan PV, an uninitialized/unused
+	 * device, a PV used in a VG.
+	 */
+
+	if (vg && !is_orphan_vg(vg->name)) {
+		/* Device is a PV used in a VG. */
+		log_debug("Found pvremove arg %s: pv is used in %s", pd->name, vg->name);
+		pd->is_used_pv = 1;
+		pd->vg_name = dm_pool_strdup(cmd->mem, vg->name);
+	} else if (vg && is_orphan_vg(vg->name)) {
+		/* Device is an orphan PV. */
+		log_debug("Found pvremove arg %s: pv is orphan in %s", pd->name, vg->name);
+		pd->is_orphan_pv = 1;
+		if (!strcmp(vg->name, FMT_LVM1_ORPHAN_VG_NAME))
+			pp->orphan_vg_name = FMT_LVM1_ORPHAN_VG_NAME;
+		else
+			pp->orphan_vg_name = FMT_TEXT_ORPHAN_VG_NAME;
+	} else {
+		log_debug("Found pvremove arg %s: device is not a pv", pd->name);
+		/* Device is not a PV. */
+		pd->is_not_pv = 1;
+	}
+
+	if (pd->is_not_pv) {
+		pd->dev = pv->dev;
+		log_error("No PV found on device %s", pd->name);
+		dm_list_move(&pp->arg_fail, &pd->list);
+		return 1;
+	}
+
+	/*
+	 * pvremove is being run on this device, and it's not a PV,
+	 * or is an orphan PV.  Neither case requires a prompt.
+	 */
+	if (pd->is_orphan_pv) {
+		pd->dev = pv->dev;
+		dm_list_move(&pp->arg_process, &pd->list);
+		return 1;
+	}
+
+	/*
+	 * pvremove is being run on this device, but the device is in a VG.
+	 * A prompt or force option is required to use it.
+	 */
+
+	if (!(prompt = dm_pool_zalloc(cmd->mem, sizeof(*prompt)))) {
+		log_error("prompt alloc failed");
+		pp->check_failed = 1;
+		return 0;
+	}
+	prompt->dev = pd->dev;
+	prompt->pv_name = dm_pool_strdup(cmd->mem, pd->name);
+	prompt->vg_name = dm_pool_strdup(cmd->mem, vg->name);
+	prompt->type = PROMPT_PVREMOVE_PV_IN_VG;
+	dm_list_add(&pp->prompts, &prompt->list);
+
+	pd->dev = pv->dev;
+	dm_list_move(&pp->arg_process, &pd->list);
+	return 1;
+}
+
 /*
  * This can be used by pvcreate, vgcreate and vgextend to create PVs.  The
  * callers need to set up the pvcreate_each_params structure based on command
@@ -3973,7 +4122,8 @@ int pvcreate_each_device(struct cmd_context *cmd,
 	 * If it's added to arg_process but needs a prompt or force option, then
 	 * a corresponding prompt entry is added to pp->prompts.
 	 */
-	process_each_pv(cmd, 0, NULL, NULL, 1, 0, handle, _pvcreate_check1_single);
+	process_each_pv(cmd, 0, NULL, NULL, 1, 0, handle,
+			pp->is_remove ? _pvremove_check_single : _pvcreate_check_single);
 
 	/*
 	 * A fatal error was found while checking.
@@ -4104,7 +4254,7 @@ int pvcreate_each_device(struct cmd_context *cmd,
 
 	dm_list_splice(&pp->arg_confirm, &pp->arg_process);
 
-	process_each_pv(cmd, 0, NULL, NULL, 1, 0, handle, _pvcreate_check2_single);
+	process_each_pv(cmd, 0, NULL, NULL, 1, 0, handle, _pv_confirm_single);
 
 	dm_list_iterate_items(pd, &pp->arg_confirm)
 		log_error("Device %s not found (or ignored by filtering).", pd->name);
@@ -4124,7 +4274,10 @@ int pvcreate_each_device(struct cmd_context *cmd,
 
 do_command:
 
-	dm_list_splice(&pp->arg_create, &pp->arg_process);
+	if (pp->is_remove)
+		dm_list_splice(&pp->arg_remove, &pp->arg_process);
+	else
+		dm_list_splice(&pp->arg_create, &pp->arg_process);
 
 	/*
 	 * Wipe signatures on devices being created.
@@ -4272,8 +4425,31 @@ do_command:
 		dm_list_add(&pp->pvs, &pvl->list);
 	}
 
-	dm_list_iterate_items(pvl, &pp->pvs)
-		log_debug("pv command succeeded for %s", pv_dev_name(pvl->pv));
+	/*
+	 * Remove PVs from devices for pvremove.
+	 */
+	dm_list_iterate_items_safe(pd, pd2, &pp->arg_remove) {
+		struct lvmcache_info *info;
+
+		if (!label_remove(pd->dev)) {
+			log_error("Failed to wipe existing label(s) on %s", pd->name);
+			dm_list_move(&pp->arg_fail, &pd->list);
+			continue;
+		}
+
+		info = lvmcache_info_from_pvid(pd->pvid, 0);
+		if (info)
+			lvmcache_del(info);
+
+		if (!lvmetad_pv_gone_by_dev(pd->dev, NULL)) {
+			log_error("Failed to remove PV %s from lvmetad", pd->name);
+			dm_list_move(&pp->arg_fail, &pd->list);
+			continue;
+		}
+
+		log_print_unless_silent("Labels on physical volume \"%s\" successfully wiped",
+					pd->name);
+	}
 
 	dm_list_iterate_items(pd, &pp->arg_fail)
 		log_debug("pv command failed for %s", pd->name);