Thanks, I made that fix and applied this to master.
On Mon, Jan 07, 2013 at 12:20:56PM -0800, Ethan Jackson wrote: > Seems fine to me. I might change 'Pick' to 'Picks' in the comment. > > Acked-by: Ethan Jackson <[email protected]> > > > On Mon, Jan 7, 2013 at 11:34 AM, Ben Pfaff <[email protected]> wrote: > > > Signed-off-by: Ben Pfaff <[email protected]> > > CC: Zoltan Kiss <[email protected]> > > --- > > lib/bond.c | 9 +++++---- > > 1 files changed, 5 insertions(+), 4 deletions(-) > > > > diff --git a/lib/bond.c b/lib/bond.c > > index 2c59f9d..462ebd8 100644 > > --- a/lib/bond.c > > +++ b/lib/bond.c > > @@ -1,5 +1,5 @@ > > /* > > - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. > > + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. > > * > > * Licensed under the Apache License, Version 2.0 (the "License"); > > * you may not use this file except in compliance with the License. > > @@ -742,7 +742,8 @@ bond_shift_load(struct bond_entry *hash, struct > > bond_slave *to, > > hash->tag = tag_create_random(); > > } > > > > -/* Pick and returns a bond_entry to migrate to 'to' (the least-loaded > > slave), > > +/* Pick and returns a bond_entry to migrate from 'from' (the most heavily > > + * loaded bond slave) to a bond slave that has 'to_tx_bytes' bytes of > > load, > > * given that doing so must decrease the ratio of the load on the two > > slaves by > > * at least 0.1. Returns NULL if there is no appropriate entry. > > * > > @@ -859,8 +860,8 @@ bond_rebalance(struct bond *bond, struct tag_set *tags) > > break; > > } > > > > - /* 'from' is carrying significantly more load than 'to', and that > > load > > - * is split across at least two different hashes. */ > > + /* 'from' is carrying significantly more load than 'to'. Pick a > > hash > > + * to move from 'from' to 'to'. */ > > e = choose_entry_to_migrate(from, to->tx_bytes); > > if (e) { > > bond_shift_load(e, to, tags); > > -- > > 1.7.2.5 > > > > _______________________________________________ > > dev mailing list > > [email protected] > > http://openvswitch.org/mailman/listinfo/dev > > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
