Add device name to output of error messages in raw_read_mda_header().

It would be helpful if we had the device name when something like
a mda_header checksum error occurs.

Before:
./tools/lvm pvs -opv_name,vg_name,uuid,mda_count,pv_mda_count_ignored,vg_mda_count,vg_mda_count_ignored,vg_mda_copies
  Incorrect metadata area header checksum
  PV         VG      PV UUID                                #PMda #PMdaIgn #VMda #VMdaIgn #VMdaCps
  /dev/loop0 vgtest2 sVv26t-gjpb-Rcau-uBDO-Cx04-GbRR-6Ssq7e     2        0     4        0        4
  /dev/loop1 vgtest2 zXWStT-qE8F-mbkc-RfgH-aytv-mptF-Y5Ce09     2        0     4        0        4
  /dev/loop2         riCpK9-9G8r-LlIp-i2oh-mb3N-CUzk-u5YpuR     1        0     0        0        0
  /dev/loop3 vgtest  tQCUjm-rmyd-i92d-4eeE-UYBW-v1vQ-kRaA17     2        0     4        2        0
  /dev/loop4 vgtest  ZRvpeI-p8F1-ccVW-BBac-xhl1-aGXU-CbP0oo     2        2     4        2        0

After:
./tools/lvm pvs -opv_name,vg_name,uuid,mda_count,pv_mda_count_ignored,vg_mda_count,vg_mda_count_ignored,vg_mda_copies
  Incorrect metadata area header checksum on /dev/loop2 at offset 4096
  PV         VG      PV UUID                                #PMda #PMdaIgn #VMda #VMdaIgn #VMdaCps
  /dev/loop0 vgtest2 sVv26t-gjpb-Rcau-uBDO-Cx04-GbRR-6Ssq7e     2        0     4        0        4
  /dev/loop1 vgtest2 zXWStT-qE8F-mbkc-RfgH-aytv-mptF-Y5Ce09     2        0     4        0        4
  /dev/loop2         riCpK9-9G8r-LlIp-i2oh-mb3N-CUzk-u5YpuR     1        0     0        0        0
  /dev/loop3 vgtest  tQCUjm-rmyd-i92d-4eeE-UYBW-v1vQ-kRaA17     2        0     4        2        0
  /dev/loop4 vgtest  ZRvpeI-p8F1-ccVW-BBac-xhl1-aGXU-CbP0oo     2        2     4        2        0

diff --git a/WHATS_NEW b/WHATS_NEW
index 7533e13f3c5fb1b7272d2f199b1280715ed847db..8377f99b74e0ceeeebbbf666191620b8f6ddf213 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.68 -
 ===============================
+  Add device name and offset to output of error messages in raw_read_mda_header().
   Use flexible data[] in cmirrord request to prevent abort in runtime size checks.
   Honor log argument when down-converting stacked mirror.
   Sleep to workaround clvmd -S race: socket closed early and server drops cmd.

diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c
index 6e02f128820d63a3adb216dc59d4af66da2452da..b6f70c07a46adaa9e4c2c7d000cbbd15d832c786 100644 (file)
--- a/lib/format_text/format-text.c
+++ b/lib/format_text/format-text.c
@@ -311,26 +311,32 @@ static struct mda_header *_raw_read_mda_header(const struct format_type *fmt,
        if (mdah->checksum_xl != xlate32(calc_crc(INITIAL_CRC, mdah->magic,
                                                  MDA_HEADER_SIZE -
                                                  sizeof(mdah->checksum_xl)))) {
-               log_error("Incorrect metadata area header checksum");
+               log_error("Incorrect metadata area header checksum on %s"
+                         " at offset %"PRIu64, dev_name(dev_area->dev),
+                         dev_area->start);
                goto bad;
        }
 
        _xlate_mdah(mdah);
 
        if (strncmp((char *)mdah->magic, FMTT_MAGIC, sizeof(mdah->magic))) {
-               log_error("Wrong magic number in metadata area header");
+               log_error("Wrong magic number in metadata area header on %s"
+                         " at offset %"PRIu64, dev_name(dev_area->dev),
+                         dev_area->start);
                goto bad;
        }
 
        if (mdah->version != FMTT_VERSION) {
-               log_error("Incompatible metadata area header version: %d",
-                         mdah->version);
+               log_error("Incompatible metadata area header version: %d on %s"
+                         " at offset %"PRIu64, mdah->version,
+                         dev_name(dev_area->dev), dev_area->start);
                goto bad;
        }
 
        if (mdah->start != dev_area->start) {
                log_error("Incorrect start sector in metadata area header: %"
-                         PRIu64, mdah->start);
+                         PRIu64" on %s at offset %"PRIu64, mdah->start,
+                         dev_name(dev_area->dev), dev_area->start);
                goto bad;
        }