From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Thu, 5 Jan 2017 14:52:00 +0000 (+0100)
Subject: report: report merged state for inactive LV
X-Git-Tag: v2_02_169~504
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=74969c9a38c286037d499a6ed603b1ae806cd37b;p=lvm2.git

report: report merged state for inactive LV

This was missing piece in 77997c7673bfca56f51ae4eb55a50bc76e40fe79.
When merging origin is inactive (while driver is loaded) we
could already report merge in progress values as there is
no way to activate 'old state' now.
---

diff --git a/tools/reporter.c b/tools/reporter.c
index 6c5996b1f..e70fa2960 100644
--- a/tools/reporter.c
+++ b/tools/reporter.c
@@ -136,11 +136,14 @@ static int _check_merging_origin(const struct logical_volume *lv,
 	case SEG_STATUS_SNAPSHOT:
 		break;
 	default:
+		/* When inactive, it's technically merging */
+		if (status->info_ok && !status->info.exists)
+			break;
 		return 1;
 	}
 
 	/* Origin is gone */
-	log_debug_activation("Merge is progress, reporting merged LV %s.",
+	log_debug_activation("Merge is in progress, reporting merged LV %s.",
 			     display_lvname(lv->snapshot->lv));
 	*merged = 1;