| Message ID | 20210706223709.2926478-1-blp@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] bridge: Use correct (legacy) role names in database. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot | success | github build: passed |
Hi, On Tue, Jul 06, 2021 at 03:37:09PM -0700, Ben Pfaff wrote: > The vswitchd database schema requires role names to be "master" or > "slave", but this code tried to use "primary" and "secondary". We have defined the constraints in the schema and we can't change the schema because it would require external applications to do the same change and would affect upgrades, correct? Thanks fbl > Signed-off-by: Ben Pfaff <blp@ovn.org> > Reported-at: https://github.com/openvswitch/ovs-issues/issues/218 > Fixes: 807152a4ddfb ("Use primary/secondary, not master/slave, as names for OpenFlow roles.") > --- > vswitchd/bridge.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c > index 0432d2abf0af..cb7c5cb769da 100644 > --- a/vswitchd/bridge.c > +++ b/vswitchd/bridge.c > @@ -3019,9 +3019,9 @@ ofp12_controller_role_to_str(enum ofp12_controller_role role) > case OFPCR12_ROLE_EQUAL: > return "other"; > case OFPCR12_ROLE_PRIMARY: > - return "primary"; > + return "master"; > case OFPCR12_ROLE_SECONDARY: > - return "secondary"; > + return "slave"; > case OFPCR12_ROLE_NOCHANGE: > default: > return NULL; > -- > 2.31.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
On Wed, Jul 07, 2021 at 04:37:11PM -0300, Flavio Leitner wrote: > > Hi, > > On Tue, Jul 06, 2021 at 03:37:09PM -0700, Ben Pfaff wrote: > > The vswitchd database schema requires role names to be "master" or > > "slave", but this code tried to use "primary" and "secondary". > > We have defined the constraints in the schema and we can't change > the schema because it would require external applications to do > the same change and would affect upgrades, correct? Yes.
On Wed, Jul 07, 2021 at 12:58:28PM -0700, Ben Pfaff wrote: > On Wed, Jul 07, 2021 at 04:37:11PM -0300, Flavio Leitner wrote: > > > > Hi, > > > > On Tue, Jul 06, 2021 at 03:37:09PM -0700, Ben Pfaff wrote: > > > The vswitchd database schema requires role names to be "master" or > > > "slave", but this code tried to use "primary" and "secondary". > > > > We have defined the constraints in the schema and we can't change > > the schema because it would require external applications to do > > the same change and would affect upgrades, correct? > > Yes. Thanks!
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 0432d2abf0af..cb7c5cb769da 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -3019,9 +3019,9 @@ ofp12_controller_role_to_str(enum ofp12_controller_role role) case OFPCR12_ROLE_EQUAL: return "other"; case OFPCR12_ROLE_PRIMARY: - return "primary"; + return "master"; case OFPCR12_ROLE_SECONDARY: - return "secondary"; + return "slave"; case OFPCR12_ROLE_NOCHANGE: default: return NULL;
The vswitchd database schema requires role names to be "master" or "slave", but this code tried to use "primary" and "secondary". Signed-off-by: Ben Pfaff <blp@ovn.org> Reported-at: https://github.com/openvswitch/ovs-issues/issues/218 Fixes: 807152a4ddfb ("Use primary/secondary, not master/slave, as names for OpenFlow roles.") --- vswitchd/bridge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)