From f48f70b7a329460d2474cd4e079cc7912ea0a187 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Thu, 10 Feb 2011 16:47:45 -0800 Subject: [PATCH] vswitchd: Fix broken load rebalancing with balance-tcp. Load rebalancing was not working in balance-tcp mode due to mistaken balance-slb only assumptions leftover in the bridge code. --- vswitchd/bridge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 9c614fb34..e92dd6202 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -3073,7 +3073,7 @@ bridge_account_flow_ofhook_cb(const struct flow *flow, tag_type tags, if (nl_attr_type(a) == ODP_ACTION_ATTR_OUTPUT) { struct port *out_port = port_from_dp_ifidx(br, nl_attr_get_u32(a)); if (out_port && out_port->n_ifaces >= 2 && - out_port->bond_mode == BM_SLB) { + out_port->bond_mode != BM_AB) { uint16_t vlan = (flow->vlan_tci ? vlan_tci_to_vid(flow->vlan_tci) : OFP_VLAN_NONE); @@ -3098,7 +3098,7 @@ bridge_account_checkpoint_ofhook_cb(void *br_) now = time_msec(); for (i = 0; i < br->n_ports; i++) { struct port *port = br->ports[i]; - if (port->n_ifaces > 1 && port->bond_mode == BM_SLB + if (port->n_ifaces > 1 && port->bond_mode != BM_AB && now >= port->bond_next_rebalance) { port->bond_next_rebalance = now + port->bond_rebalance_interval; bond_rebalance_port(port); @@ -3441,7 +3441,7 @@ bond_shift_load(struct slave_balance *from, struct slave_balance *to, struct port *port = from->iface->port; uint64_t delta = hash->tx_bytes; - assert(port->bond_mode == BM_SLB); + assert(port->bond_mode != BM_AB); VLOG_INFO("bond %s: shift %"PRIu64"kB of load (with hash %td) " "from %s to %s (now carrying %"PRIu64"kB and " -- 2.43.0