File 0001-rconn-Avoid-occasional-immediate-connectio... of Package openvswitch.10750

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-rconn-Avoid-occasional-immediate-connection-failures.patch of Package openvswitch.10750

From 9aa1fe3057551e2a0cddcc640ceb82cc6428f003 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@ovn.org>
Date: Fri, 1 Mar 2019 10:51:16 -0800
Subject: [PATCH 14/14] rconn: Avoid occasional immediate connection failures.

The rconn connection timer measures time on the granularity of seconds,
which means that sometimes the actual timeout can be just a millsecond or
so, which led to occasional immediate connection failures from ovs-ofctl.

VMware-BZ: #2295760
Fixes: 476d2551abd2 ("rconn: Introduce new invariant to fix assertion failure in corner case.")
Reported-by: Ken Ajiro <ken-ajiro@xr.jp.nec.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 lib/rconn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rconn.c b/lib/rconn.c
index 4a462bc8e..78b514915 100644
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2019 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -489,7 +489,7 @@ static unsigned int
 timeout_CONNECTING(const struct rconn *rc)
     OVS_REQUIRES(rc->mutex)
 {
-    return MAX(1, rc->backoff);
+    return MAX(2, rc->backoff);
 }
 
 static void
-- 
2.21.0

Places

File 0001-rconn-Avoid-occasional-immediate-connection-failures.patch of Package openvswitch.10750

Places