[ovs-dev] [PATCH v2] Backup and remove existing DB when joining cluster

Flaviof flavio at flaviof.com
Tue Nov 23 17:12:23 UTC 2021


LGTM!

Acked-by: Flavio Fernandes <flavio at flaviof.com>


On Fri, Nov 5, 2021 at 2:24 PM Terry Wilson <twilson at redhat.com> wrote:

> ovsdb-tool join-cluster requires a remote addr, so the existing
> code that tried to join a cluster without it when there was an
> existing $DB_FILE would fail.
>
> Instead, if we are trying to specifically join a cluster and there
> is an existing $DB_FILE, back it up and remove the original before
> continuing to join the cluster.
>
> Signed-off-by: Terry Wilson <twilson at redhat.com>
> ---
>  utilities/ovs-lib.in | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
> index 3eda01d3c..13477a6a9 100644
> --- a/utilities/ovs-lib.in
> +++ b/utilities/ovs-lib.in
> @@ -519,13 +519,13 @@ join_cluster() {
>      LOCAL_ADDR="$3"
>      REMOTE_ADDR="$4"
>
> -    if test ! -e "$DB_FILE"; then
> -        ovsdb_tool join-cluster "$DB_FILE" "$SCHEMA_NAME" "$LOCAL_ADDR"
> "$REMOTE_ADDR"
> -    elif ovsdb_tool db-is-standalone "$DB_FILE"; then
> -        # Backup standalone database and join cluster.
> +    if test -e "$DB_FILE" && ovsdb_tool db-is-standalone "$DB_FILE"; then
>          backup_db || return 1
> +        rm $DB_FILE
> +    fi
> +    if test ! -e "$DB_FILE"; then
>          action "Joining $DB_FILE to cluster" \
> -               ovsdb_tool join-cluster "$DB_FILE" "$SCHEMA_NAME"
> "$LOCAL_ADDR"
> +               ovsdb_tool join-cluster "$DB_FILE" "$SCHEMA_NAME"
> "$LOCAL_ADDR" "$REMOTE_ADDR"
>      fi
>  }
>
> --
> 2.31.1
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>


More information about the dev mailing list