From: Milan Broz <mbroz@redhat.com>
To: lvm-devel@redhat.com
Subject: [PATCH] fix vgcfgrestore segfault if PV is missing
Date: Fri, 20 Mar 2009 18:44:38 +0100 [thread overview]
Message-ID: <49C3D606.8000101@redhat.com> (raw)
Fix segfault for vgcfgrestore on VG with missing PVs.
Caused by introducing MISSING_PV flag, previously
vg_read failed here.
Signed-off-by: Milan Broz <mbroz@redhat.com>
---
lib/format_text/archiver.c | 6 ++++++
test/t-covercmd.sh | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c
index 0406ae5..4da267e 100644
--- a/lib/format_text/archiver.c
+++ b/lib/format_text/archiver.c
@@ -333,6 +333,12 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name,
if (!(vg = backup_read_vg(cmd, vg_name, file)))
return_0;
+ /*
+ * If PV is missing, there is already message from read above
+ */
+ if (vg_missing_pv_count(vg))
+ return 0;
+
return backup_restore_vg(cmd, vg);
}
diff --git a/test/t-covercmd.sh b/test/t-covercmd.sh
index 445c7d9..ed191bc 100755
--- a/test/t-covercmd.sh
+++ b/test/t-covercmd.sh
@@ -14,6 +14,8 @@
. ./test-utils.sh
+TEST_UUID="aaaaaa-aaaa-aaaa-aaaa-aaaa-aaaa-aaaaaa"
+
get_lvs_()
{
case $(lvs --units s --nosuffix --noheadings -o $1_read_ahead "$vg"/"$lv") in
@@ -28,7 +30,7 @@ pvcreate $dev1
pvcreate --metadatacopies 0 $dev2
pvcreate --metadatacopies 0 $dev3
pvcreate $dev4
-pvcreate --metadatacopies 0 $dev5
+pvcreate -u $TEST_UUID --metadatacopies 0 $dev5
vgcreate -c n $vg $devs
lvcreate -n $lv -l 5 -i5 -I256 $vg
@@ -67,6 +69,9 @@ lvrename "$vg" "$lv" "$lv-rename"
vgcfgbackup -f "$(pwd)/backup.$$" "$vg"
vgchange -an "$vg"
vgcfgrestore -f "$(pwd)/backup.$$" "$vg"
+pvremove -y -ff $dev5
+not vgcfgrestore -f "$(pwd)/backup.$$" "$vg"
+pvcreate -u $TEST_UUID --restorefile "$(pwd)/backup.$$" $dev5
vgremove -f "$vg"
pvresize --setphysicalvolumesize 10M "$dev1"
next reply other threads:[~2009-03-20 17:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-20 17:44 Milan Broz [this message]
2009-03-20 19:39 ` [PATCH] fix vgcfgrestore segfault if PV is missing Petr Rockai
2009-03-23 17:05 ` Alasdair G Kergon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49C3D606.8000101@redhat.com \
--to=mbroz@redhat.com \
--cc=lvm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.