From patchwork Tue Apr 18 18:12:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 751919 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3w6tWr522Rz9s3w for ; Wed, 19 Apr 2017 04:12:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ix8G4XFI"; dkim-atps=neutral Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id EA65CB6E; Tue, 18 Apr 2017 18:12:22 +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 4A78C415 for ; Tue, 18 Apr 2017 18:12:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0F92324F for ; Tue, 18 Apr 2017 18:12:20 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id a188so100398pfa.2 for ; Tue, 18 Apr 2017 11:12:20 -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=kr/IvQ+D+pH1dasjRRbrG5y6ehQODxcIO/2lMktbLtI=; b=Ix8G4XFIN1EQTYLrDILwlFMFJ/TyZ3Mo8xyU+fmB3Pb/xBGHXizM8T9cJsFSZHbbSX 9OwTYOp5q+tB7FMLTwe/Wc+p3Eziuuw5+txCN6M+LAkC4aMHioBUcYrTmsNd7vXZHO3A +S9zNsmUFV88lPcaI8CR7fnf23oa8y6sVQc4TzJ4Dr0wCg0h2hN1SzpKUqZvd8OHdjIT SNwef1oREzRnPEfwKhwnadB9U++mKQqwvyuw3GBvZofng1vIVdIQstU6zAMnkUkUj2pT IgGZz9oLU+Ef2SO4dsv+xw6tGAsUt8UF6OupUpWJBiO9InOErCkZ/UmG5k/wIjLtD2a1 g68w== 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=kr/IvQ+D+pH1dasjRRbrG5y6ehQODxcIO/2lMktbLtI=; b=HyYz5FPuTXAZizCs2e2q3rNs1baMO8hHs7DvPh9iiowyhuD/HhDPwdNBMCYzGKBgB/ cCp9Rz5JEk/qacXqru7L78fFS3fC/V75wFc0ULzg+hP0imiLXwdFzlstvRc9uC2gKENh aTV6B4g8fSaKcAWrl//XLxg123+zjXCZwYLspOzqWe1oK2KoSmwVPusqHUeKCNP6XX9G apxyR3nY1AQG+whGhQpeaUn746vALnFBhlK1b3fJ5StMLfnrdEQWUn6HwG+V/3PAR8CF 1F5HWXQwfGg3AOPG91oxrnm+RA8Hk67uOg1DZ6+QLH949GUiGiMtEI0E1dhKYyVyt/6N uiGg== X-Gm-Message-State: AN3rC/7BJqjbKisd+DjW+VxiQTAybJfv0Ipatijbz+/1ajCz79lHGPhG xL0ZLqRcIZxPCA== X-Received: by 10.84.177.164 with SMTP id x33mr24865807plb.147.1492539140722; Tue, 18 Apr 2017 11:12:20 -0700 (PDT) Received: from localhost.localdomain.localdomain ([216.113.160.70]) by smtp.gmail.com with ESMTPSA id m4sm25309159pfi.74.2017.04.18.11.12.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Apr 2017 11:12:20 -0700 (PDT) From: Han Zhou To: dev@openvswitch.org Date: Tue, 18 Apr 2017 11:12:14 -0700 Message-Id: <1492539134-43788-1-git-send-email-zhouhan@gmail.com> X-Mailer: git-send-email 2.1.0 X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=no 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] Avoid update probe interval to non-zero for unix socket. 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 In commit c1bfdd9d it disables probe when not needed, but commit 715038b6 updates ovn-controller probe interval for OVNSB DB periodically according to ovn-remote-probe-interval config, and sets it to DEFAULT_PROBE_INTERVAL_MSEC if not configured, even if the connection type is unix socket which doesn't need probe. This fix avoids probe interval update if not needed (always set to 0). Signed-off-by: Han Zhou --- Notes: v1->v2: fix commit id mentioned in commit message. lib/reconnect.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/reconnect.c b/lib/reconnect.c index 471fb7f..6b52481 100644 --- a/lib/reconnect.c +++ b/lib/reconnect.c @@ -16,6 +16,7 @@ #include #include "reconnect.h" +#include "stream.h" #include @@ -243,6 +244,9 @@ reconnect_set_backoff(struct reconnect *fsm, int min_backoff, int max_backoff) void reconnect_set_probe_interval(struct reconnect *fsm, int probe_interval) { + if (!stream_or_pstream_needs_probes(fsm->name)) { + probe_interval = 0; + } fsm->probe_interval = probe_interval ? MAX(1000, probe_interval) : 0; }