vg_read: new wording for functions and messages

Make the function names and messages parallel each other
on the two parallel vg reading paths (label reading and
vg_read).

5 files changed, 30 insertions, 14 deletions

diff --git a/lib/format_text/archive.c b/lib/format_text/archive.c
index 4d4e7ac27..75ad60ad2 100644
--- a/lib/format_text/archive.c
+++ b/lib/format_text/archive.c
@@ -321,7 +321,7 @@ static void _display_archive(struct cmd_context *cmd, struct archive_file *af)
 	 * retrieve the archive time and description.
 	 */
 	/* FIXME Use variation on _vg_read */
-	if (!(vg = text_vg_import_file(tf, af->path, &when, &desc))) {
+	if (!(vg = text_read_metadata_file(tf, af->path, &when, &desc))) {
 		log_error("Unable to read archive file.");
 		tf->fmt->ops->destroy_instance(tf);
 		return;
diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index 1f95bdde0..797ac37b3 100644
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -544,7 +544,7 @@ static struct volume_group *_vg_read_raw_area(struct format_instance *fid,
 	}
 
 	/* FIXME 64-bit */
-	if (!(vg = text_vg_import_fd(fid, NULL, vg_fmtdata, use_previous_vg, area->dev,
+	if (!(vg = text_read_metadata(fid, NULL, vg_fmtdata, use_previous_vg, area->dev,
 				     (off_t) (area->start + rlocn->offset),
 				     (uint32_t) (rlocn->size - wrap),
 				     (off_t) (area->start + MDA_HEADER_SIZE),
@@ -896,7 +896,7 @@ static struct volume_group *_vg_read_file_name(struct format_instance *fid,
 	time_t when;
 	char *desc;
 
-	if (!(vg = text_vg_import_file(fid, read_path, &when, &desc)))
+	if (!(vg = text_read_metadata_file(fid, read_path, &when, &desc)))
 		return_NULL;
 
 	/*
diff --git a/lib/format_text/import-export.h b/lib/format_text/import-export.h
index 5efc3dd49..a23a15c8f 100644
--- a/lib/format_text/import-export.h
+++ b/lib/format_text/import-export.h
@@ -67,10 +67,10 @@ int read_segtype_lvflags(uint64_t *status, char *segtype_str);
 
 int text_vg_export_file(struct volume_group *vg, const char *desc, FILE *fp);
 size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf);
-struct volume_group *text_vg_import_file(struct format_instance *fid,
+struct volume_group *text_read_metadata_file(struct format_instance *fid,
 					 const char *file,
 					 time_t *when, char **desc);
-struct volume_group *text_vg_import_fd(struct format_instance *fid,
+struct volume_group *text_read_metadata(struct format_instance *fid,
 				       const char *file,
 				       struct cached_vg_fmtdata **vg_fmtdata,
 				       unsigned *use_previous_vg,
diff --git a/lib/format_text/import.c b/lib/format_text/import.c
index 5569961da..bfad9e0c4 100644
--- a/lib/format_text/import.c
+++ b/lib/format_text/import.c
@@ -71,11 +71,11 @@ int text_read_metadata_summary(const struct format_type *fmt,
 
 	if (dev) {
 		if (buf_async)
-			log_debug_metadata("Copying metadata for %s at %llu size %d (+%d)",
+			log_debug_metadata("Copying metadata summary for %s at %llu size %d (+%d)",
 					   dev_name(dev), (unsigned long long)offset,
 					   size, size2);
 		else
-			log_debug_metadata("Reading metadata from %s at %llu size %d (+%d)",
+			log_debug_metadata("Reading metadata summary from %s at %llu size %d (+%d)",
 					    dev_name(dev), (unsigned long long)offset,
 					    size, size2);
 
@@ -123,7 +123,7 @@ struct cached_vg_fmtdata {
         size_t cached_mda_size;
 };
 
-struct volume_group *text_vg_import_fd(struct format_instance *fid,
+struct volume_group *text_read_metadata(struct format_instance *fid,
 				       const char *file,
 				       struct cached_vg_fmtdata **vg_fmtdata,
 				       unsigned *use_previous_vg,
@@ -158,11 +158,23 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid,
 		     ((*vg_fmtdata)->cached_mda_checksum == checksum) &&
 		     ((*vg_fmtdata)->cached_mda_size == (size + size2));
 
-	if ((!dev && !config_file_read(cft)) ||
-	    (dev && !config_file_read_fd(cft, dev, NULL, offset, size,
+	if (dev) {
+		log_debug_metadata("Reading metadata from %s at %llu size %d (+%d)",
+				   dev_name(dev), (unsigned long long)offset,
+				   size, size2);
+
+		if (!config_file_read_fd(cft, dev, NULL, offset, size,
 					 offset2, size2, checksum_fn, checksum,
-					 skip_parse, 1)))
-		goto_out;
+					 skip_parse, 1)) {
+			log_error("Couldn't read volume group metadata from %s.", dev_name(dev));
+			goto out;
+		}
+	} else {
+		if (!config_file_read(cft)) {
+			log_error("Couldn't read volume group metadata from file.");
+			goto out;
+		}
+	}
 
 	if (skip_parse) {
 		if (use_previous_vg)
@@ -197,11 +209,11 @@ struct volume_group *text_vg_import_fd(struct format_instance *fid,
 	return vg;
 }
 
-struct volume_group *text_vg_import_file(struct format_instance *fid,
+struct volume_group *text_read_metadata_file(struct format_instance *fid,
 					 const char *file,
 					 time_t *when, char **desc)
 {
-	return text_vg_import_fd(fid, file, NULL, NULL, NULL,
+	return text_read_metadata(fid, file, NULL, NULL, NULL,
 				 (off_t)0, 0, (off_t)0, 0,
 				 NULL,
 				 0,
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 95593a274..987d1dd46 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -4363,8 +4363,12 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
 	/* Ensure contents of all metadata areas match - else do recovery */
 	inconsistent_mda_count=0;
 	dm_list_iterate_items(mda, &fid->metadata_areas_in_use) {
+		struct device *mda_dev = mda_get_device(mda);
+
 		use_previous_vg = 0;
 
+		log_debug_metadata("Reading VG %s from mda on %s", vgname, dev_name(mda_dev));
+
 		if ((use_precommitted &&
 		     !(vg = mda->ops->vg_read_precommit(fid, vgname, mda, &vg_fmtdata, &use_previous_vg)) && !use_previous_vg) ||
 		    (!use_precommitted &&