From patchwork Fri Apr 7 03:34:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?5rGq57+w5p6X?= X-Patchwork-Id: 1766403 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::136; helo=smtp3.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=WOBEH8Uv; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4Pt41C6Syfz1yYb for ; Fri, 7 Apr 2023 13:41:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5C9B1615E3; Fri, 7 Apr 2023 03:41:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 5C9B1615E3 Authentication-Results: smtp3.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=WOBEH8Uv X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EoTh3U3yMAAW; Fri, 7 Apr 2023 03:41:44 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9E08A615DB; Fri, 7 Apr 2023 03:41:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 9E08A615DB Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 715C1C0037; Fri, 7 Apr 2023 03:41:43 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 3AE87C002A for ; Fri, 7 Apr 2023 03:41:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0E0E8615DC for ; Fri, 7 Apr 2023 03:41:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0E0E8615DC X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SduDCBVZsQ51 for ; Fri, 7 Apr 2023 03:41:41 +0000 (UTC) X-Greylist: delayed 00:07:27 by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org DC6C3615DB Received: from corp-front10-corp.i.nease.net (corp-front12-corp.i.nease.net [42.186.62.107]) by smtp3.osuosl.org (Postfix) with ESMTPS id DC6C3615DB for ; Fri, 7 Apr 2023 03:41:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corp.netease.com; s=s210401; h=Received:Message-ID:Date: MIME-Version:User-Agent:Content-Language:To:From:Subject: Content-Type:Content-Transfer-Encoding; bh=vKaLqbKAh9g6+VZryn/bY YORPnxzSk0e2Xjc3vPTwD0=; b=WOBEH8UvyK0hN8eDwp2ODHDa8496uAG9F9X6w s1eX+IV9W9ZA1N13CtMnR7FPkEtNervFtW/QTySx9lsFENp5YD0DWPp0B6KuoItg +z7VcOPqBT4aa/bKXUD5UBFMhLpYNCcscI+gF3xsHvwsGl+C8Bal6ZAthg+Q3FHC +L6+KQ= Received: from [10.221.102.9] (unknown [115.236.119.131]) by corp-front12-corp.i.nease.net (Coremail) with SMTP id a4G_CgB3dzktjy9kc4csAA--.14292S2; Fri, 07 Apr 2023 11:34:05 +0800 (HKT) Message-ID: <12daa000-5ede-2aef-2a25-f6005c3b8f02@corp.netease.com> Date: Fri, 7 Apr 2023 11:34:05 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Content-Language: en-US To: dev@openvswitch.org, i.maximets@ovn.org From: =?utf-8?b?5rGq57+w5p6X?= X-CM-TRANSID: a4G_CgB3dzktjy9kc4csAA--.14292S2 X-Coremail-Antispam: 1UD129KBjvdXoW7GF4rXr1DAry8Aw15GF4UArb_yoWfAwb_Zw 4Utr1xZw1UXFW3Xwn8Zr1Yqr47t3sIqF1UG3WrAF43Jr1jy3Z8AFWfJ3Z5tF98GrWUury7 GrnxWwnxAw1ktjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUU1IxYjxAI6xCIbckI1I0E57IF64kEYxAxM7k0a2IF6FyUM7kC6x80 4xWl1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64 kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY 1x0267AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAawVAFpfBj4fn0lVCYm3Zqqf926ryUJw1UKr1v6r18M2kK6xCIbVAI wIAEc20F6c8GOVW8Jr15Jr4lnx0E84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_GcCE3s0E84 ACjcxK6xIIjxv20xvE14v26w1j6s0q6x02cVCv0xWlnx0E84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_GcCE3s0E84ACjcxK6I8E87Iv67AKxVW0oVCq3VCjxxvEa2IrM2vj628EF7xvwV C0I7IYx2IY6xkF7I0E14v26rxl6s0q6x02cVCv0xWle2I262IYc4CY6c8Ij28IcVAaY2xG 8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E74AGY7Cv6cx26r48Ar1UJr1UMcvjeVCFs4 IE7xkEbVWUJVW8JwACjcxG0xvEwIxGrwCjxxvEa2IrMxk0xIA0c2IEe2xFo4CEbIxvr21l c2IjII80xcxEwVAKI48JMxAIw28IcxkI7VAKI48JMxAIw28IcVCjz48v1sIEY20_Gr48tr 1UJr1l4x8a64kIII0Yj41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l4IxY624lx2IqxVAqx4xG 67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1Y6r17MI IYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E 14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jnF4iU UUUU= X-CM-SenderInfo: pzdqwxpdqox0g6fr21woqh3vxdvhhudrp/1tbiBQAOB1t79bakUwAAsY Subject: [ovs-dev] [PATCH] ovsdb-cs: fix 'cs_db' lock flag not free 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 free next. Signed-off-by: wanghanlin ---  lib/ovsdb-cs.c | 2 +-  1 file changed, 1 insertion(+), 1 deletion(-) ovsdb_cs_db_compose_lock_request(&cs->data)); 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,