On Tue, Jan 10, 2023 at 6:09 PM Han Zhou <hz...@ovn.org> wrote:
>
> This is to avoid annoying error logs from NB/SB/IC DB servers.
>
> Reported-by: Girish Moodalbail <gmoodalb...@nvidia.com>
> Reported-at:
https://mail.openvswitch.org/pipermail/ovs-discuss/2020-July/050343.html
> Signed-off-by: Han Zhou <hz...@ovn.org>
> ---
> This patch depends on the pending OVSDB patch:
>
https://patchwork.ozlabs.org/project/openvswitch/patch/20230111000756.4054163-1-hz...@ovn.org/

The above dependent OVS patch was merged. I just realized that this OVN
patch needs to bump the OVS submodule to use the new API.
Once it is Acked I will include the OVS submodule version change before
merging it.

Thanks,
Han

>
>  utilities/ovn-dbctl.c    | 2 ++
>  utilities/ovn-ic-nbctl.c | 4 +++-
>  utilities/ovn-ic-sbctl.c | 4 +++-
>  3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/utilities/ovn-dbctl.c b/utilities/ovn-dbctl.c
> index a850c2f31709..f0ee0ba053d3 100644
> --- a/utilities/ovn-dbctl.c
> +++ b/utilities/ovn-dbctl.c
> @@ -188,6 +188,8 @@ ovn_dbctl_main(int argc, char *argv[],
>      idl = the_idl =
ovsdb_idl_create_unconnected(dbctl_options->idl_class,
>                                                   daemon_mode);
>      ovsdb_idl_set_shuffle_remotes(idl, shuffle_remotes);
> +    /* "set_db_change_aware" is true iff in daemon mode. */
> +    ovsdb_idl_set_db_change_aware(idl, daemon_mode);
>      /* "retry" is true iff in daemon mode. */
>      ovsdb_idl_set_remote(idl, db, daemon_mode);
>      ovsdb_idl_set_leader_only(idl, leader_only);
> diff --git a/utilities/ovn-ic-nbctl.c b/utilities/ovn-ic-nbctl.c
> index 63550d492fb5..f3d8039a872c 100644
> --- a/utilities/ovn-ic-nbctl.c
> +++ b/utilities/ovn-ic-nbctl.c
> @@ -112,7 +112,9 @@ main(int argc, char *argv[])
>      ctl_timeout_setup(timeout);
>
>      /* Initialize IDL. */
> -    idl = the_idl = ovsdb_idl_create(db, &icnbrec_idl_class, true,
false);
> +    idl = the_idl = ovsdb_idl_create_unconnected(&icnbrec_idl_class,
true);
> +    ovsdb_idl_set_remote(idl, db, false);
> +    ovsdb_idl_set_db_change_aware(idl, false);
>      ovsdb_idl_set_leader_only(idl, leader_only);
>      run_prerequisites(commands, n_commands, idl);
>
> diff --git a/utilities/ovn-ic-sbctl.c b/utilities/ovn-ic-sbctl.c
> index 39fbb83057b0..3060b48b9a5c 100644
> --- a/utilities/ovn-ic-sbctl.c
> +++ b/utilities/ovn-ic-sbctl.c
> @@ -111,7 +111,9 @@ main(int argc, char *argv[])
>      ctl_timeout_setup(timeout);
>
>      /* Initialize IDL. */
> -    idl = the_idl = ovsdb_idl_create(db, &icsbrec_idl_class, true,
false);
> +    idl = the_idl = ovsdb_idl_create_unconnected(&icsbrec_idl_class,
true);
> +    ovsdb_idl_set_remote(idl, db, false);
> +    ovsdb_idl_set_db_change_aware(idl, false);
>      ovsdb_idl_set_leader_only(idl, leader_only);
>      run_prerequisites(commands, n_commands, idl);
>
> --
> 2.30.2
>
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to