From patchwork Wed Jan 27 22:33:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bmarzins@sourceware.org X-Patchwork-Id: 75548 Received: from mx01.util.phx2.redhat.com (mx1-phx2.redhat.com [209.132.183.26]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0RMa4tw022631 for ; Wed, 27 Jan 2010 22:36:05 GMT Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx01.util.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0RMXmpg009206; Wed, 27 Jan 2010 17:33:51 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0RMXlL7003690 for ; Wed, 27 Jan 2010 17:33:47 -0500 Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0RMXgnl008246 for ; Wed, 27 Jan 2010 17:33:42 -0500 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by mx1.redhat.com (8.13.8/8.13.8) with SMTP id o0RMXVZh021549 for ; Wed, 27 Jan 2010 17:33:31 -0500 Received: (qmail 7877 invoked by uid 9475); 27 Jan 2010 22:33:30 -0000 Date: 27 Jan 2010 22:33:30 -0000 Message-ID: <20100127223330.7875.qmail@sourceware.org> From: bmarzins@sourceware.org To: dm-cvs@sourceware.org, dm-devel@redhat.com X-RedHat-Spam-Score: -1.667 (AWL) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.11 X-loop: dm-devel@redhat.com Subject: [dm-devel] multipath-tools ./multipath.conf.annotated lib ... 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: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com --- multipath-tools/multipath.conf.annotated 2009/08/31 18:43:18 1.18.2.14 +++ multipath-tools/multipath.conf.annotated 2010/01/27 22:33:28 1.18.2.15 @@ -219,7 +219,15 @@ # # default : determined by the process # gid 0 # - +# # +# # name : checker_timeout +# # scope : multipath & multipathd +# # desc : The timeout to use for path checkers that issue scsi +# # commands with an explicit timeout, in seconds. +# # values : n > 0 +# # default : taken for /sys/block/sd/device/timeout +# checker_timeout 60 +# #} # ## --- multipath-tools/libmultipath/discovery.c 2010/01/27 17:21:48 1.32.2.12 +++ multipath-tools/libmultipath/discovery.c 2010/01/27 22:33:29 1.32.2.13 @@ -262,7 +262,7 @@ if (r != 1) return 1; - *timeout = t; + *timeout = t * 1000; return 0; out: sysfs_close_attribute(attr); --- multipath-tools/libmultipath/propsel.c 2010/01/27 16:46:48 1.11.2.4 +++ multipath-tools/libmultipath/propsel.c 2010/01/27 22:33:29 1.11.2.5 @@ -235,16 +235,16 @@ pp->dev, checker_name(c)); out: if (conf->checker_timeout) { - c->timeout = conf->checker_timeout; - condlog(3, "%s: checker timeout = %u (config file default)", + c->timeout = conf->checker_timeout * 1000; + condlog(3, "%s: checker timeout = %u ms (config file default)", pp->dev, c->timeout); } else if (sysfs_get_timeout(sysfs_path, pp->dev, &c->timeout) == 0) - condlog(3, "%s: checker timeout = %u (sysfs setting)", + condlog(3, "%s: checker timeout = %u ms (sysfs setting)", pp->dev, c->timeout); else { c->timeout = DEF_TIMEOUT; - condlog(3, "%s: checker timeout = %u (internal default)", + condlog(3, "%s: checker timeout = %u ms (internal default)", pp->dev, c->timeout); } return 0;