| Message ID | 20180127091904.6772-1-jakub.kicinski@netronome.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
| Series | [iproute2] tc: fix second printing of requeues | expand |
On Sat, 27 Jan 2018 01:19:04 -0800 Jakub Kicinski <jakub.kicinski@netronome.com> wrote: > Non-JSON tc qdisc output used to print the "requeues" statistic > twice. Commit 4fcec7f3665b ("tc: jsonify stats2") tried to preserve > this behaviour for both standard output and JSON, but used the wrong > statistic (q.qlen). Also duplicating keys in JSON is not allowed, > so the second occurrence should be completely skipped with JSON. > > Fixes: 4fcec7f3665b ("tc: jsonify stats2") > Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Also applied this fix
diff --git a/tc/tc_util.c b/tc/tc_util.c index 10e5aa91168a..aceb0d944933 100644 --- a/tc/tc_util.c +++ b/tc/tc_util.c @@ -846,7 +846,7 @@ void print_tcstats2_attr(FILE *fp, struct rtattr *rta, char *prefix, struct rtat print_string(PRINT_FP, NULL, "backlog %s", sprint_size(q.backlog, b1)); print_uint(PRINT_ANY, "qlen", " %up", q.qlen); - print_uint(PRINT_ANY, "requeues", " requeues %u", q.qlen); + print_uint(PRINT_FP, NULL, " requeues %u", q.requeues); } if (xstats)
Non-JSON tc qdisc output used to print the "requeues" statistic twice. Commit 4fcec7f3665b ("tc: jsonify stats2") tried to preserve this behaviour for both standard output and JSON, but used the wrong statistic (q.qlen). Also duplicating keys in JSON is not allowed, so the second occurrence should be completely skipped with JSON. Fixes: 4fcec7f3665b ("tc: jsonify stats2") Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> --- tc/tc_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)