From patchwork Fri May 3 17:59:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Marzinski X-Patchwork-Id: 2518941 Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by patchwork1.kernel.org (Postfix) with ESMTP id AEEB03FCA5 for ; Fri, 3 May 2013 18:03:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r43Hxr1L011631; Fri, 3 May 2013 13:59:55 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r43HxqUI025050 for ; Fri, 3 May 2013 13:59:52 -0400 Received: from ether.msp.redhat.com (ether.msp.redhat.com [10.15.80.119]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r43Hxpr8025939 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 3 May 2013 13:59:52 -0400 Received: from ether.msp.redhat.com (localhost.localdomain [127.0.0.1]) by ether.msp.redhat.com (8.14.1/8.14.1) with ESMTP id r43Hxo46012126; Fri, 3 May 2013 12:59:50 -0500 Received: (from bmarzins@localhost) by ether.msp.redhat.com (8.14.1/8.14.1/Submit) id r43HxnZT012125; Fri, 3 May 2013 12:59:49 -0500 Date: Fri, 3 May 2013 12:59:49 -0500 From: Benjamin Marzinski To: device-mapper development Message-ID: <20130503175948.GO6253@ether.msp.redhat.com> References: <1367531197-8987-1-git-send-email-bmarzins@redhat.com> <1367531197-8987-12-git-send-email-bmarzins@redhat.com> <5183603F.5000003@suse.de> <20130503154457.GN6253@ether.msp.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130503154457.GN6253@ether.msp.redhat.com> User-Agent: Mutt/1.5.17 (2007-11-01) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-loop: dm-devel@redhat.com Cc: Christophe Varoqui Subject: Re: [dm-devel] [PATCH v2 11/16] Fix max path checker timing X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com Due to some code being placed inside the wrong block, the number of seconds to wait between path checks (pp->tick), was only getting set to the path's individual check interval if that wasn't equal to the max check interval. Otherwise it was using the default for a failed path. This patch makes sure that pp->ticks always always gets set correctly for active paths. Signed-off-by: Benjamin Marzinski Acked-by: Hannes Reinecke --- multipathd/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index 440d254..9d52465 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -1220,10 +1220,10 @@ check_path (struct vectors * vecs, struct path * pp) else pp->checkint = conf->max_checkint; - pp->tick = pp->checkint; condlog(4, "%s: delay next check %is", - pp->dev_t, pp->tick); + pp->dev_t, pp->checkint); } + pp->tick = pp->checkint; } } else if (newstate == PATH_DOWN) {