| Message ID | bf26bd313a12f155436bbaba06e90566bc018c31.camel@redhat.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [ovs-dev,v3] ovs-lib: pass optional --election-timer arg to ovsdb-tool | expand |
On Wed, 2021-06-09 at 14:11 -0500, Dan Williams wrote: > Signed-off-by: Dan Williams <dcbw@redhat.com> > --- > v3: fix line wrapping > v2: put --election-timer arg before create-cluster per Ilya Ping on this patch? Thanks! Dan > > utilities/ovs-lib.in | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in > index ab38ece458b7b..61a062fa992da 100644 > --- a/utilities/ovs-lib.in > +++ b/utilities/ovs-lib.in > @@ -495,15 +495,21 @@ create_cluster () { > DB_FILE="$1" > DB_SCHEMA="$2" > LOCAL_ADDR="$3" > + ELECTION_TIMER_MS="$4" > + > + election_timer_arg= > + if [ -n "$ELECTION_TIMER_MS" ]; then > + election_timer_arg="--election-timer=$ELECTION_TIMER_MS" > + fi > > if test ! -e "$DB_FILE"; then > - action "Creating cluster database $DB_FILE" ovsdb_tool > create-cluster "$DB_FILE" "$DB_SCHEMA" "$LOCAL_ADDR" > + action "Creating cluster database $DB_FILE" ovsdb_tool > "$election_timer_arg" create-cluster "$DB_FILE" "$DB_SCHEMA" > "$LOCAL_ADDR" > elif ovsdb_tool db-is-standalone "$DB_FILE"; then > # Convert standalone database to clustered. > backup_db || return 1 > rm -f "$DB_FILE" > action "Creating cluster database $DB_FILE from existing > one" \ > - ovsdb_tool create-cluster "$DB_FILE" "$backup" > "$LOCAL_ADDR" > + ovsdb_tool "$election_timer_arg" create-cluster > "$DB_FILE" "$backup" "$LOCAL_ADDR" > fi > } >
On Wed, Jun 09, 2021 at 02:11:42PM -0500, Dan Williams wrote: > Signed-off-by: Dan Williams <dcbw@redhat.com> > --- > v3: fix line wrapping > v2: put --election-timer arg before create-cluster per Ilya > > utilities/ovs-lib.in | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in > index ab38ece458b7b..61a062fa992da 100644 > --- a/utilities/ovs-lib.in > +++ b/utilities/ovs-lib.in > @@ -495,15 +495,21 @@ create_cluster () { > DB_FILE="$1" > DB_SCHEMA="$2" > LOCAL_ADDR="$3" > + ELECTION_TIMER_MS="$4" > + > + election_timer_arg= > + if [ -n "$ELECTION_TIMER_MS" ]; then > + election_timer_arg="--election-timer=$ELECTION_TIMER_MS" > + fi > > if test ! -e "$DB_FILE"; then > - action "Creating cluster database $DB_FILE" ovsdb_tool create-cluster "$DB_FILE" "$DB_SCHEMA" "$LOCAL_ADDR" > + action "Creating cluster database $DB_FILE" ovsdb_tool "$election_timer_arg" create-cluster "$DB_FILE" "$DB_SCHEMA" "$LOCAL_ADDR" Won't this give ovsdb-tool indigestion by passing a "" argument if there's no election timer? I think that $election_timer_arg needs to be unquoted. Similar issue below.
On Thu, 2021-06-24 at 14:58 -0700, Ben Pfaff wrote: > On Wed, Jun 09, 2021 at 02:11:42PM -0500, Dan Williams wrote: > > Signed-off-by: Dan Williams <dcbw@redhat.com> > > --- > > v3: fix line wrapping > > v2: put --election-timer arg before create-cluster per Ilya > > > > utilities/ovs-lib.in | 10 ++++++++-- > > 1 file changed, 8 insertions(+), 2 deletions(-) > > > > diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in > > index ab38ece458b7b..61a062fa992da 100644 > > --- a/utilities/ovs-lib.in > > +++ b/utilities/ovs-lib.in > > @@ -495,15 +495,21 @@ create_cluster () { > > DB_FILE="$1" > > DB_SCHEMA="$2" > > LOCAL_ADDR="$3" > > + ELECTION_TIMER_MS="$4" > > + > > + election_timer_arg= > > + if [ -n "$ELECTION_TIMER_MS" ]; then > > + election_timer_arg="--election-timer=$ELECTION_TIMER_MS" > > + fi > > > > if test ! -e "$DB_FILE"; then > > - action "Creating cluster database $DB_FILE" ovsdb_tool > > create-cluster "$DB_FILE" "$DB_SCHEMA" "$LOCAL_ADDR" > > + action "Creating cluster database $DB_FILE" ovsdb_tool > > "$election_timer_arg" create-cluster "$DB_FILE" "$DB_SCHEMA" > > "$LOCAL_ADDR" > > Won't this give ovsdb-tool indigestion by passing a "" argument if > there's no election timer? I think that $election_timer_arg needs to > be > unquoted. > > Similar issue below. Good point; will fix and double-check all permutations. Thanks, Dan
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in index ab38ece458b7b..61a062fa992da 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -495,15 +495,21 @@ create_cluster () { DB_FILE="$1" DB_SCHEMA="$2" LOCAL_ADDR="$3" + ELECTION_TIMER_MS="$4" + + election_timer_arg= + if [ -n "$ELECTION_TIMER_MS" ]; then + election_timer_arg="--election-timer=$ELECTION_TIMER_MS" + fi if test ! -e "$DB_FILE"; then - action "Creating cluster database $DB_FILE" ovsdb_tool create-cluster "$DB_FILE" "$DB_SCHEMA" "$LOCAL_ADDR" + action "Creating cluster database $DB_FILE" ovsdb_tool "$election_timer_arg" create-cluster "$DB_FILE" "$DB_SCHEMA" "$LOCAL_ADDR" elif ovsdb_tool db-is-standalone "$DB_FILE"; then # Convert standalone database to clustered. backup_db || return 1 rm -f "$DB_FILE" action "Creating cluster database $DB_FILE from existing one" \ - ovsdb_tool create-cluster "$DB_FILE" "$backup" "$LOCAL_ADDR" + ovsdb_tool "$election_timer_arg" create-cluster "$DB_FILE" "$backup" "$LOCAL_ADDR" fi }
Signed-off-by: Dan Williams <dcbw@redhat.com> --- v3: fix line wrapping v2: put --election-timer arg before create-cluster per Ilya utilities/ovs-lib.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)