diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2012-01-20 22:02:04 +0000 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2012-01-20 22:02:04 +0000 |
| commit | 23e34c729be7acdab774b2fdf29e125da4c3d392 (patch) | |
| tree | 821aafadf7e4c1675de6341b870bc1d770952802 /tools/lvconvert.c | |
| parent | 861c624acb49bd2c3defc872ff943f6313328dc5 (diff) | |
| download | lvm2-23e34c729be7acdab774b2fdf29e125da4c3d392.tar.gz lvm2-23e34c729be7acdab774b2fdf29e125da4c3d392.tar.xz lvm2-23e34c729be7acdab774b2fdf29e125da4c3d392.zip | |
Differentiate between snapshot status of "Invalid" and "Merge failed".
Diffstat (limited to 'tools/lvconvert.c')
| -rw-r--r-- | tools/lvconvert.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 9553b9bf..66a25bd4 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -461,6 +461,9 @@ static progress_t _poll_merge_progress(struct cmd_context *cmd, } else if (percent == PERCENT_INVALID) { log_error("%s: Merging snapshot invalidated. Aborting merge.", lv->name); return PROGRESS_CHECK_FAILED; + } else if (percent == PERCENT_MERGE_FAILED) { + log_error("%s: Merge failed. Retry merge or inspect manually.", lv->name); + return PROGRESS_CHECK_FAILED; } if (parms->progress_display) |