lvmpolld: do not parse/report progress data

remove code related to parsing progress data from lvpoll commands

3 files changed, 1 insertions, 74 deletions

diff --git a/daemons/lvmpolld/lvmpolld-core.c b/daemons/lvmpolld/lvmpolld-core.c
index 48919eaa2..95b23114c 100644
--- a/daemons/lvmpolld/lvmpolld-core.c
+++ b/daemons/lvmpolld/lvmpolld-core.c
@@ -134,60 +134,6 @@ static int read_single_line(char **line, size_t *lsize, FILE *file)
 	return (r > 0);
 }
 
-static inline const char *get_keyword(const enum poll_type type)
-{
-	switch (type) {
-	case PVMOVE:
-		return "Moved";
-	case CONVERT:
-		return "Converted";
-	case MERGE:
-	case MERGE_THIN:
-		return "Merged";
-	default:
-		return NULL;
-	}
-}
-
-static void parse_line_for_percents(lvmpolld_lv_t *pdlv, const char *line)
-{
-	char *endptr, *keyw, *nr;
-	dm_percent_t perc;
-	double d;
-
-	if (!(keyw = strstr(line, get_keyword(pdlv->type))) || keyw == line
-	    || !strchr(keyw, DM_PERCENT_CHAR)) {
-		INFO(pdlv->ls, "%s: %s", PD_LOG_PREFIX,
-		     "parsing percentage from lvm2 command failed");
-		return;
-	}
-
-	nr = strpbrk(keyw, "+-0123456789");
-	if (!nr) {
-		INFO(pdlv->ls, "%s: %s", PD_LOG_PREFIX,
-		     "parsing percentage from lvm2 command failed");
-		return;
-	}
-
-	d = strtod(nr, &endptr);
-	if (nr == endptr) {
-		INFO(pdlv->ls, "%s: %s", PD_LOG_PREFIX,
-		     "parsing percentage from lvm2 command failed");
-		return;
-	} else if (d > 100.0) {
-		WARN(pdlv->ls, "%s: %s", PD_LOG_PREFIX,
-		     "parsing percentage from lvm2 command returned invalid value");
-		return;
-	}
-
-	perc = dm_make_percent((uint64_t)(d * DM_PERCENT_1), DM_PERCENT_100);
-
-	DEBUGLOG(pdlv->ls, "%s: %s %.1f%%", PD_LOG_PREFIX,
-		 "parsed", dm_percent_to_float(perc));
-
-	pdlv_set_percents(pdlv, perc);
-}
-
 static void update_active_state(lvmpolld_state_t *ls)
 {
 	if (!ls->idle)
@@ -578,13 +524,11 @@ static response progress_info(client_handle h, lvmpolld_state_t *ls, request req
 
 		if (st.polling_finished)
 			r = daemon_reply_simple(LVMPD_RESP_FINISHED,
-						LVMPD_PARM_DATA " = %d", st.percent,
 						"reason = %s", st.cmd_state.signal ? LVMPD_REAS_SIGNAL : LVMPD_REAS_RETCODE,
 						LVMPD_PARM_VALUE " = %d", st.cmd_state.signal ?: st.cmd_state.retcode,
 						NULL);
 		else
 			r = daemon_reply_simple(LVMPD_RESP_IN_PROGRESS,
-						LVMPD_PARM_DATA " = %d", st.percent,
 						NULL);
 	}
 	else
@@ -604,7 +548,7 @@ static lvmpolld_lv_t *construct_pdlv(request req, lvmpolld_state_t *ls,
 	unsigned handle_missing_pvs = daemon_request_int(req, LVMPD_PARM_HANDLE_MISSING_PVS, 0);
 
 	pdlv = pdlv_create(ls, lvid, lvname, type, interval, 2 * uinterval,
-			   pdst, (abort ? NULL : parse_line_for_percents));
+			   pdst, NULL);
 
 	if (!pdlv) {
 		ERROR(ls, "%s: %s", PD_LOG_PREFIX, "Failed to create pdlv");
diff --git a/daemons/lvmpolld/lvmpolld-data-utils.c b/daemons/lvmpolld/lvmpolld-data-utils.c
index 36cc31be7..faf251aca 100644
--- a/daemons/lvmpolld/lvmpolld-data-utils.c
+++ b/daemons/lvmpolld/lvmpolld-data-utils.c
@@ -28,7 +28,6 @@ lvmpolld_lv_t *pdlv_create(lvmpolld_state_t *ls, const char *lvid,
 		.lvname = dm_strdup(lvname),
 		.sinterval = dm_strdup(sinterval),
 		.pdtimeout = pdtimeout ?: PDTIMEOUT_DEF,
-		.percent = DM_PERCENT_0,
 		.cmd_state = { .retcode = -1, .signal = 0 },
 		.pdst = pdst,
 		.parse_output_fn = parse_fn
@@ -88,7 +87,6 @@ lvmpolld_lv_state_t pdlv_get_status(lvmpolld_lv_t *pdlv)
 	r.internal_error = pdlv_locked_internal_error(pdlv);
 	r.polling_finished = pdlv_locked_polling_finished(pdlv);
 	r.cmd_state = pdlv_locked_cmd_state(pdlv);
-	r.percent = pdlv_locked_percent(pdlv);
 	pdlv_unlock(pdlv);
 
 	return r;
@@ -109,13 +107,6 @@ void pdlv_set_internal_error(lvmpolld_lv_t *pdlv, unsigned error)
 	pdlv_unlock(pdlv);
 }
 
-void pdlv_set_percents(lvmpolld_lv_t *pdlv, dm_percent_t percent)
-{
-	pdlv_lock(pdlv);
-	pdlv->percent = percent;
-	pdlv_unlock(pdlv);
-}
-
 void pdlv_set_polling_finished(lvmpolld_lv_t *pdlv, unsigned finished)
 {
 	pdlv_lock(pdlv);
diff --git a/daemons/lvmpolld/lvmpolld-data-utils.h b/daemons/lvmpolld/lvmpolld-data-utils.h
index 98932dc4d..fc4261c67 100644
--- a/daemons/lvmpolld/lvmpolld-data-utils.h
+++ b/daemons/lvmpolld/lvmpolld-data-utils.h
@@ -49,7 +49,6 @@ typedef struct {
 	unsigned internal_error:1;
 	unsigned polling_finished:1;
 	lvmpolld_cmd_stat_t cmd_state;
-	dm_percent_t percent;
 } lvmpolld_lv_state_t;
 
 typedef struct lvmpolld_lv {
@@ -75,7 +74,6 @@ typedef struct lvmpolld_lv {
 
 	/* block of shared variables protected by lock */
 	lvmpolld_cmd_stat_t cmd_state;
-	dm_percent_t percent;
 	unsigned polling_finished:1; /* no more updates */
 	unsigned internal_error:1; /* unrecoverable error occured in lvmpolld */
 } lvmpolld_lv_t;
@@ -119,7 +117,6 @@ unsigned pdlv_get_polling_finished(lvmpolld_lv_t *pdlv);
 lvmpolld_lv_state_t pdlv_get_status(lvmpolld_lv_t *pdlv);
 void pdlv_set_cmd_state(lvmpolld_lv_t *pdlv, const lvmpolld_cmd_stat_t *cmd_state);
 void pdlv_set_internal_error(lvmpolld_lv_t *pdlv, unsigned error);
-void pdlv_set_percents(lvmpolld_lv_t *pdlv, dm_percent_t percent);
 void pdlv_set_polling_finished(lvmpolld_lv_t *pdlv, unsigned finished);
 
 /*
@@ -140,11 +137,6 @@ static inline unsigned pdlv_locked_internal_error(const lvmpolld_lv_t *pdlv)
 	return pdlv->internal_error;
 }
 
-static inline dm_percent_t pdlv_locked_percent(const lvmpolld_lv_t *pdlv)
-{
-	return pdlv->percent;
-}
-
 /* LVMPOLLD_STORE_T manipulation routines */
 
 void pdst_init(lvmpolld_store_t *pdst, const char *name);