From patchwork Wed Aug 14 22:37:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1147274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iHeZF7iQ"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4684GL2xVyz9sNf for ; Thu, 15 Aug 2019 08:37:28 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 31A97C6D; Wed, 14 Aug 2019 22:37:25 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 3F43BC64 for ; Wed, 14 Aug 2019 22:37:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id B874F67F for ; Wed, 14 Aug 2019 22:37:22 +0000 (UTC) Received: by mail-ed1-f65.google.com with SMTP id h8so608965edv.7 for ; Wed, 14 Aug 2019 15:37:22 -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; bh=pnOybCfymyk/45TBHRenx0a897DbpE3hxnNymjHyzIc=; b=iHeZF7iQfRbI11rzFZ7pTj0X19aaAsG7Gi9mVdKZ7+1SMTEdQ0UjLt1kzAWlx9rLNj xhdnDVc9sJ6EXE7dokxYUYVfzGcVmlobzMOokkUdm/MS8loRulCcl117Jpomo7FgiLJ4 eofjMOdQx3L6LK9xPWBypFUeIidUaqIJ9bOLC0GfxEvKPbqltYrnfmJ8E34tmwbDUYnB D7wqf6Cct+EIY5HOXoDUPP7m0U1bL8RxFJ6DGAKnre3VBBXH/f+k8JGs2lsgMq/fQV47 YQnkZmn069R8syK6/w2WNpxQ+WqgEyP/NpHaFyj1V7HnGnTGCG8QXcRB0AckAvk+EVZe VMbQ== 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; bh=pnOybCfymyk/45TBHRenx0a897DbpE3hxnNymjHyzIc=; b=MhHBJ6gC65k9EaNC3gUQMJworten4vIuMIPUGaPECMKePDmKh8QmQYHqCPH4y7LdOB 5aaQyL6pWhp0uDt4SUBSeR8WUy1pXKLi5JQHGBaB72OuJk4q+wZQi07dHK6q68CbJjbV MkyHRcNtt/VB2lQQxvtIedy7lRNtrOJTk5vvyAB0LOHLvJhZWqdbKAoWB1U8zMl4/sEI q7IZ3U0ZVz6GReToqAlxfRQ4OqkH01clTnn/2STwzrSknkMVhohCS5exTCsI3cBkAs6G bvoaetSWh/wjt4X4vTQ1Pp4qJoVjFlBHAXcvtd4DKzrxaHQf27KdrCeZqfH0FxhuXyZa tgNQ== X-Gm-Message-State: APjAAAXa+WGfmzVlI10WzQiZ0Ww3XgNHWumO8fOIB8rzIE0E2qGygX1h 3nnE0D/E9fb+2tL63xwNwN6aIksmpx4= X-Google-Smtp-Source: APXvYqyruJrC9xxdlEwKkozz+wx2Iu0ClveEunbUjWd4drJ9q0MVn1SULOvgh6d/nOSF46LfVlsdzQ== X-Received: by 2002:aa7:d2cb:: with SMTP id k11mr2196805edr.12.1565822241039; Wed, 14 Aug 2019 15:37:21 -0700 (PDT) Received: from localhost.localdomain.localdomain ([216.113.160.77]) by smtp.gmail.com with ESMTPSA id c15sm198167edf.37.2019.08.14.15.37.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Aug 2019 15:37:20 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Wed, 14 Aug 2019 15:37:00 -0700 Message-Id: <1565822223-90171-1-git-send-email-hzhou8@ebay.com> X-Mailer: git-send-email 2.1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 1/4] raft.c: Move raft_reset_ping_timer() out of the loop. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Han Zhou Fixes: commit 5a9b53a5 ("ovsdb raft: Fix duplicated transaction execution when leader failover.") Signed-off-by: Han Zhou --- ovsdb/raft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovsdb/raft.c b/ovsdb/raft.c index c60ef41..1c38b3b 100644 --- a/ovsdb/raft.c +++ b/ovsdb/raft.c @@ -1816,8 +1816,8 @@ raft_run(struct raft *raft) && now - cmd->timestamp > ELECTION_BASE_MSEC * 2) { raft_command_complete(raft, cmd, RAFT_CMD_TIMEOUT); } - raft_reset_ping_timer(raft); } + raft_reset_ping_timer(raft); } /* Do this only at the end; if we did it as soon as we set raft->left or