summaryrefslogtreecommitdiff
path: root/tools/lvconvert_poll.c
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2021-03-17 11:17:32 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2021-03-18 18:34:57 +0100
commita60c8748eac2e6f047532b6d106492d120860608 (patch)
treee6a4f87bac2cfdfb1d9dc291c223893c469299a8 /tools/lvconvert_poll.c
parent8cbe4a171e093aa7de9e16115b13ee3852545d07 (diff)
downloadlvm2-a60c8748eac2e6f047532b6d106492d120860608.tar.gz
thin: ignore parallel merge while polling
If the thin volume has no merging snapshot, (being already merged) there is nothing to check.
Diffstat (limited to 'tools/lvconvert_poll.c')
-rw-r--r--tools/lvconvert_poll.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/lvconvert_poll.c b/tools/lvconvert_poll.c
index b64cffe21..50d47164f 100644
--- a/tools/lvconvert_poll.c
+++ b/tools/lvconvert_poll.c
@@ -179,7 +179,10 @@ progress_t poll_thin_merge_progress(struct cmd_context *cmd,
{
uint32_t device_id = 0;
- if (!lv_thin_device_id(lv, &device_id) || !lv->snapshot) {
+ if (!lv->snapshot)
+ return PROGRESS_FINISHED_ALL; /* Already merged by someone else */
+
+ if (!lv_thin_device_id(lv, &device_id)) {
stack;
return PROGRESS_CHECK_FAILED;
}