Rename net/delay to net/swim_delay

Run-GHA: true Change-Id: Ia56bc0afaad80adb3a6b85b3256d6f3d11c30ec4 Required-githooks: true Signed-off-by: Michael MacDonald <[email protected]>
daos-stack · Jan 23, 2024 · 8b138e6 · 8b138e6
1 parent 339ec12
commit 8b138e6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/cart/crt_context.c b/src/cart/crt_context.c
@@ -329,11 +329,11 @@ crt_context_provider_create(crt_context_t *crt_ctx, crt_provider_t provider, boo
 		if (ret)
 			DL_WARN(rc, "Failed to create network glitch counter");
 
-		ret = d_tm_add_metric(&ctx->cc_net_delay, D_TM_STATS_GAUGE,
-				      "Network delay measurements", "delay", "net/%s/delay/ctx_%u",
-				      prov, ctx->cc_idx);
+		ret = d_tm_add_metric(&ctx->cc_swim_delay, D_TM_STATS_GAUGE,
+				      "SWIM delay measurements", "delay",
+				      "net/%s/swim_delay/ctx_%u", prov, ctx->cc_idx);
 		if (ret)
-			DL_WARN(rc, "Failed to create network delay gauge");
+			DL_WARN(rc, "Failed to create SWIM delay gauge");
 	}
 
 	if (crt_is_service() &&

diff --git a/src/cart/crt_internal_types.h b/src/cart/crt_internal_types.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2016-2023 Intel Corporation.
+ * (C) Copyright 2016-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -237,8 +237,8 @@ struct crt_context {
 	struct d_tm_node_t	*cc_failed_addr;
 	/** Counter for number of network glitches */
 	struct d_tm_node_t      *cc_net_glitches;
-	/** Stats gauge of reported network delays */
-	struct d_tm_node_t      *cc_net_delay;
+	/** Stats gauge of reported SWIM delays */
+	struct d_tm_node_t      *cc_swim_delay;
 
 	/** Stores self uri for the current context */
 	char			 cc_self_uri[CRT_ADDR_STR_MAX_LEN];

diff --git a/src/cart/crt_swim.c b/src/cart/crt_swim.c
@@ -1018,9 +1018,9 @@ crt_metrics_sample_delay(crt_context_t crt_ctx, uint64_t delay, bool glitch)
 	ctx = crt_ctx;
 
 	if (delay == 0)
-		d_tm_zero_gauge(ctx->cc_net_delay);
+		d_tm_zero_gauge(ctx->cc_swim_delay);
 	else
-		d_tm_set_gauge(ctx->cc_net_delay, delay);
+		d_tm_set_gauge(ctx->cc_swim_delay, delay);
 
 	if (glitch)
 		d_tm_inc_counter(ctx->cc_net_glitches, 1);

diff --git a/src/tests/ftest/util/telemetry_utils.py b/src/tests/ftest/util/telemetry_utils.py
@@ -1,5 +1,5 @@
 """
-(C) Copyright 2021-2023 Intel Corporation.
+(C) Copyright 2021-2024 Intel Corporation.
 
 SPDX-License-Identifier: BSD-2-Clause-Patent
 """
@@ -515,14 +515,14 @@ class TelemetryUtils():
         ENGINE_IO_OPS_TGT_UPDATE_ACTIVE_METRICS +\
         ENGINE_IO_OPS_UPDATE_ACTIVE_METRICS
     ENGINE_NET_METRICS = [
-        "engine_net_delay_stddev",
         "engine_net_glitch",
-        "engine_net_delay_max",
-        "engine_net_delay_mean",
-        "engine_net_delay",
-        "engine_net_delay_min",
         "engine_net_failed_addr",
         "engine_net_req_timeout",
+        "engine_net_swim_delay_stddev",
+        "engine_net_swim_delay_max",
+        "engine_net_swim_delay_mean",
+        "engine_net_swim_delay",
+        "engine_net_swim_delay_min",
         "engine_net_uri_lookup_timeout",
         "engine_net_uri_lookup_other",
         "engine_net_uri_lookup_self"]