From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-5203-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 20111 invoked by alias); 28 Feb 2012 18:20:20 -0000
Received: (qmail 20087 invoked by uid 9447); 28 Feb 2012 18:20:19 -0000
Date: Tue, 28 Feb 2012 18:20:00 -0000
Message-ID: <20120228182019.20085.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/cache lvmcache.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2012-02/txt/msg00237.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2012-02-28 18:20:18

Modified files:
	lib/cache      : lvmcache.c 

Log message:
	If lvmetad fails, don't set _has_scanned

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/cache/lvmcache.c.diff?cvsroot=lvm2&r1=1.130&r2=1.131

--- LVM2/lib/cache/lvmcache.c	2012/02/28 11:08:04	1.130
+++ LVM2/lib/cache/lvmcache.c	2012/02/28 18:20:17	1.131
@@ -116,10 +116,15 @@
 
 void lvmcache_seed_infos_from_lvmetad(struct cmd_context *cmd)
 {
-	if (lvmetad_active() && !_has_scanned) {
-		lvmetad_pv_list_to_lvmcache(cmd);
-		_has_scanned = 1;
+	if (!lvmetad_active() || _has_scanned)
+		return;
+
+	if (!lvmetad_pv_list_to_lvmcache(cmd)) {
+		stack;
+		return;
 	}
+
+	_has_scanned = 1;
 };