[ovs-git] [openvswitch/ovs] 53348f: connmgr: Modernize coding style.

Mon Oct 29 23:10:16 UTC 2018

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 53348f4b037d1f8b2674960d8bdde489cd2e8a4c
      https://github.com/openvswitch/ovs/commit/53348f4b037d1f8b2674960d8bdde489cd2e8a4c
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M ofproto/connmgr.c

  Log Message:
  -----------
  connmgr: Modernize coding style.

This moves declarations closer to first use and merges them with
initialization when possible, moves "for" loop variable declarations into
the "for" statements where possible, and otherwise makes this code look
like it was written a little more recently than it was.

Signed-off-by: Ben Pfaff <blp at ovn.org>

  Commit: b7e77e073e0d85027fed9ece8c7d3ceb47c04f3b
      https://github.com/openvswitch/ovs/commit/b7e77e073e0d85027fed9ece8c7d3ceb47c04f3b
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M include/openvswitch/rconn.h
    M lib/rconn.c

  Log Message:
  -----------
  rconn: New function rconn_is_reliable().

This will have its first user in an upcoming commit.

Signed-off-by: Ben Pfaff <blp at ovn.org>

  Commit: f122a5b8720bf0b9b4e2c94d189515fc466544dc
      https://github.com/openvswitch/ovs/commit/f122a5b8720bf0b9b4e2c94d189515fc466544dc
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M ofproto/connmgr.c
    M ofproto/connmgr.h
    M ofproto/ofproto.c
    M ofproto/ofproto.h
    M vswitchd/bridge.c

  Log Message:
  -----------
  connmgr: Improve interface for setting controllers.

Using an shash instead of an array simplifies the code for both the caller
and the callee.  Putting the set of allowed OpenFlow versions into the
ofproto_controller data structure also simplifies the overall function
interface slightly.

Signed-off-by: Ben Pfaff <blp at ovn.org>

  Commit: f58e3cec24176107e5a214b069fe5ecd0dde1e96
      https://github.com/openvswitch/ovs/commit/f58e3cec24176107e5a214b069fe5ecd0dde1e96
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M ofproto/connmgr.c
    M vswitchd/bridge.c

  Log Message:
  -----------
  connmgr: Make treatment of active and passive connections more uniform.

Until now, connmgr has handled active and passive OpenFlow connections in
quite different ways.  Any active connection, whether it was currently
connected or not, was always maintained as an ofconn.  Whenever such a
connection (re)connected, its settings were cleared.  On the other hand,
passive connections had a separate listener which created an ofconn when
a new connection came in, and these ofconns would be deleted when such a
connection was closed.  This approach is inelegant and has occasionally
led to bugs when reconnection didn't clear all of the state that it
should have.

There's another motivation here.  Currently, active connections are
always primary controllers and passive connections are always service
controllers (as documented in ovs-vswitchd.conf.db(5)).  Sometimes it would
be useful to have passive primary controllers (maybe active service
controllers too but I haven't personally run into that use case).  As is,
this is difficult to implement because there is so much different code in
use between active and passive connections.  This commit will make it
easier.

Signed-off-by: Ben Pfaff <blp at ovn.org>

  Commit: d51e5b1a204f3c0b1bc8077229ba4c48a97d9c1a
      https://github.com/openvswitch/ovs/commit/d51e5b1a204f3c0b1bc8077229ba4c48a97d9c1a
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M ofproto/connmgr.c
    M ofproto/connmgr.h
    M ofproto/ofproto.c
    M ofproto/ofproto.h
    M vswitchd/bridge.c
    M vswitchd/vswitch.ovsschema
    M vswitchd/vswitch.xml

  Log Message:
  -----------
  vswitchd: Allow user to configure controllers as "primary" or "service".

Normally it makes sense for an active connection to be primary and a
passive connection to be a service connection, but I've run into a corner
case where it is better for a passive connection to be a primary
connection.  This specific case is for use with OFtest, which expects to be
a primary controller.  However, it also wants to reconnect frequently,
which is slow for active connections because of the backoff; by
configuring a passive, primary controller, OFtest can reconnect as
frequently and as quickly as it wants, making the overall test much faster.

Signed-off-by: Ben Pfaff <blp at ovn.org>

  Commit: 51643ee47707cc80654762ac38af43a93b800212
      https://github.com/openvswitch/ovs/commit/51643ee47707cc80654762ac38af43a93b800212
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M ofproto/ofproto.c

  Log Message:
  -----------
  ofproto: Don't always treat passive controllers as "equal".

If a passive controller chooses to configure itself as a slave controller,
I don't know a reason why it should be considered "equal" for some
purposes.

Signed-off-by: Ben Pfaff <blp at ovn.org>

  Commit: 40dff9eded0450eaef68dba9e413681866dfa09e
      https://github.com/openvswitch/ovs/commit/40dff9eded0450eaef68dba9e413681866dfa09e
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M ofproto/ofproto-dpif-upcall.c

  Log Message:
  -----------
  ofproto-dpif-upcall: Increment dump_seq before instead of after dump.

When process_upcall() passes a miss upcall to upcall_xlate(), the new
ukey's dump_seq member is initialized from the current dump_seq.  Later,
when udpif_revalidator() calls revalidate(), any dumped flow for which
ukey->dump_seq equals the current dump_seq is skipped.  However, until now
the current dump_seq was only incremented *after* a revalidation run is
completed.  That means that, if a ukey added is added between revalidation
runs, it will be skipped on the subsequent revalidation run.  This commit
fixes the problem by incrementing dump_seq just before a revalidation run
instead of just after.

Found with OFTest pktact.SingleWildcardMatchPriority test for OpenFlow 1.0.

CC: Joe Stringer <joe at ovn.org>
Signed-off-by: Ben Pfaff <blp at ovn.org>

  Commit: 51809c1d7501bc5824766acee51a2ed21f16f0a1
      https://github.com/openvswitch/ovs/commit/51809c1d7501bc5824766acee51a2ed21f16f0a1
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M ofproto/connmgr.c
    M ofproto/connmgr.h
    M ofproto/ofproto-dpif-upcall.c
    M ofproto/ofproto-dpif-upcall.h
    M ofproto/ofproto-dpif.c
    M ofproto/ofproto-provider.h

  Log Message:
  -----------
  ofproto-dpif: Make barriers more effective.

Signed-off-by: Ben Pfaff <blp at ovn.org>

  Commit: b157e92141bfac344cfee1f856e4ea54d6b4eaca
      https://github.com/openvswitch/ovs/commit/b157e92141bfac344cfee1f856e4ea54d6b4eaca
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M include/openvswitch/ofp-actions.h
    M include/openvswitch/ofp-match.h
    M lib/classifier.c
    M lib/match.c
    M lib/ofp-actions.c
    M lib/ofp-flow.c
    M lib/ofp-match.c
    M lib/ofp-monitor.c
    M ofproto/ofproto-provider.h
    M ofproto/ofproto.c

  Log Message:
  -----------
  Preserve priorities for OF1.0 exact-match flows.

  Commit: 79de2c37bd067a3d851529f551164314e25afe3a
      https://github.com/openvswitch/ovs/commit/79de2c37bd067a3d851529f551164314e25afe3a
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M include/openflow/openflow-common.h
    M include/openvswitch/ofp-flow.h
    M lib/ofp-flow.c
    M ofproto/ofproto-dpif.c
    M ofproto/ofproto-dpif.h

  Log Message:
  -----------
  Implement emergency flow cache.

  Commit: 0f8ab4e4b887b3b4988b5d2fd6a7615e22cd516c
      https://github.com/openvswitch/ovs/commit/0f8ab4e4b887b3b4988b5d2fd6a7615e22cd516c
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M lib/netdev-dummy.c

  Log Message:
  -----------
  netdev-dummy: Implement queue stats.

Fixes errors from OFTest tests counters.TxPktPerQueue and
counters.TxBytPerQueue.

Signed-off-by: Ben Pfaff <blp at ovn.org>

  Commit: c2ab9948b376cbe6a5aadea1fbdc436e7132151f
      https://github.com/openvswitch/ovs/commit/c2ab9948b376cbe6a5aadea1fbdc436e7132151f
  Author: Ben Pfaff <blp at ovn.org>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M tests/automake.mk
    A tests/oftest-macros.at
    A tests/oftest.at
    A tests/refresh-oftest
    R tests/run-oftest
    M tests/testsuite.at

  Log Message:
  -----------
  Add oftest tests to testsuite.

  Commit: cb59ce30fed71447b5269a2e61beae470bdb2bd2
      https://github.com/openvswitch/ovs/commit/cb59ce30fed71447b5269a2e61beae470bdb2bd2
  Author: Ilya Maximets <i.maximets at samsung.com>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M lib/colors.man
    M lib/common.man
    M lib/ofp-version.man
    M lib/ssl.man
    M lib/vlog-unixctl.man
    M lib/vlog.man
    M manpages.mk
    M ovn/utilities/ovn-detrace.1.in
    M ovn/utilities/ovn-sbctl.8.in
    M ovsdb/ovsdb-client.1.in
    M ovsdb/ovsdb-server.1.in
    M ovsdb/ovsdb-tool.1.in
    M utilities/bugtool/ovs-bugtool.8.in
    M utilities/ovs-appctl.8.in
    M utilities/ovs-dpctl-top.8.in
    M utilities/ovs-dpctl.8.in
    M utilities/ovs-l3ping.8.in
    M utilities/ovs-ofctl.8.in
    M utilities/ovs-pcap.1.in
    M utilities/ovs-pki.8.in
    M utilities/ovs-tcpdump.8.in
    M utilities/ovs-tcpundump.1.in
    M utilities/ovs-testcontroller.8.in
    M utilities/ovs-vlan-bug-workaround.8.in
    M utilities/ovs-vsctl.8.in
    M vtep/vtep-ctl.8.in

  Log Message:
  -----------
  manpages: Include ovs.tmac in most man roots.

This allows to not redefine common macroses in every single
file and allowes using things like .EX without warying about
compatibility.
manpages.mk updated automatically.

Files that are already complete pages (i.e. has no *.in sources)
wasn't touched, because this will require additional file
manipulations and changes in makefiles/specs without serious
profit.

Signed-off-by: Ilya Maximets <i.maximets at samsung.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>

Compare: https://github.com/openvswitch/ovs/compare/b47e7e2bac7f...cb59ce30fed7
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.