peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-31 13:03:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

statd: allow ethtool --json to fail without breaking operational ds

Browse Source 
On boards like the R2S and the VisionFive2 `ethtool --json -S ethX` is
not yet supported.  This patch allows ethtool to fail, with a slightly
better log message, without breaking the operational datastore.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-08-08 13:35:27 +02:00
parent 2e27a7112a
commit 435c5ca9b4
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/statd/python/yanger/yanger.py
+3 -3
View File
@@ -621,10 +621,10 @@ def add_ethtool_groups(ifname, iface_out):
"""Fetch interface counters from kernel""" """Fetch interface counters from kernel"""
data = run_json_cmd(['ethtool', '--json', '-S', ifname, '--all-groups'], data = run_json_cmd(['ethtool', '--json', '-S', ifname, '--all-groups'],
f"ethtool-groups-{ifname}.json") f"ethtool-groups-{ifname}.json")
if len(data) != 1: if len(data) != 1:
print("Error: expected ethtool groups output to be array with length 1", file=sys.stderr) print(f"Error: no counters available for {ifname}, skipping.")
sys.exit(1) return
iface_in = data[0] iface_in = data[0]
src/statd/statd.c
+18 -6
View File
@@ -130,8 +130,12 @@ static json_t *json_get_ip_link(void)
return json_get_output(cmd); return json_get_output(cmd);
} }
/*
* The 'fail' parameter is true for most calls to this function, except
* when reading ethtool data (below).
*/
static int ly_add_yanger_data(const struct ly_ctx *ctx, struct lyd_node **parent, static int ly_add_yanger_data(const struct ly_ctx *ctx, struct lyd_node **parent,
const char *model, const char *arg) const char *model, const char *arg, bool fail)
{ {
char *yanger_args[5] = { char *yanger_args[5] = {
"/usr/libexec/statd/yanger", "/usr/libexec/statd/yanger",
@@ -173,6 +177,8 @@ static int ly_add_yanger_data(const struct ly_ctx *ctx, struct lyd_node **parent
ERROR("Error, running yanger"); ERROR("Error, running yanger");
fclose(stream); fclose(stream);
close(fd); close(fd);
if (!fail)
return SR_ERR_OK;
return SR_ERR_SYS; return SR_ERR_SYS;
} }
@@ -205,7 +211,8 @@ static int sr_ifaces_cb(sr_session_ctx_t *session, uint32_t, const char *path,
char *ifname; char *ifname;
int err; int err;
DEBUG("Incoming query for xpath: %s", path); ifname = &sub->name[3];
DEBUG("Incoming query for xpath: %s, ifname %s", path, ifname);
con = sr_session_get_connection(session); con = sr_session_get_connection(session);
if (!con) { if (!con) {
@@ -219,8 +226,13 @@ static int sr_ifaces_cb(sr_session_ctx_t *session, uint32_t, const char *path,
return SR_ERR_INTERNAL; return SR_ERR_INTERNAL;
} }
ifname = &sub->name[3]; /*
err = ly_add_yanger_data(ctx, parent, "ietf-interfaces", ifname); * If ethtool fails, it just means this interface doesn't have
* counters (in JSON format). Possibly because this board +
* driver combo is not 100% supported yet. This is fine, no
* need to break the operational datastore though.
*/
err = ly_add_yanger_data(ctx, parent, "ietf-interfaces", ifname, false);
if (err) if (err)
ERROR("Error adding yanger data"); ERROR("Error adding yanger data");
@@ -251,7 +263,7 @@ static int sr_ospf_cb(sr_session_ctx_t *session, uint32_t, const char *,
return SR_ERR_INTERNAL; return SR_ERR_INTERNAL;
} }
err = ly_add_yanger_data(ctx, parent, "ietf-ospf", NULL); err = ly_add_yanger_data(ctx, parent, "ietf-ospf", NULL, true);
if (err) if (err)
ERROR("Error adding yanger data"); ERROR("Error adding yanger data");
@@ -282,7 +294,7 @@ static int sr_generic_cb(sr_session_ctx_t *session, uint32_t, const char *model,
return SR_ERR_INTERNAL; return SR_ERR_INTERNAL;
} }
err = ly_add_yanger_data(ctx, parent, model, NULL); err = ly_add_yanger_data(ctx, parent, model, NULL, true);
if (err) if (err)
ERROR("Error adding yanger data"); ERROR("Error adding yanger data");