Better clean-up of pvmove failures in a cluster

I think this patch is just about ready, but I'd like to make sure that I'm not making any mistakes in calling _deactivate_node(). Specifically, I'd like to know whether I need to pass a cookie pointer and udev_flags. If I need udev_flags, do I need anything special.

brassow

activation: Remove empty DM device when table fails to load.

As part of better error handling, remove DM devices that have been sucessfully created but failed to load a table. This can happen when pvmove'ing in a cluster and the cluster mirror daemon is not running on a remote node - the mapping table failing to load as a result. In this case, any revert would work on other nodes running cmirrord because the DM devices on those nodes did succeed in loading. However, because no table was able to load on the non-cmirrord nodes, there is no table present that points to what needs to be reverted. This causes the empty DM device to remain on the system without being present in any LVM representation.

Index: lvm2/libdm/libdm-deptree.c
===================================================================

libdm/libdm-deptree.c +1 -3

@@ -1920,15 +1920,49 @@ static int _create_node(struct dm_tree_n
  	if (!dm_task_no_open_count(dmt))
  		log_error("Failed to disable open_count");
 
-	if ((r = dm_task_run(dmt)))
-		r = dm_task_get_info(dmt, &dnode->info);
-
+	if ((r = dm_task_run(dmt))) {

libdm/libdm-deptree.c +29 -3

  out:
  	dm_task_destroy(dmt);
 
  	return r;
  }
 
+/*
+ * _remove_node
+ *
+ * This function is only used to remove a DM device that has failed
+ * to load any table.
+ */
+static int _remove_node(struct dm_tree_node *dnode)
+{
+	if (!dnode->info.exists)
+		return 1;
+
+	if (dnode->info.live_table || dnode->info.inactive_table) {
+		log_error(INTERNAL_ERROR
+			  "_remove_node called on device with loaded table(s).");
+		return 0;
+	}
+
+	if (!_deactivate_node(dnode->name, dnode->info.major,
+			      dnode->info.minor, NULL, 0, 0)) {
+		log_error("Failed to clean-up device with no table: %s %u:%u",
+			  dnode->name ? dnode->name : "",
+			  dnode->info.major, dnode->info.minor);
+		return 0;
+	}
+	return 1;
+}
 
  static int _build_dev_string(char *devbuf, size_t bufsize, struct dm_tree_node *node)
  {

@@ -2662,7 +2696,7 @@ int dm_tree_preload_children(struct dm_t
  			     const char *uuid_prefix,
  			     size_t uuid_prefix_len)
  {
-	int r = 1;
+	int r = 1, node_created = 0;
  	void *handle = NULL;
  	struct dm_tree_node *child;
  	struct dm_info newinfo;

@@ -2684,13 +2718,25 @@ int dm_tree_preload_children(struct dm_t
  				return_0;
 
  		/* FIXME Cope if name exists with no uuid? */
-		if (!child->info.exists && !_create_node(child))
+		if (!child->info.exists && !(node_created = _create_node(child)))
  			return_0;
 
  		if (!child->info.inactive_table &&
  		    child->props.segment_count &&
-		    !_load_node(child))
+		    !_load_node(child)) {

Specifically, I'd like to know whether I need to pass a cookie pointer and udev_flags. If I need udev_flags, do I need anything special.