diff mbox series

[ovs-dev,1/4] raft.c: Move raft_reset_ping_timer() out of the loop.

Message ID 1565713402-5458-1-git-send-email-hzhou8@ebay.com
State Accepted
Headers show
Series [ovs-dev,1/4] raft.c: Move raft_reset_ping_timer() out of the loop. | expand

Commit Message

Han Zhou Aug. 13, 2019, 4:23 p.m. UTC 
From: Han Zhou <hzhou8@ebay.com>

Fixes: commit 5a9b53a5 ("ovsdb raft: Fix duplicated transaction execution when leader failover.")
Signed-off-by: Han Zhou <hzhou8@ebay.com>
---
 ovsdb/raft.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ben Pfaff Aug. 21, 2019, 6 p.m. UTC | #1 
On Tue, Aug 13, 2019 at 09:23:19AM -0700, Han Zhou wrote:
> From: Han Zhou <hzhou8@ebay.com>
> 
> Fixes: commit 5a9b53a5 ("ovsdb raft: Fix duplicated transaction execution when leader failover.")
> Signed-off-by: Han Zhou <hzhou8@ebay.com>

Thanks!  I applied this to master and branch-2.12.
diff mbox series

Patch

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