Message ID | 1441916335-22413-1-git-send-email-blp@nicira.com |
---|---|
State | Accepted |
Headers | show |
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com> > On Sep 10, 2015, at 1:18 PM, Ben Pfaff <blp@nicira.com> wrote: > > It seems to me that a controller bug doesn't rise to the level of a WARN > that causes a testsuite failure (by default). > > Signed-off-by: Ben Pfaff <blp@nicira.com> > --- > ofproto/ofproto.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c > index c1301b5..c7dd8a2 100644 > --- a/ofproto/ofproto.c > +++ b/ofproto/ofproto.c > @@ -6369,7 +6369,7 @@ copy_buckets_for_insert_bucket(const struct ofgroup *ofgroup, > ofputil_bucket_clone_list(&new_ofgroup->buckets, &ofgroup->buckets, NULL); > > if (ofputil_bucket_check_duplicate_id(&ofgroup->buckets)) { > - VLOG_WARN_RL(&rl, "Duplicate bucket id"); > + VLOG_INFO_RL(&rl, "Duplicate bucket id"); > return OFPERR_OFPGMFC_BUCKET_EXISTS; > } > > @@ -6605,7 +6605,7 @@ handle_group_mod(struct ofconn *ofconn, const struct ofp_header *oh) > > default: > if (gm.command > OFPGC11_DELETE) { > - VLOG_WARN_RL(&rl, "%s: Invalid group_mod command type %d", > + VLOG_INFO_RL(&rl, "%s: Invalid group_mod command type %d", > ofproto->name, gm.command); > } > return OFPERR_OFPGMFC_BAD_COMMAND; > -- > 2.1.3 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev
Thanks, I applied this to master. On Thu, Sep 10, 2015 at 02:48:03PM -0700, Jarno Rajahalme wrote: > Acked-by: Jarno Rajahalme <jrajahalme@nicira.com> > > > On Sep 10, 2015, at 1:18 PM, Ben Pfaff <blp@nicira.com> wrote: > > > > It seems to me that a controller bug doesn't rise to the level of a WARN > > that causes a testsuite failure (by default). > > > > Signed-off-by: Ben Pfaff <blp@nicira.com> > > --- > > ofproto/ofproto.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c > > index c1301b5..c7dd8a2 100644 > > --- a/ofproto/ofproto.c > > +++ b/ofproto/ofproto.c > > @@ -6369,7 +6369,7 @@ copy_buckets_for_insert_bucket(const struct ofgroup *ofgroup, > > ofputil_bucket_clone_list(&new_ofgroup->buckets, &ofgroup->buckets, NULL); > > > > if (ofputil_bucket_check_duplicate_id(&ofgroup->buckets)) { > > - VLOG_WARN_RL(&rl, "Duplicate bucket id"); > > + VLOG_INFO_RL(&rl, "Duplicate bucket id"); > > return OFPERR_OFPGMFC_BUCKET_EXISTS; > > } > > > > @@ -6605,7 +6605,7 @@ handle_group_mod(struct ofconn *ofconn, const struct ofp_header *oh) > > > > default: > > if (gm.command > OFPGC11_DELETE) { > > - VLOG_WARN_RL(&rl, "%s: Invalid group_mod command type %d", > > + VLOG_INFO_RL(&rl, "%s: Invalid group_mod command type %d", > > ofproto->name, gm.command); > > } > > return OFPERR_OFPGMFC_BAD_COMMAND; > > -- > > 2.1.3 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > http://openvswitch.org/mailman/listinfo/dev >
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index c1301b5..c7dd8a2 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -6369,7 +6369,7 @@ copy_buckets_for_insert_bucket(const struct ofgroup *ofgroup, ofputil_bucket_clone_list(&new_ofgroup->buckets, &ofgroup->buckets, NULL); if (ofputil_bucket_check_duplicate_id(&ofgroup->buckets)) { - VLOG_WARN_RL(&rl, "Duplicate bucket id"); + VLOG_INFO_RL(&rl, "Duplicate bucket id"); return OFPERR_OFPGMFC_BUCKET_EXISTS; } @@ -6605,7 +6605,7 @@ handle_group_mod(struct ofconn *ofconn, const struct ofp_header *oh) default: if (gm.command > OFPGC11_DELETE) { - VLOG_WARN_RL(&rl, "%s: Invalid group_mod command type %d", + VLOG_INFO_RL(&rl, "%s: Invalid group_mod command type %d", ofproto->name, gm.command); } return OFPERR_OFPGMFC_BAD_COMMAND;
It seems to me that a controller bug doesn't rise to the level of a WARN that causes a testsuite failure (by default). Signed-off-by: Ben Pfaff <blp@nicira.com> --- ofproto/ofproto.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)