From: Amir Shehata <amir.shehata@intel.com>
Date: Wed, 4 Jul 2018 17:42:58 +0000 (-0700)
Subject: LU-9120 lnet: show local ni health stats
X-Git-Tag: 2.11.55~65^2^2~5
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=60fc3c74757025f03ddd4b8e322716811ae97d3c

LU-9120 lnet: show local ni health stats

Added another section in the ni show output for the health
statistics.

Test-Parameters: forbuildonly
Signed-off-by: Amir Shehata <ashehata@whamcloud.com>
Change-Id: Id57013e510cf1fb4befdd7a4c18af28d1f995ce2
Reviewed-on: https://review.whamcloud.com/32782
Reviewed-by: Olaf Weber <olaf.weber@hpe.com>
Reviewed-by: Sonia Sharma <sharmaso@whamcloud.com>
Tested-by: Jenkins
---

diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c
index 1527f4a..42c0181 100644
--- a/lnet/utils/lnetconfig/liblnetconfig.c
+++ b/lnet/utils/lnetconfig/liblnetconfig.c
@@ -2078,6 +2078,7 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no,
 	struct lnet_ioctl_config_lnd_tunables *lnd;
 	struct lnet_ioctl_element_stats *stats;
 	struct lnet_ioctl_element_msg_stats msg_stats;
+	struct lnet_ioctl_local_ni_hstats hstats;
 	__u32 net = LNET_NIDNET(LNET_NID_ANY);
 	__u32 prev_net = LNET_NIDNET(LNET_NID_ANY);
 	int rc = LUSTRE_CFG_RC_OUT_OF_MEM, i, j;
@@ -2085,7 +2086,8 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no,
 	struct cYAML *root = NULL, *tunables = NULL,
 		*net_node = NULL, *interfaces = NULL,
 		*item = NULL, *first_seq = NULL,
-		*tmp = NULL, *statistics = NULL;
+		*tmp = NULL, *statistics = NULL,
+		*yhstats = NULL;
 	int str_buf_len = LNET_MAX_SHOW_NUM_CPT * 2;
 	char str_buf[str_buf_len];
 	char *pos;
@@ -2277,6 +2279,48 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no,
 					goto out;
 			}
 
+			LIBCFS_IOC_INIT_V2(hstats, hlni_hdr);
+			hstats.hlni_nid = ni_data->lic_nid;
+			/* grab health stats */
+			rc = l_ioctl(LNET_DEV_ID,
+				     IOC_LIBCFS_GET_LOCAL_HSTATS,
+				     &hstats);
+			if (rc != 0) {
+				l_errno = errno;
+				goto continue_without_msg_stats;
+			}
+			yhstats = cYAML_create_object(item, "health stats");
+			if (!yhstats)
+				goto out;
+			if (cYAML_create_number(yhstats, "health value",
+						hstats.hlni_health_value)
+							== NULL)
+				goto out;
+			if (cYAML_create_number(yhstats, "interrupts",
+						hstats.hlni_local_interrupt)
+							== NULL)
+				goto out;
+			if (cYAML_create_number(yhstats, "dropped",
+						hstats.hlni_local_dropped)
+							== NULL)
+				goto out;
+			if (cYAML_create_number(yhstats, "aborted",
+						hstats.hlni_local_aborted)
+							== NULL)
+				goto out;
+			if (cYAML_create_number(yhstats, "no route",
+						hstats.hlni_local_no_route)
+							== NULL)
+				goto out;
+			if (cYAML_create_number(yhstats, "timeouts",
+						hstats.hlni_local_timeout)
+							== NULL)
+				goto out;
+			if (cYAML_create_number(yhstats, "error",
+						hstats.hlni_local_error)
+							== NULL)
+				goto out;
+
 continue_without_msg_stats:
 			tunables = cYAML_create_object(item, "tunables");
 			if (!tunables)