提交 3f7cba3f 编写于 作者: L Laine Stump

util: suppress unimportant ovs-vsctl errors when getting interface stats

commit edaf1356 modified the stats retrieval for OVS interfaces to
not fail when one of the fields was unrecognized by the ovs-vsctl
command, but ovs-vsctl was still returning an error, and libvirt was
cluttering the logs with these inconsequential error messages.

This patch modifies the GET_STAT macro to add "--if-exists" to the
ovs-vsctl command, which causes it to return an empty string (and exit
with success) if the requested statistic isn't in its database, thus
eliminating the ugly error messages from the log.

Resolves: https://bugzilla.redhat.com/1683175Signed-off-by: NLaine Stump <laine@laine.org>
上级 54eb3e09
......@@ -335,10 +335,10 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
virCommandFree(cmd); \
cmd = virCommandNew(OVSVSCTL); \
virNetDevOpenvswitchAddTimeout(cmd); \
virCommandAddArgList(cmd, "get", "Interface", ifname, \
"statistics:" name, NULL); \
virCommandAddArgList(cmd, "--if-exists", "get", "Interface", \
ifname, "statistics:" name, NULL); \
virCommandSetOutputBuffer(cmd, &output); \
if (virCommandRun(cmd, NULL) < 0) { \
if (virCommandRun(cmd, NULL) < 0 || !output || !*output || *output == '\n') { \
stats->member = -1; \
} else { \
if (virStrToLong_ll(output, &tmp, 10, &stats->member) < 0 || \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册