@@ -493,7 +493,8 @@ int lv_info_by_lvid(struct cmd_context *cmd, const char *lvid_s,
}
/*
- * Returns 1 if percent set, else 0 on failure.
+ * Returns TARGET_STATUS_PROCESSING or TARGET_STATUS_FINISHED if percent set;
+ * else TARGET_STATUS_ERROR or TARGET_STATUS_INVALIDATED on failure.
*/
int lv_snapshot_percent(const struct logical_volume *lv, float *percent)
{
@@ -333,7 +333,7 @@ static int _percent_run(struct dev_manager *dm, const char *name,
struct logical_volume *lv, float *percent,
uint32_t *event_nr)
{
- int r = TARGET_STATUS_FINISHED;
+ int r = TARGET_STATUS_ERROR;
struct dm_task *dmt;
struct dm_info info;
void *next = NULL;
@@ -364,6 +364,7 @@ static int _percent_run(struct dev_manager *dm, const char *name,
if (event_nr)
*event_nr = info.event_nr;
+ r = TARGET_STATUS_FINISHED;
do {
next = dm_get_next_target(dmt, next, &start, &length, &type,
¶ms);
@@ -396,6 +397,7 @@ static int _percent_run(struct dev_manager *dm, const char *name,
} while (next);
if (lv && (segh = dm_list_next(&lv->segments, segh))) {
+ r = TARGET_STATUS_ERROR;
log_error("Number of segments in active LV %s does not "
"match metadata", lv->name);
goto out;
updated lvm-merge-background-poll.patch contains:
@@ -360,15 +360,18 @@ static int _poll_merge_progress(struct cmd_context *cmd,
{
int r;
float percent;
- if (!(r = lv_snapshot_percent(lv, &percent))) {
- log_error("Failed to query for merging percentage of lv %s.", lv->name);
+
+ r = lv_snapshot_percent(lv, &percent);
+ if (r == TARGET_STATUS_ERROR) {
+ log_error("Failed query for merging percentage of lv %s.", lv->name);
/* returning zero terminates the polling process */
return 0;
}
- if (r == TARGET_STATUS_INVALIDATED) {
+ else if (r == TARGET_STATUS_INVALIDATED) {
log_print("%s: Snapshot invalidated, aborting merging", lv->name);
return PROGRESS_FINISHED;
}
+
if (parms->progress_display)
log_print("%s: %s: %.1f%%", lv->name, parms->progress_title, percent);
else