On 6/23/26 10:47 AM, Ales Musil wrote:
> The newly introduced "ovn-nb-cfg-sb-ts" would be removed every time the
> timestamp was 0. This was especially problematic during upgrades
> as the timestamp would be 0 and the key didn't exist in the database.
> This would lead into warnings in the logs:
> 
> |ovsdb_idl|WARN|Trying to delete a key that doesn't exist in the map.
> 
> To prevent that check if the key is actually set before trying
> to delete it.
> 
> Fixes: 8b572fe84011 ("Add nb_cfg_timestamp to SB_Global for propagation 
> latency.")
> Signed-off-by: Ales Musil <[email protected]>
> ---
>  controller/ovn-controller.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c
> index 405c985d4..4f4119dd5 100644
> --- a/controller/ovn-controller.c
> +++ b/controller/ovn-controller.c
> @@ -936,7 +936,7 @@ store_nb_cfg(struct ovsdb_idl_txn *sb_txn, struct 
> ovsdb_idl_txn *ovs_txn,
>                                                       OVS_NB_CFG_SB_TS_NAME,
>                                                       sb_ts_str);
>              free(sb_ts_str);
> -        } else {
> +        } else if (smap_get(&br_int->external_ids, OVS_NB_CFG_SB_TS_NAME)) {
>              ovsrec_bridge_update_external_ids_delkey(br_int,
>                                                       OVS_NB_CFG_SB_TS_NAME);
>          }

Hi Ales,

Thanks for the quick follow up fix!  I should've caught it at review
too, my bad.

Acked-by: Dumitru Ceara <[email protected]>

Regards,
Dumitru

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to