From patchwork Tue Jun 15 16:26:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Odintsov X-Patchwork-Id: 1492354 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YTlBqq8t; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G4DHC729Tz9sW6 for ; Wed, 16 Jun 2021 02:27:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 009034053F; Tue, 15 Jun 2021 16:27:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EGAFroqIO8lD; Tue, 15 Jun 2021 16:27:01 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2DF6A4041B; Tue, 15 Jun 2021 16:27:00 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 28CE5C0027; Tue, 15 Jun 2021 16:26:59 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 24CE9C000B for ; Tue, 15 Jun 2021 16:26:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1C08E83C0D for ; Tue, 15 Jun 2021 16:26:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LwtiqYpcuoa6 for ; Tue, 15 Jun 2021 16:26:53 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3E86C83C02 for ; Tue, 15 Jun 2021 16:26:53 +0000 (UTC) Received: by mail-lj1-x234.google.com with SMTP id l4so13364601ljg.0 for ; Tue, 15 Jun 2021 09:26:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+OVF4g7p7lysCBCFrq21oNDrTQQXxrv3HocDDd4nvu0=; b=YTlBqq8tTXS/0c9HgddzyixqULzgN2mzX0YOa2ZQdfU1qPy/yGbot9lyGFDemNQaWG 6upvXlmRJMbYeHK81n33w4S6Ef+H3h2K8aNueZ34u4IawsfmrfnsqAFbE+qZwWzfeKaw WGtE8DZIITQR5ci0NsgUQUNuDAaGqKzGWCXXMloH6s+n7yrKPKzA1oY4cueEiDrUJafa B8MeMtsSdspi2QcqC7R/ApbqLXasNxZkNf2i9HYJ0HNhw3tGxQfVEVomZ6HBNKZ4aaAT OAUH9+RXmtfhLscvqyljgauaQMVbJ1mtVJSdmqja6vpgquPqpJdhpGxqt+iD5BdHk2L8 FgJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+OVF4g7p7lysCBCFrq21oNDrTQQXxrv3HocDDd4nvu0=; b=DyX/pwuX78DFitFCj7HohEFK4GEidraOG3cSSzdushM12uqwsgMoTM8vWdIBk5nyDA /mzlVnPVHZHI9bH7CCAmccwrSzdyMNa9WlapKIv21PkPyJtq2Ha79QStDibWlm2WCxCf 2EbjTok/srOcUfMjPViB4m6yWFi2a0BxHYXnU0He7/4/8WjZxy8sgKyGt+HE9r71xiSs pSGZdNp/IGVDqgB3CRHtgyexvwiuPeFksJuDztB97OMDhbn7oCKll3oPUG+pXwdlw2A4 LjcWanD+c4oR8K1MwE+tCrcCyLaccc3eik/SUj1RvIYKLNB0KhcztPdhPRx/IpniF7OJ 6P4Q== X-Gm-Message-State: AOAM5322IU9LlQB6thvBAh4/pK4PLs4NtZRHhXPtm/EnETnv27ECfkWL 4iVRixECduGchGQcTpf65vss6nB95adV8eco X-Google-Smtp-Source: ABdhPJx5/icVwf/XtSGIenZJvrdkFmaGjPw2ycEsWg1XsB0F98m0gEpJh2e1hCOw7oKKGXAFgk8IMQ== X-Received: by 2002:a2e:9b0e:: with SMTP id u14mr370052lji.123.1623774411130; Tue, 15 Jun 2021 09:26:51 -0700 (PDT) Received: from Vladislavs-MacBook-Pro.local.ru (109-252-131-42.dynamic.spd-mgts.ru. [109.252.131.42]) by smtp.gmail.com with ESMTPSA id d5sm2016472lfn.170.2021.06.15.09.26.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jun 2021 09:26:50 -0700 (PDT) From: Vladislav Odintsov To: dev@openvswitch.org Date: Tue, 15 Jun 2021 19:26:09 +0300 Message-Id: <20210615162609.22559-3-odivlad@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210615162609.22559-1-odivlad@gmail.com> References: <20210615162609.22559-1-odivlad@gmail.com> MIME-Version: 1.0 Cc: Dumitru Ceara , Vladislav Odintsov Subject: [ovs-dev] [PATCH ovn v3 2/2] controller-vtep: Update tunnel_key and replication_mode if needed X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Vladislav Odintsov Acked-by: Dumitru Ceara --- controller-vtep/vtep.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/controller-vtep/vtep.c b/controller-vtep/vtep.c index 49723b39d..314cc4eae 100644 --- a/controller-vtep/vtep.c +++ b/controller-vtep/vtep.c @@ -234,18 +234,23 @@ vtep_lswitch_run(struct shash *vtep_pbs, struct sset *vtep_pswitches, } tnl_key = port_binding_rec->datapath->tunnel_key; - if (vtep_ls->n_tunnel_key - && vtep_ls->tunnel_key[0] != tnl_key) { - VLOG_DBG("set vtep logical switch (%s) tunnel key from " - "(%"PRId64") to (%"PRId64")", vtep_ls->name, - vtep_ls->tunnel_key[0], tnl_key); + if ((vtep_ls->n_tunnel_key && vtep_ls->tunnel_key[0] != tnl_key) + || !vtep_ls->n_tunnel_key) { + VLOG_DBG("set vtep logical switch (%s) tunnel key to %"PRId64, + vtep_ls->name, tnl_key); + vteprec_logical_switch_set_tunnel_key(vtep_ls, &tnl_key, 1); } - vteprec_logical_switch_set_tunnel_key(vtep_ls, &tnl_key, 1); /* OVN is expected to always use source node replication mode, * hence the replication mode is hard-coded for each logical * switch in the context of ovn-controller-vtep. */ - vteprec_logical_switch_set_replication_mode(vtep_ls, "source_node"); + if (!vtep_ls->replication_mode + || strcmp(vtep_ls->replication_mode, "source_node")) { + + vteprec_logical_switch_set_replication_mode(vtep_ls, + "source_node"); + } + sset_add(&used_ls, lswitch_name); } }