From patchwork Fri Apr 7 06:59:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5rGq57+w5p6X?= X-Patchwork-Id: 1766438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=corp.netease.com header.i=@corp.netease.com header.a=rsa-sha256 header.s=s210401 header.b=PVxHIUUo; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pt8P04qPtz1yYy for ; Fri, 7 Apr 2023 16:59:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D8BBE844BD; Fri, 7 Apr 2023 06:59:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D8BBE844BD Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=corp.netease.com header.i=@corp.netease.com header.a=rsa-sha256 header.s=s210401 header.b=PVxHIUUo X-Virus-Scanned: amavisd-new at osuosl.org 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 9PSZ09tBNZMZ; Fri, 7 Apr 2023 06:59:14 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2C9E184495; Fri, 7 Apr 2023 06:59:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 2C9E184495 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 01127C0036; Fri, 7 Apr 2023 06:59:13 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7C410C002A for ; Fri, 7 Apr 2023 06:59:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 3E9AA40BCB for ; Fri, 7 Apr 2023 06:59:12 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 3E9AA40BCB Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=corp.netease.com header.i=@corp.netease.com header.a=rsa-sha256 header.s=s210401 header.b=PVxHIUUo 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 p9Esrmtu6oGm for ; Fri, 7 Apr 2023 06:59:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C20DE402F6 Received: from corp-front10-corp.i.nease.net (corp-front10-corp.i.nease.net [42.186.62.104]) by smtp2.osuosl.org (Postfix) with ESMTPS id C20DE402F6 for ; Fri, 7 Apr 2023 06:59:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corp.netease.com; s=s210401; h=Received:From:To:Subject:Date: Message-Id:MIME-Version:Content-Transfer-Encoding; bh=K04oJsWtjW fgXE5dliH5toJBuFIJoHbavZL0dLsHCm0=; b=PVxHIUUoHNUqBpyMY8fl5Ja6v0 +r/GojrKl+3UI3Oqpv2aUFokEAdYROcTdGZvxXdxRt5C1P8ZkybLrHqk0LUYRHJJ 1okdg/k42fygFsgzOf3gxGFWvFa3KtO60upIFVcO2aD8eGJ/41Vydn/bEJ3dVYNb sRrKHe78P1QeK1o4g= Received: from hih-l-9458.cn.net.ntes (unknown [115.236.119.131]) by corp-front10-corp.i.nease.net (Coremail) with SMTP id aIG_CgDH8SA4vy9kxUc1AA--.9616S2; Fri, 07 Apr 2023 14:59:04 +0800 (HKT) From: wanghanlin To: dev@openvswitch.org, i.maximets@ovn.org Date: Fri, 7 Apr 2023 14:59:04 +0800 Message-Id: <20230407065904.865968-1-wanghanlin@corp.netease.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CM-TRANSID: aIG_CgDH8SA4vy9kxUc1AA--.9616S2 X-Coremail-Antispam: 1UD129KBjvdXoW7GF45JF45uw47KFyDuFWrGrg_yoW3AFX_Zw 1Utrs7Aw45XF9xXwn8Zr15trWSy3sIq3WUG3Z3JFW3Gr1jyan8ZFWxt3Z8tF9xX34j93y3 GrnxWwnxCrn2vjkaLaAFLSUrUUUU8b8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUU1DxYjxAI6xCIbckI1I0E57IF64kEYxAxM7k0a2IF6FyUM7kC6x80 4xWl1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64 kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY 1x0267AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAaw2AFwI0_Jrv_JF1ln4vE1TuYJxujqTIEc-sFP3VYkVW5Jr1DJw4U KVWUGwAawVCFI7vE04vSzxk24VAqrcv_Gr1UXr18M2vj628EF7xvwVC0I7IYx2IY6xkF7I 0E14v26rxl6s0q628EF7xvwVC0I7IYx2IY67AKxVWDJVCq3VCjxxvEa2IrM2vj628EF7xv wVC0I7IYx2IY6xkF7I0E14v26rxl6s0q628EF7xvwVC2z280aVAFwI0_GcCE3s0E7I0Y6s xI4wAa7VA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW0oVCq3VCjxxvEa2IrM2AIxVAIcxkE cVAq07x20xvEncxIr21l57IF6s8CjcxG0xyl5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6x 8ErcxFaVAv8VW8GF1UJr1UJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l 7I0Y6sxI4wCY1x0262kKe7AKxVWUAVWUtwCY0x0Ix7I2Y4AK64vIr41l42xK82IYc2Ij64 vIr41l42xK82IY6x8ErcxFaVAv8VW8Gr4DJr1UJwCF72vEw2IIxxk0rwCFx2IqxVCFs4IE 7xkEbVWUJVW8JwCFI7km07C267AKxVWUXVWUAwCFI7vE0wC20s026c02F40E14v26r1j6r 18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jrv_JF1lIxkGc2Ij64vI r41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr 1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvE x4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8dsqJUUUUU== X-CM-SenderInfo: pzdqwxpdqox0g6fr21woqh3vxdvhhudrp/1tbiBQAOB1t79bgEqQAGsK Subject: [ovs-dev] [PATCH] ovsdb-cs: fix 'cs_db' lock flag not updated error. 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" When 'cs' is not connected to a server, then ovsdb_cs_db_compose_lock_request__ will update 'cs_db' lock flag, but the lock flag will not be updated next. Signed-off-by: wanghanlin --- lib/ovsdb-cs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ovsdb-cs.c b/lib/ovsdb-cs.c index c7c147cc0..f909a66f9 100644 --- a/lib/ovsdb-cs.c +++ b/lib/ovsdb-cs.c @@ -632,7 +632,7 @@ ovsdb_cs_run(struct ovsdb_cs *cs, struct ovs_list *events) ovsdb_cs_db_add_event(&cs->data, OVSDB_CS_EVENT_TYPE_RECONNECT); - if (cs->data.lock_name) { + if (cs->data.lock_name && ovsdb_cs_is_connected(cs)) { jsonrpc_session_send( cs->session, ovsdb_cs_db_compose_lock_request(&cs->data));