From e80c10d5e6fb97e132ff7f1c2846629fb5ad915f Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Tue, 30 Jan 2018 18:48:33 +0530 Subject: metrics: set latency min value during xlator init otherwise, the very first metrics will have all the min as 0. also no need to print pending-fops if it is 0. Updates #168 Change-Id: I233de6c92b1a73977bb468ba211ac6ec3c05298f Signed-off-by: Amar Tumballi --- libglusterfs/src/monitoring.c | 3 ++- libglusterfs/src/xlator.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/monitoring.c b/libglusterfs/src/monitoring.c index 25103867e24..62738c79e74 100644 --- a/libglusterfs/src/monitoring.c +++ b/libglusterfs/src/monitoring.c @@ -81,7 +81,8 @@ dump_latency_and_count (xlator_t *xl, int fd) uint64_t cbk; uint64_t count; - dprintf (fd, "%s.total.winds.count %lu\n", xl->name, xl->winds); + if (xl->winds) + dprintf (fd, "%s.total.pending-winds.count %lu\n", xl->name, xl->winds); /* Need 'fuse' data, and don't need all the old graph info */ if ((xl != xl->ctx->master) && (xl->ctx->active != xl->graph)) diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index b060d393730..4071a7c0569 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -217,6 +217,7 @@ xlator_volopt_dynload (char *xlator_type, void **dl_handle, int xlator_dynload_oldway (xlator_t *xl) { + int i = 0; int ret = -1; void *handle = NULL; volume_opt_list_t *vol_opt = NULL; @@ -300,6 +301,12 @@ int xlator_dynload_oldway (xlator_t *xl) INIT_LIST_HEAD (&vol_opt->list); list_add_tail (&vol_opt->list, &xl->volume_options); + /* make sure 'min' is set to high value, so it would be + properly set later */ + for (i = 0; i < GF_FOP_MAXVALUE; i++) { + xl->stats.interval.latencies[i].min = 0xffffffff; + } + ret = 0; out: -- cgit