| Message ID | 87h7a1ao2r.fsf@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] northd: Fix missing space in log warnings. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
| ovsrobot/github-robot-_Build_and_Test | fail | github build: failed |
On Mon, Jan 17, 2022 at 7:24 PM James Troup <james.troup@canonical.com> wrote: > > Add a space between 'static route' and the UUID in logs. > > Signed-off-by: James Troup <james.troup@canonical.com> Thanks. I applied to the main branch. Numan > --- > northd/northd.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > e.g. > > 2022-01-17T19:55:27.701Z|1601438|ovn_northd|WARN|Address family doesn't match between 'ip_prefix' 0.0.0.0/0 and 'nexthop' 2620:2d:4000:2000::1 in static routefb68fe04-ca8e-4885-a01f-9e7ac6b337e5 > > diff --git a/northd/northd.c b/northd/northd.c > index c714227b2..22e783ff6 100644 > --- a/northd/northd.c > +++ b/northd/northd.c > @@ -8872,7 +8872,7 @@ parsed_routes_add(struct ovn_datapath *od, const struct hmap *ports, > if (valid_nexthop) { > if (!ip46_parse_cidr(route->nexthop, &nexthop, &plen)) { > static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1); > - VLOG_WARN_RL(&rl, "bad 'nexthop' %s in static route" > + VLOG_WARN_RL(&rl, "bad 'nexthop' %s in static route " > UUID_FMT, route->nexthop, > UUID_ARGS(&route->header_.uuid)); > return NULL; > @@ -8880,7 +8880,7 @@ parsed_routes_add(struct ovn_datapath *od, const struct hmap *ports, > if ((IN6_IS_ADDR_V4MAPPED(&nexthop) && plen != 32) || > (!IN6_IS_ADDR_V4MAPPED(&nexthop) && plen != 128)) { > static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1); > - VLOG_WARN_RL(&rl, "bad next hop mask %s in static route" > + VLOG_WARN_RL(&rl, "bad next hop mask %s in static route " > UUID_FMT, route->nexthop, > UUID_ARGS(&route->header_.uuid)); > return NULL; > @@ -8891,7 +8891,7 @@ parsed_routes_add(struct ovn_datapath *od, const struct hmap *ports, > struct in6_addr prefix; > if (!ip46_parse_cidr(route->ip_prefix, &prefix, &plen)) { > static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1); > - VLOG_WARN_RL(&rl, "bad 'ip_prefix' %s in static route" > + VLOG_WARN_RL(&rl, "bad 'ip_prefix' %s in static route " > UUID_FMT, route->ip_prefix, > UUID_ARGS(&route->header_.uuid)); > return NULL; > @@ -8902,7 +8902,7 @@ parsed_routes_add(struct ovn_datapath *od, const struct hmap *ports, > if (IN6_IS_ADDR_V4MAPPED(&prefix) != IN6_IS_ADDR_V4MAPPED(&nexthop)) { > static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1); > VLOG_WARN_RL(&rl, "Address family doesn't match between 'ip_prefix'" > - " %s and 'nexthop' %s in static route"UUID_FMT, > + " %s and 'nexthop' %s in static route "UUID_FMT, > route->ip_prefix, route->nexthop, > UUID_ARGS(&route->header_.uuid)); > return NULL; > -- > 2.32.0 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/northd/northd.c b/northd/northd.c index c714227b2..22e783ff6 100644 --- a/northd/northd.c +++ b/northd/northd.c @@ -8872,7 +8872,7 @@ parsed_routes_add(struct ovn_datapath *od, const struct hmap *ports, if (valid_nexthop) { if (!ip46_parse_cidr(route->nexthop, &nexthop, &plen)) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1); - VLOG_WARN_RL(&rl, "bad 'nexthop' %s in static route" + VLOG_WARN_RL(&rl, "bad 'nexthop' %s in static route " UUID_FMT, route->nexthop, UUID_ARGS(&route->header_.uuid)); return NULL; @@ -8880,7 +8880,7 @@ parsed_routes_add(struct ovn_datapath *od, const struct hmap *ports, if ((IN6_IS_ADDR_V4MAPPED(&nexthop) && plen != 32) || (!IN6_IS_ADDR_V4MAPPED(&nexthop) && plen != 128)) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1); - VLOG_WARN_RL(&rl, "bad next hop mask %s in static route" + VLOG_WARN_RL(&rl, "bad next hop mask %s in static route " UUID_FMT, route->nexthop, UUID_ARGS(&route->header_.uuid)); return NULL; @@ -8891,7 +8891,7 @@ parsed_routes_add(struct ovn_datapath *od, const struct hmap *ports, struct in6_addr prefix; if (!ip46_parse_cidr(route->ip_prefix, &prefix, &plen)) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1); - VLOG_WARN_RL(&rl, "bad 'ip_prefix' %s in static route" + VLOG_WARN_RL(&rl, "bad 'ip_prefix' %s in static route " UUID_FMT, route->ip_prefix, UUID_ARGS(&route->header_.uuid)); return NULL; @@ -8902,7 +8902,7 @@ parsed_routes_add(struct ovn_datapath *od, const struct hmap *ports, if (IN6_IS_ADDR_V4MAPPED(&prefix) != IN6_IS_ADDR_V4MAPPED(&nexthop)) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1); VLOG_WARN_RL(&rl, "Address family doesn't match between 'ip_prefix'" - " %s and 'nexthop' %s in static route"UUID_FMT, + " %s and 'nexthop' %s in static route "UUID_FMT, route->ip_prefix, route->nexthop, UUID_ARGS(&route->header_.uuid)); return NULL;
Add a space between 'static route' and the UUID in logs. Signed-off-by: James Troup <james.troup@canonical.com> --- northd/northd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) e.g. 2022-01-17T19:55:27.701Z|1601438|ovn_northd|WARN|Address family doesn't match between 'ip_prefix' 0.0.0.0/0 and 'nexthop' 2620:2d:4000:2000::1 in static routefb68fe04-ca8e-4885-a01f-9e7ac6b337e5