From patchwork Tue Aug 13 16:23:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1146474 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="dR6f+XXH"; 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 467J1J4mvKz9sDQ for ; Wed, 14 Aug 2019 02:23:30 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1AB72C5D; Tue, 13 Aug 2019 16:23:27 +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 BDDFCB4B for ; Tue, 13 Aug 2019 16:23:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5614E89D for ; Tue, 13 Aug 2019 16:23:25 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id d85so1392688pfd.2 for ; Tue, 13 Aug 2019 09:23:25 -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=dR6f+XXHSqo6egm3UEZIC5UGuIAAA4LBH3Xa8cmS8421c+p0T2ys4pW+WJGR2x+hs+ jF3dD612tDcIOs2GozBPklipVH+FbCQmFLP26p4a6Sf5mi7NhyYzF+yD860wa28O33kv TC0YB4LlaapOAkiciZEZUGKKoMF9KeY4923ICVe7VfEw4NYIwHo0aUCDpRkhC7CoWKyl 3P9ji3h+a854SjS6GCeEPG33Pn4HB8RZiM2xsz3aHH9VJF5UVgD9oaiAAO5RYTBsjenE n8XyK1gx9M1E1R4tikM8V2mZIYA6XTf3PFcyL5ZAiBXOe5cbr0IHU1XBqmBwf0+GhBRS CJvA== 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=YP8P8vWtw7yx4uAAg+EmyBC6e472k+3TpecFD0rgfSIIGzBtVCdcpPsQPoaAWvUQDL ep2yrcA8Q7yTr8HNJXHzTgQhFdpKr82RK/udFvGb2dpG43aCZyp6/LiT6+7Ct7yZgEIC my4PqRRwyVo8EKelDhTfp0PikQJpzvBSkqNYAqMR0NIdpL0ZLj8wOdHeA5pJ4eAcKLSp Ub7ygksUBAnUGs8QYpbp42sUwb1SB95g1WzmUdzJj8SGuYwfbDHHCndniotLRstQi7J8 gqTHj4zHfOnCJtvRltjDCzlmcsMUXHlz222h7J6RdKVS0ARB8Qn69lP7pMJT/CPixJp7 4Yqw== X-Gm-Message-State: APjAAAW2PXurb1QamBquGxk+cddw41SOed3Djf26XYsd7rL4SkulLgBF b41Ug/dvHEtUSPO7TVVQTkFRZYbsPok= X-Google-Smtp-Source: APXvYqy2G3yBYO4iE0SG5GTMcKpgRP9P4Jv0tTGaj16MsDs04ag1q1L3Qn89gqx3Kf9ygrAtUCHZjg== X-Received: by 2002:aa7:97b7:: with SMTP id d23mr43196222pfq.203.1565713404615; Tue, 13 Aug 2019 09:23:24 -0700 (PDT) Received: from localhost.localdomain.localdomain ([73.241.94.255]) by smtp.gmail.com with ESMTPSA id e6sm10727206pfl.37.2019.08.13.09.23.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Aug 2019 09:23:24 -0700 (PDT) From: Han Zhou X-Google-Original-From: Han Zhou To: dev@openvswitch.org Date: Tue, 13 Aug 2019 09:23:19 -0700 Message-Id: <1565713402-5458-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 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